Fixes #69, lexer correctly tokenizes number-number segments, numericLiterals are only considered literal token if it is folled by a punctuator.

src/test/specs/lexer-specs.js

@@ -21,6 +21,21 @@ define([
       expect(tokens[4].value).to.be('se1-server-*');
     });
 
+    it('should tokenize metric expression with dash2', function() {
+      var lexer = new Lexer('net.192-168-1-1.192-168-1-9.ping_value.*');
+      var tokens = lexer.tokenize();
+      expect(tokens[0].value).to.be('net');
+      expect(tokens[2].value).to.be('192-168-1-1');
+    });
+
+    it('simple function2', function() {
+      var lexer = new Lexer('offset(test.metric, -100)');
+      var tokens = lexer.tokenize();
+      expect(tokens[2].type).to.be('identifier');
+      expect(tokens[4].type).to.be('identifier');
+      expect(tokens[6].type).to.be('number');
+    });
+
     it('should tokenize metric expression with curly braces', function() {
       var lexer = new Lexer('metric.se1-{first, second}.count');
       var tokens = lexer.tokenize();

src/test/specs/parser-specs.js

@@ -49,6 +49,14 @@ define([
       expect(rootNode.params.length).to.be(1);
     });
 
+    it('simple function2', function() {
+      var parser = new Parser('offset(test.metric, -100)');
+      var rootNode = parser.getAst();
+      expect(rootNode.type).to.be('function');
+      expect(rootNode.params[0].type).to.be('metric');
+      expect(rootNode.params[1].type).to.be('number');
+    });
+
     it('simple function with string arg', function() {
       var parser = new Parser("randomWalk('test')");
       var rootNode = parser.getAst();
@@ -125,6 +133,13 @@ define([
       expect(rootNode.pos).to.be(11);
     });
 
+    it('handle issue #69', function() {
+      var parser = new Parser('cactiStyle(offset(scale(net.192-168-1-1.192-168-1-9.ping_value.*,0.001),-100))');
+      var rootNode = parser.getAst();
+      expect(rootNode.type).to.be('function');
+    });
+
+
   });
 
 });