From bc3cad209f6f4d1f4e52759490001017f7b1c70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 24 Dec 2013 13:01:50 +0100 Subject: [PATCH] integrated parser into graphite target editor --- src/app/controllers/graphiteTarget.js | 2 +- src/app/services/graphite/lexer.js | 4 +--- src/app/services/graphite/parser.js | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index eea1100384d..0fb4e958e84 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -32,7 +32,7 @@ function (angular, _, config, graphiteFunctions, Parser) { if (astNode.type === 'function') { var innerFunc = {}; - innerFunc.def = _.findWhere($scope.funcDefs, { name: astNode.name }) + innerFunc.def = _.findWhere($scope.funcDefs, { name: astNode.name }); innerFunc.params = innerFunc.def.defaultParams; _.each(astNode.params, function(param, index) { diff --git a/src/app/services/graphite/lexer.js b/src/app/services/graphite/lexer.js index 00fc57a1f70..8ef0e186e89 100644 --- a/src/app/services/graphite/lexer.js +++ b/src/app/services/graphite/lexer.js @@ -577,7 +577,7 @@ define([ * var str = "hello\ * world"; */ - scanStringLiteral: function (checks) { + scanStringLiteral: function () { /*jshint loopfunc:true */ var quote = this.peek(); @@ -587,8 +587,6 @@ define([ } var value = ""; - var startLine = this.line; - var startChar = this.char; this.skip(); diff --git a/src/app/services/graphite/parser.js b/src/app/services/graphite/parser.js index 8c78d9c7d00..11da206e695 100644 --- a/src/app/services/graphite/parser.js +++ b/src/app/services/graphite/parser.js @@ -11,11 +11,6 @@ define([ StringLiteral: 6 }; - function Node(type, value) { - this.type = type; - this.value = value; - } - function Parser(expression) { this.expression = expression; this.lexer = new Lexer(expression);