From 011e95b33122a54fd46cb2d09a43febd3337b1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 16 Jun 2014 08:14:34 +0200
Subject: [PATCH] Graphite query lexer change, can now handle regex parameters
 for aliasSub function (Fixes #126)

---
 CHANGELOG.md                       |  1 +
 src/app/services/graphite/lexer.js | 56 ------------------------------
 2 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7735c729717..db2a1bd1792 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
   Use datasources config instead. panel_names removed from config.js. Use plugins.panels to add custom panels
 
 #### Fixes
+- Graphite query lexer change, can now handle regex parameters for aliasSub function (Fixes #126)
 - Filter option loading when having muliple nested filters now works better.
   Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447),
   After an option is changed and a nested template param is also reloaded, if the current value
diff --git a/src/app/services/graphite/lexer.js b/src/app/services/graphite/lexer.js
index c9b77103ad0..7143bdfdfe7 100644
--- a/src/app/services/graphite/lexer.js
+++ b/src/app/services/graphite/lexer.js
@@ -646,62 +646,6 @@ define([
         var jump = 1; // A length of a jump, after we're done
                       // parsing this character.
 
-        // Special treatment for some escaped characters.
-        if (char === "\\") {
-          this.skip();
-          char = this.peek();
-
-          switch (char) {
-          case "'":
-            break;
-          case "b":
-            char = "\b";
-            break;
-          case "f":
-            char = "\f";
-            break;
-          case "n":
-            char = "\n";
-            break;
-          case "r":
-            char = "\r";
-            break;
-          case "t":
-            char = "\t";
-            break;
-          case "0":
-            char = "\0";
-            break;
-          case "u":
-            char = String.fromCharCode(parseInt(this.input.substr(1, 4), 16));
-            jump = 5;
-            break;
-          case "v":
-            char = "\v";
-            break;
-          case "x":
-            var x = parseInt(this.input.substr(1, 2), 16);
-            char = String.fromCharCode(x);
-            jump = 3;
-            break;
-          case "\\":
-          case "\"":
-          case "/":
-            break;
-          case "":
-            char = "";
-            break;
-          case "!":
-            if (value.slice(value.length - 2) === "<") {
-              break;
-            }
-
-            /*falls through */
-          default:
-            // Weird escaping.
-          }
-        }
-
         value += char;
         this.skip(jump);
       }