Merge pull request #108 from kLabz/fix/disallow-operators-var-declaration

Disallow arbitrary operators in variable declaration

Author: kLabz

TestHScript.hx

@@ -124,6 +124,12 @@ class TestHScript extends TestCase {
 		assertScript("var f:(x:Int)->(Int, Int)->Int = (x:Int) -> (y:Int, z:Int) -> x + y + z; f(3)(1, 2)", 6, null, true);
 		assertScript("var a = 10; var b = 5; a - -b", 15);
 		assertScript("var a = 10; var b = 5; a - b / 2", 7.5);
+		assertScript("var a; a", null);
+		assertScript("var a = 1, b = 5; a + b;", 6);
+		assertScript("var a, b = 5; if (a == null) a = 2; a + b;", 7);
+		assertScript("var a:Int; a", null, null, true);
+		assertScript("var a:Int = 1, b:Int = 5; a + b;", 6, null, true);
+		assertScript("var a:Int, b:Int = 5; if (a == null) a = 2; a + b;", 7, null, true);
 		assertScript("false && xxx", false);
 		assertScript("true || xxx", true);
 		assertScript("[for( x in arr ) switch( x ) { case 1: 55; case 3: 66; default: 0; }].join(':')",'55:0:66',{ arr : [1,2,3] });
@@ -249,4 +255,4 @@ class TestHScript extends TestCase {
 		#end
 	}
 
-}
+}

hscript/Parser.hx

@@ -601,10 +601,14 @@ class Parser {
 				tk = token();
 			}
 			var e = null;
-			if( Type.enumEq(tk,TOp("=")) )
-				e = parseExpr();
-			else
-				push(tk);
+
+			switch (tk)
+			{
+				case TOp("="): e = parseExpr();
+				case TComma | TSemicolon: push(tk);
+				default: unexpected(tk);
+			}
+
 			mk(EVar(ident,t,e),p1,(e == null) ? tokenMax : pmax(e));
 		case "while":
 			var econd = parseExpr();