From d11088eb430ef7f0b444888517868ba880610f6b Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Tue, 21 Dec 2010 17:38:04 -0800
Subject: Revert "Refactor lexer to use regular expressions"

We came across a major performance regression due to this change.
I'm reverting it until we find a better solution.

This reverts commit 23fc73081feb640164615930b36ef185c23a3526.
---
 test/ParserSpec.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'test/ParserSpec.js')

diff --git a/test/ParserSpec.js b/test/ParserSpec.js
index 71208783..c237aa40 100644
--- a/test/ParserSpec.js
+++ b/test/ParserSpec.js
@@ -82,15 +82,9 @@ describe('parser', function() {
       expect(tokens.length).toEqual(1);
       expect(tokens[0].string).toEqual('\u00a0');
     });
-    
-    it('should error when non terminated string', function(){
-      expect(function(){
-        lex('ignore "text');
-      }).toThrow(new Error('Lexer Error: Unterminated string at column 7 in expression [ignore "text].'));
-    });
 
     it('should ignore whitespace', function() {
-      var tokens = lex("a \t \n \r \u00A0 b");
+      var tokens = lex("a \t \n \r b");
       expect(tokens[0].text).toEqual('a');
       expect(tokens[1].text).toEqual('b');
     });
@@ -136,6 +130,16 @@ describe('parser', function() {
       expect(tokens[0].text).toEqual(0.5E+10);
     });
 
+    it('should throws exception for invalid exponent', function() {
+      expect(function() {
+        lex("0.5E-");
+      }).toThrow(new Error('Lexer Error: Invalid exponent at column 4 in expression [0.5E-].'));
+      
+      expect(function() {
+        lex("0.5E-A");
+      }).toThrow(new Error('Lexer Error: Invalid exponent at column 4 in expression [0.5E-A].'));
+    });
+
     it('should tokenize number starting with a dot', function() {
       var tokens = lex(".5");
       expect(tokens[0].text).toEqual(0.5);
@@ -143,8 +147,8 @@ describe('parser', function() {
 
     it('should throw error on invalid unicode', function() {
       expect(function() {
-        lex("'\\u1xbla'");
-      }).toThrow(new Error("Lexer Error: Invalid unicode escape [\\u1xbl] at columns 0-9 ['\\u1xbla'] in expression ['\\u1xbla']."));
+        lex("'\\u1''bla'");
+      }).toThrow(new Error("Lexer Error: Invalid unicode escape [\\u1''b] at column 2 in expression ['\\u1''bla']."));
     });
   });
   
-- 
cgit v1.2.3