Cleanup parser code to expose smaller API

4 files changed, 11 insertions, 11 deletions

diff --git a/test/BinderSpec.js b/test/BinderSpec.js
index dfa388e3..15a1b5c7 100644
--- a/test/BinderSpec.js
+++ b/test/BinderSpec.js
@@ -581,7 +581,7 @@ describe('Binder', function(){
 
     browserTrigger(second, 'click');
     assertTrue(second.hasClass("ng-exception"));
-    expect(errorLogs.shift()[0]).toMatchError(/Parse Error: Token ':' not a primary expression/);
+    expect(errorLogs.shift()[0]).toMatchError(/Syntax Error: Token ':' not a primary expression/);
   });
 
   it('ItShouldSelectTheCorrectRadioBox', function(){
diff --git a/test/JsonSpec.js b/test/JsonSpec.js
index 3b81a44f..0dac0318 100644
--- a/test/JsonSpec.js
+++ b/test/JsonSpec.js
@@ -163,37 +163,37 @@ describe('json', function(){
   describe('security', function(){
     it('should not allow naked expressions', function(){
       expect(function(){fromJson('1+2');}).
-        toThrow(new Error("Parse Error: Token '+' is extra token not part of expression at column 2 of expression [1+2] starting at [+2]."));
+        toThrow(new Error("Syntax Error: Token '+' is an unexpected token at column 2 of the expression [1+2] starting at [+2]."));
     });
 
     it('should not allow naked expressions group', function(){
       expect(function(){fromJson('(1+2)');}).
-        toThrow(new Error("Parse Error: Token '(' is not valid json at column 1 of expression [(1+2)] starting at [(1+2)]."));
+        toThrow(new Error("Syntax Error: Token '(' is not valid json at column 1 of the expression [(1+2)] starting at [(1+2)]."));
     });
 
     it('should not allow expressions in objects', function(){
       expect(function(){fromJson('{a:abc()}');}).
-        toThrow(new Error("Parse Error: Token 'abc' is not valid json at column 4 of expression [{a:abc()}] starting at [abc()}]."));
+        toThrow(new Error("Syntax Error: Token 'abc' is not valid json at column 4 of the expression [{a:abc()}] starting at [abc()}]."));
     });
 
     it('should not allow expressions in arrays', function(){
       expect(function(){fromJson('[1+2]');}).
-        toThrow(new Error("Parse Error: Token '+' is not valid json at column 3 of expression [[1+2]] starting at [+2]]."));
+        toThrow(new Error("Syntax Error: Token '+' is not valid json at column 3 of the expression [[1+2]] starting at [+2]]."));
     });
 
     it('should not allow vars', function(){
       expect(function(){fromJson('[1, x]');}).
-        toThrow(new Error("Parse Error: Token 'x' is not valid json at column 5 of expression [[1, x]] starting at [x]]."));
+        toThrow(new Error("Syntax Error: Token 'x' is not valid json at column 5 of the expression [[1, x]] starting at [x]]."));
     });
 
     it('should not allow dereference', function(){
       expect(function(){fromJson('["".constructor]');}).
-        toThrow(new Error("Parse Error: Token '.' is not valid json at column 4 of expression [[\"\".constructor]] starting at [.constructor]]."));
+        toThrow(new Error("Syntax Error: Token '.' is not valid json at column 4 of the expression [[\"\".constructor]] starting at [.constructor]]."));
     });
 
     it('should not allow expressions ofter valid json', function(){
       expect(function(){fromJson('[].constructor');}).
-        toThrow(new Error("Parse Error: Token '.' is not valid json at column 3 of expression [[].constructor] starting at [.constructor]."));
+        toThrow(new Error("Syntax Error: Token '.' is not valid json at column 3 of the expression [[].constructor] starting at [.constructor]."));
     });
 
     it('should not allow object dereference', function(){
diff --git a/test/ParserSpec.js b/test/ParserSpec.js
index 62d6731a..641420cb 100644
--- a/test/ParserSpec.js
+++ b/test/ParserSpec.js
@@ -200,7 +200,7 @@ describe('parser', function() {
 
     expect(function() {
       scope.$eval("1|nonExistant");
-    }).toThrow(new Error("Parse Error: Token 'nonExistant' should be a function at column 3 of expression [1|nonExistant] starting at [nonExistant]."));
+    }).toThrow(new Error("Syntax Error: Token 'nonExistant' should be a function at column 3 of the expression [1|nonExistant] starting at [nonExistant]."));
 
     scope.$set('offset', 3);
     expect(scope.$eval("'abcd'|upper._case")).toEqual("ABCD");
diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
index 36aabb33..b412cd6d 100644
--- a/test/widgetsSpec.js
+++ b/test/widgetsSpec.js
@@ -537,7 +537,7 @@ describe("widget", function(){
       compile('<input type="text" name="throw \'\'" value="x"/>');
       expect(element.hasClass('ng-exception')).toBeTruthy();
       expect(scope.$service('$log').error.logs.shift()[0]).
-        toMatchError(/Parse Error: Token '''' is extra token not part of expression/);
+        toMatchError(/Syntax Error: Token '''' is an unexpected token/);
     });
 
     it('should report error on ng:change exception', function(){
@@ -545,7 +545,7 @@ describe("widget", function(){
       browserTrigger(element);
       expect(element.hasClass('ng-exception')).toBeTruthy();
       expect(scope.$service('$log').error.logs.shift()[0]).
-        toMatchError(/Parse Error: Token '=' implies assignment but \[a-2\] can not be assigned to/);
+        toMatchError(/Syntax Error: Token '=' implies assignment but \[a-2\] can not be assigned to/);
     });
   });