removed nglr namespace

1 files changed, 54 insertions, 54 deletions

diff --git a/test/ParserTest.js b/test/ParserTest.js
index 7fe8e6a4..058010f3 100644
--- a/test/ParserTest.js
+++ b/test/ParserTest.js
@@ -1,7 +1,7 @@
 LexerTest = TestCase('LexerTest');
 
 LexerTest.prototype.testTokenizeAString = function(){
-  var lexer = new nglr.Lexer("a.bc[22]+1.3|f:'a\\\'c':\"d\\\"e\"");
+  var lexer = new Lexer("a.bc[22]+1.3|f:'a\\\'c':\"d\\\"e\"");
   var tokens = lexer.parse();
   var i = 0;
   assertEquals(tokens[i].index, 0);
@@ -54,7 +54,7 @@ LexerTest.prototype.testTokenizeAString = function(){
 
 
 LexerTest.prototype.testTokenizeRegExp = function(){
-  var lexer = new nglr.Lexer("/r 1/");
+  var lexer = new Lexer("/r 1/");
   var tokens = lexer.parse();
   var i = 0;
   assertEquals(tokens[i].index, 0);
@@ -64,7 +64,7 @@ LexerTest.prototype.testTokenizeRegExp = function(){
 
 LexerTest.prototype.testQuotedString = function(){
   var str = "['\\'', \"\\\"\"]";
-  var lexer = new nglr.Lexer(str);
+  var lexer = new Lexer(str);
   var tokens = lexer.parse();
 
   assertEquals(1, tokens[1].index);
@@ -77,21 +77,21 @@ LexerTest.prototype.testQuotedString = function(){
 
 LexerTest.prototype.testQuotedStringEscape = function(){
   var str = '"\\"\\n\\f\\r\\t\\v\\u00A0"';
-  var lexer = new nglr.Lexer(str);
+  var lexer = new Lexer(str);
   var tokens = lexer.parse();
 
   assertEquals('"\n\f\r\t\v\u00A0', tokens[0].text);
 };
 
 LexerTest.prototype.testTokenizeUnicode = function(){
-  var lexer = new nglr.Lexer('"\\u00A0"');
+  var lexer = new Lexer('"\\u00A0"');
   var tokens = lexer.parse();
   assertEquals(1, tokens.length);
   assertEquals('\u00a0', tokens[0].text);
 };
 
 LexerTest.prototype.testTokenizeRegExpWithOptions = function(){
-  var lexer = new nglr.Lexer("/r/g");
+  var lexer = new Lexer("/r/g");
   var tokens = lexer.parse();
   var i = 0;
   assertEquals(tokens[i].index, 0);
@@ -101,7 +101,7 @@ LexerTest.prototype.testTokenizeRegExpWithOptions = function(){
 };
 
 LexerTest.prototype.testTokenizeRegExpWithEscape = function(){
-  var lexer = new nglr.Lexer("/\\/\\d/");
+  var lexer = new Lexer("/\\/\\d/");
   var tokens = lexer.parse();
   var i = 0;
   assertEquals(tokens[i].index, 0);
@@ -110,14 +110,14 @@ LexerTest.prototype.testTokenizeRegExpWithEscape = function(){
 };
 
 LexerTest.prototype.testIgnoreWhitespace = function(){
-  var lexer = new nglr.Lexer("a \t \n \r b");
+  var lexer = new Lexer("a \t \n \r b");
   var tokens = lexer.parse();
   assertEquals(tokens[0].text, 'a');
   assertEquals(tokens[1].text, 'b');
 };
 
 LexerTest.prototype.testRelation = function(){
-  var lexer = new nglr.Lexer("! == != < > <= >=");
+  var lexer = new Lexer("! == != < > <= >=");
   var tokens = lexer.parse();
   assertEquals(tokens[0].text, '!');
   assertEquals(tokens[1].text, '==');
@@ -129,7 +129,7 @@ LexerTest.prototype.testRelation = function(){
 };
 
 LexerTest.prototype.testStatements = function(){
-  var lexer = new nglr.Lexer("a;b;");
+  var lexer = new Lexer("a;b;");
   var tokens = lexer.parse();
   assertEquals(tokens[0].text, 'a');
   assertEquals(tokens[1].text, ';');
@@ -140,7 +140,7 @@ LexerTest.prototype.testStatements = function(){
 ParserTest = TestCase('ParserTest');
 
 ParserTest.prototype.testExpressions = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("-1"), -1);
   assertEquals(scope.eval("1 + 2.5"), 3.5);
   assertEquals(scope.eval("1 + -2.5"), -1.5);
@@ -151,7 +151,7 @@ ParserTest.prototype.testExpressions = function(){
 };
 
 ParserTest.prototype.testComparison = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("false"), false);
   assertEquals(scope.eval("!true"), false);
   assertEquals(scope.eval("1==1"), true);
@@ -163,14 +163,14 @@ ParserTest.prototype.testComparison = function(){
 };
 
 ParserTest.prototype.testLogical = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("0&&2"), 0&&2);
   assertEquals(scope.eval("0||2"), 0||2);
   assertEquals(scope.eval("0||1&&2"), 0||1&&2);
 };
 
 ParserTest.prototype.testString = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("'a' + 'b c'"), "ab c");
 };
 
@@ -182,7 +182,7 @@ ParserTest.prototype.testFilters = function(){
   angular.filter.upper = {_case:function(input) {
     return input.toUpperCase();
   }};
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   try {
     scope.eval("1|nonExistant");
     fail();
@@ -196,7 +196,7 @@ ParserTest.prototype.testFilters = function(){
 };
 
 ParserTest.prototype.testScopeAccess = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('a', 123);
   scope.set('b.c', 456);
   assertEquals(scope.eval("a", scope), 123);
@@ -205,16 +205,16 @@ ParserTest.prototype.testScopeAccess = function(){
 };
 
 ParserTest.prototype.testGrouping = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("(1+2)*3"), (1+2)*3);
 };
 
 ParserTest.prototype.testAssignments = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("a=12"), 12);
   assertEquals(scope.get("a"), 12);
 
-  scope = new nglr.Scope();
+  scope = new Scope();
   assertEquals(scope.eval("x.y.z=123;"), 123);
   assertEquals(scope.get("x.y.z"), 123);
 
@@ -224,13 +224,13 @@ ParserTest.prototype.testAssignments = function(){
 };
 
 ParserTest.prototype.testFunctionCallsNoArgs = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('const', function(a,b){return 123;});
   assertEquals(scope.eval("const()"), 123);
 };
 
 ParserTest.prototype.testFunctionCalls = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('add', function(a,b){
     return a+b;
   });
@@ -238,7 +238,7 @@ ParserTest.prototype.testFunctionCalls = function(){
 };
 
 ParserTest.prototype.testCalculationBug = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('taxRate', 8);
   scope.set('subTotal', 100);
   assertEquals(scope.eval("taxRate / 100 * subTotal"), 8);
@@ -246,7 +246,7 @@ ParserTest.prototype.testCalculationBug = function(){
 };
 
 ParserTest.prototype.testArray = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("[]").length, 0);
   assertEquals(scope.eval("[1, 2]").length, 2);
   assertEquals(scope.eval("[1, 2]")[0], 1);
@@ -254,7 +254,7 @@ ParserTest.prototype.testArray = function(){
 };
 
 ParserTest.prototype.testArrayAccess = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("[1][0]"), 1);
   assertEquals(scope.eval("[[1]][0][0]"), 1);
   assertEquals(scope.eval("[].length"), 0);
@@ -262,33 +262,33 @@ ParserTest.prototype.testArrayAccess = function(){
 };
 
 ParserTest.prototype.testObject = function(){
-  var scope = new nglr.Scope();
-  assertEquals(nglr.toJson(scope.eval("{}")), "{}");
-  assertEquals(nglr.toJson(scope.eval("{a:'b'}")), '{"a":"b"}');
-  assertEquals(nglr.toJson(scope.eval("{'a':'b'}")), '{"a":"b"}');
-  assertEquals(nglr.toJson(scope.eval("{\"a\":'b'}")), '{"a":"b"}');
+  var scope = new Scope();
+  assertEquals(toJson(scope.eval("{}")), "{}");
+  assertEquals(toJson(scope.eval("{a:'b'}")), '{"a":"b"}');
+  assertEquals(toJson(scope.eval("{'a':'b'}")), '{"a":"b"}');
+  assertEquals(toJson(scope.eval("{\"a\":'b'}")), '{"a":"b"}');
 };
 
 ParserTest.prototype.testObjectAccess = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals("WC", scope.eval("{false:'WC', true:'CC'}[false]"));
 };
 
 ParserTest.prototype.testJSON = function(){
-  var scope = new nglr.Scope();
-  assertEquals(nglr.toJson(scope.eval("[{}]")), "[{}]");
-  assertEquals(nglr.toJson(scope.eval("[{a:[]}, {b:1}]")), '[{"a":[]},{"b":1}]');
+  var scope = new Scope();
+  assertEquals(toJson(scope.eval("[{}]")), "[{}]");
+  assertEquals(toJson(scope.eval("[{a:[]}, {b:1}]")), '[{"a":[]},{"b":1}]');
 };
 
 ParserTest.prototype.testMultippleStatements = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(scope.eval("a=1;b=3;a+b"), 4);
   assertEquals(scope.eval(";;1;;"), 1);
 };
 
 ParserTest.prototype.testParseThrow = function(){
   expectAsserts(1);
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('e', 'abc');
   try {
     scope.eval("throw e");
@@ -298,7 +298,7 @@ ParserTest.prototype.testParseThrow = function(){
 };
 
 ParserTest.prototype.testMethodsGetDispatchedWithCorrectThis = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var C = function (){
     this.a=123;
   };
@@ -310,7 +310,7 @@ ParserTest.prototype.testMethodsGetDispatchedWithCorrectThis = function(){
   assertEquals(123, scope.eval("obj.getA()"));
 };
 ParserTest.prototype.testMethodsArgumentsGetCorrectThis = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var C = function (){
     this.a=123;
   };
@@ -326,13 +326,13 @@ ParserTest.prototype.testMethodsArgumentsGetCorrectThis = function(){
 };
 
 ParserTest.prototype.testObjectPointsToScopeValue = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('a', "abc");
   assertEquals("abc", scope.eval("{a:a}").a);
 };
 
 ParserTest.prototype.testFieldAccess = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var fn = function(){
       return {name:'misko'};
     };
@@ -341,14 +341,14 @@ ParserTest.prototype.testFieldAccess = function(){
 };
 
 ParserTest.prototype.testArrayIndexBug = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('items', [{}, {name:'misko'}]);
 
   assertEquals("misko", scope.eval('items[1].name'));
 };
 
 ParserTest.prototype.testArrayAssignment = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.set('items', []);
 
   assertEquals("abc", scope.eval('items[1] = "abc"'));
@@ -359,30 +359,30 @@ ParserTest.prototype.testArrayAssignment = function () {
 };
 
 ParserTest.prototype.testFiltersCanBeGrouped = function () {
-  var scope = new nglr.Scope({name:'MISKO'});
+  var scope = new Scope({name:'MISKO'});
   assertEquals('misko', scope.eval('n = (name|lowercase)'));
   assertEquals('misko', scope.eval('n'));
 };
 
 ParserTest.prototype.testFiltersCanBeGrouped = function () {
-  var scope = new nglr.Scope({name:'MISKO'});
+  var scope = new Scope({name:'MISKO'});
   assertEquals('misko', scope.eval('n = (name|lowercase)'));
   assertEquals('misko', scope.eval('n'));
 };
 
 ParserTest.prototype.testRemainder = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(1, scope.eval('1%2'));
 };
 
 ParserTest.prototype.testSumOfUndefinedIsNotUndefined = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   assertEquals(1, scope.eval('1+undefined'));
   assertEquals(1, scope.eval('undefined+1'));
 };
 
 ParserTest.prototype.testMissingThrowsError = function() {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   try {
     scope.eval('[].count(');
     fail();
@@ -392,7 +392,7 @@ ParserTest.prototype.testMissingThrowsError = function() {
 };
 
 ParserTest.prototype.testItShouldParseOnChangeIntoHashSet = function () {
-  var scope = new nglr.Scope({count:0});
+  var scope = new Scope({count:0});
   scope.watch("$anchor.a:count=count+1;$anchor.a:count=count+20;b:count=count+300");
 
   scope.watchListeners["$anchor.a"].listeners[0]();
@@ -403,7 +403,7 @@ ParserTest.prototype.testItShouldParseOnChangeIntoHashSet = function () {
   assertEquals(321, scope.get("count"));
 };
 ParserTest.prototype.testItShouldParseOnChangeBlockIntoHashSet = function () {
-  var scope = new nglr.Scope({count:0});
+  var scope = new Scope({count:0});
   var listeners = {a:[], b:[]};
   scope.watch("a:{count=count+1;count=count+20;};b:count=count+300", 
       function(n, fn){listeners[n].push(fn);});
@@ -417,12 +417,12 @@ ParserTest.prototype.testItShouldParseOnChangeBlockIntoHashSet = function () {
 };
 
 ParserTest.prototype.testItShouldParseEmptyOnChangeAsNoop = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   scope.watch("", function(){fail();});
 };
 
 ParserTest.prototype.testItShouldCreateClosureFunctionWithNoArguments = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var fn = scope.eval("{:value}");
   scope.set("value", 1);
   assertEquals(1, fn());
@@ -433,7 +433,7 @@ ParserTest.prototype.testItShouldCreateClosureFunctionWithNoArguments = function
 };
 
 ParserTest.prototype.testItShouldCreateClosureFunctionWithArguments = function () {
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var fn = scope.eval("{(a):value+a}");
   scope.set("value", 1);
   assertEquals(11, fn(10));
@@ -444,14 +444,14 @@ ParserTest.prototype.testItShouldCreateClosureFunctionWithArguments = function (
 };
 
 ParserTest.prototype.testItShouldHaveDefaultArugument = function(){
-  var scope = new nglr.Scope();
+  var scope = new Scope();
   var fn = scope.eval("{:$*2}");
   assertEquals(4, fn(2));
 };
 
 ParserTest.prototype.testReturnFunctionsAreNotBound = function(){
-  var scope = new nglr.Scope();
-  scope.set("$datastore", new nglr.DataStore());
+  var scope = new Scope();
+  scope.set("$datastore", new DataStore());
   scope.entity("Group");
   var Group = scope.get("Group");
   assertEquals("eval Group", "function", typeof scope.eval("Group"));