added EForGen parsing and key=>value iterator support

Author: ncannasse

hscript/Bytes.hx

@@ -173,6 +173,9 @@ class Bytes {
 			doEncodeString(v);
 			doEncode(it);
 			doEncode(e);
+		case EForGen(it,e):
+			doEncode(it);
+			doEncode(e);
 		case EBreak, EContinue:
 		case EFunction(params,e,name,_):
 			bout.addByte(params.length);
@@ -362,6 +365,8 @@ class Bytes {
 			EMeta(name, args, doDecode());
 		case 26:
 			ECheckType(doDecode(), CTPath(["Void"]));
+		case 27:
+			EForGen(doDecode(), doDecode());
 		case 255:
 			null;
 		default:

hscript/Checker.hx

@@ -1217,11 +1217,26 @@ class Checker {
 		case EFor(v, it, e):
 			var locals = saveLocals();
 			var itt = typeExpr(it, Value);
-			var vt = getIteratorType(it, itt);
+			var vt = getIteratorType(itt, it);
 			this.locals.set(v, vt);
 			typeExpr(e, NoValue);
 			this.locals = locals;
 			return TVoid;
+		case EForGen(it, e):
+			Tools.getKeyIterator(it,function(vk,vv,it) {
+				if( vk == null ) {
+					error("Invalid for expression", it);
+					return;
+				}
+				var locals = saveLocals();
+				var itt = typeExpr(it, Value);
+				var types = getKeyIteratorTypes(itt, it);
+				this.locals.set(vk, types.key);
+				this.locals.set(vv, types.value);
+				typeExpr(e, NoValue);
+				this.locals = locals;
+			});
+			return TVoid;
 		case EBinop(op, e1, e2):
 			switch( op ) {
 			case "&", "|", "^", ">>", ">>>", "<<":
@@ -1352,7 +1367,7 @@ class Checker {
 		return TDynamic;
 	}
 
-	function getIteratorType( it : Expr, itt : TType ) {
+	function getIteratorType( itt : TType, it : Expr ) {
 		switch( follow(itt) ) {
 		case TInst({name:"Array"},[t]):
 			return t;
@@ -1365,7 +1380,7 @@ class Checker {
 				// special case : we allow unconditional access
 				// to an abstract iterator() underlying value (eg: ArrayProxy)
 				var at = apply(a.t,a.params,args);
-				return getIteratorType(it, at);
+				return getIteratorType(at, it);
 			default:
 			}
 		if( ft != null )
@@ -1379,4 +1394,34 @@ class Checker {
 		return t;
 	}
 
+
+	function getKeyIteratorTypes( itt : TType, it : Expr ) {
+		switch( follow(itt) ) {
+		case TInst({name:"Array"},[t]):
+			return { key : TInt, value : t };
+		default:
+		}
+		var ft = getField(itt,"keyValueIterator", it);
+		if( ft == null )
+			switch( itt ) {
+			case TAbstract(a, args):
+				// special case : we allow unconditional access
+				// to an abstract keyValueIterator() underlying value (eg: ArrayProxy)
+				var at = apply(a.t,a.params,args);
+				return getKeyIteratorTypes(at, it);
+			default:
+			}
+		if( ft != null )
+			switch( ft ) {
+			case TFun([],ret): ft = ret;
+			default: ft = null;
+			}
+		var key = makeMono();
+		var value = makeMono();
+		var iter = makeIterator(TAnon([{name:"key",t:key,opt:false},{name:"value",t:value,opt:false}]));
+		unify(ft != null ? ft : itt,iter,it);
+		return { key : key, value : value };
+	}
+
+
 }

hscript/Expr.hx

@@ -67,6 +67,7 @@ enum Expr {
 	EDoWhile( cond : Expr, e : Expr);
 	EMeta( name : String, args : Array<Expr>, e : Expr );
 	ECheckType( e : Expr, t : CType );
+	EForGen( it : Expr, e : Expr );
 }
 
 typedef Argument = { name : String, ?t : CType, ?opt : Bool, ?value : Expr };

hscript/Interp.hx

@@ -364,6 +364,18 @@ class Interp {
 		case EFor(v,it,e):
 			forLoop(v,it,e);
 			return null;
+		case EForGen(it,e):
+			Tools.getKeyIterator(it, function(vk,vv,it) {
+				if( vk == null ) {
+					#if hscriptPos
+					curExpr = it;
+					#end
+					error(ECustom("Invalid for expression"));
+					return;
+				}
+				forKeyValueLoop(vk,vv,it,e);
+			});
+			return null;
 		case EBreak:
 			throw SBreak;
 		case EContinue:
@@ -554,9 +566,7 @@ class Interp {
 	}
 
 	function makeIterator( v : Dynamic ) : Iterator<Dynamic> {
-		#if ((flash && !flash9) || (php && !php7 && haxe_ver < '4.0.0'))
-		if ( v.iterator != null ) v = v.iterator();
-		#elseif js
+		#if js
 		// don't use try/catch (very slow)
 		if( v is Array )
 			return (v : Array<Dynamic>).iterator();
@@ -568,6 +578,19 @@ class Interp {
 		return v;
 	}
 
+	function makeKeyValueIterator( v : Dynamic ) : KeyValueIterator<Dynamic,Dynamic> {
+		#if js
+		// don't use try/catch (very slow)
+		if( v is Array )
+			return (v : Array<Dynamic>).keyValueIterator();
+		if( v.keyValueIterator != null ) v = v.keyValueIterator();
+		#else
+		try v = v.keyValueIterator() catch( e : Dynamic ) {};
+		#end
+		if( v.hasNext == null || v.next == null ) error(EInvalidIterator(v));
+		return v;
+	}
+
 	function forLoop(n,it,e) {
 		var old = declared.length;
 		declared.push({ n : n, old : locals.get(n) });
@@ -580,6 +603,21 @@ class Interp {
 		restore(old);
 	}
 
+	function forKeyValueLoop(vk,vv,it,e) {
+		var old = declared.length;
+		declared.push({ n : vk, old : locals.get(vk) });
+		declared.push({ n : vv, old : locals.get(vv) });
+		var it = makeKeyValueIterator(expr(it));
+		while( it.hasNext() ) {
+			var v = it.next();
+			locals.set(vk,{ r : v.key });
+			locals.set(vv,{ r : v.value });
+			if( !loopRun(() -> expr(e)) )
+				break;
+		}
+		restore(old);
+	}
+
 	inline function loopRun( f : Void -> Void ) {
 		var cont = true;
 		try {

hscript/Macro.hx

@@ -171,13 +171,10 @@ class Macro {
 			case EDoWhile(c, e):
 				EWhile(convert(c), convert(e), false);
 			case EFor(v, it, efor):
-				#if (haxe_ver >= 4)
-					var p = #if (!macro && hscriptPos) { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
-					EFor({ expr : EBinop(OpIn,{ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
-				#else
-					var p = #if (!macro && hscriptPos) { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
-					EFor({ expr : EIn({ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
-				#end
+				var p = #if (!macro && hscriptPos) { file : p.file, min : e.pmin, max : e.pmax } #else p #end;
+				EFor({ expr : EBinop(OpIn,{ expr : EConst(CIdent(v)), pos : p },convert(it)), pos : p }, convert(efor));
+			case EForGen(it, efor):
+				EFor(convert(it), convert(efor));
 			case EBreak:
 				EBreak;
 			case EContinue:

hscript/Parser.hx

@@ -118,7 +118,8 @@ class Parser {
 			["&&"],
 			["||"],
 			["=","+=","-=","*=","/=","%=","<<=",">>=",">>>=","|=","&=","^=","=>"],
-			["->"]
+			["->"],
+			["in","is"]
 		];
 		opPriority = new Map();
 		opRightAssoc = new Map();
@@ -532,6 +533,8 @@ class Parser {
 		var edef = switch( expr(e) ) {
 		case EFor(v, it, e2):
 			EFor(v, it, mapCompr(tmp, e2));
+		case EForGen(it, e2):
+			EForGen(it, mapCompr(tmp, e2));
 		case EWhile(cond, e2):
 			EWhile(cond, mapCompr(tmp, e2));
 		case EDoWhile(cond, e2):
@@ -563,7 +566,8 @@ class Parser {
 			return mk(EBinop(op,e1,e),pmin(e1),pmax(e1));
 		return switch( expr(e) ) {
 		case EBinop(op2,e2,e3):
-			if( opPriority.get(op) <= opPriority.get(op2) && !opRightAssoc.exists(op) )
+			var delta = opPriority.get(op) - opPriority.get(op2);
+			if( delta < 0 || (delta == 0 && !opRightAssoc.exists(op)) )
 				mk(EBinop(op2,makeBinop(op,e1,e2),e3),pmin(e1),pmax(e3));
 			else
 				mk(EBinop(op, e1, e), pmin(e1), pmax(e));
@@ -638,12 +642,19 @@ class Parser {
 			mk(EDoWhile(econd,e),p1,pmax(econd));
 		case "for":
 			ensure(TPOpen);
-			var vname = getIdent();
-			ensureToken(TId("in"));
-			var eiter = parseExpr();
+			var eit = parseExpr();
 			ensure(TPClose);
 			var e = parseExpr();
-			mk(EFor(vname,eiter,e),p1,pmax(e));
+			switch( expr(eit) ) {
+			case EBinop("in",ev,eit):
+				switch( expr(ev) ) {
+				case EIdent(v):
+					return mk(EFor(v,eit,e),p1,pmax(e));
+				default:
+				}
+			default:
+			}
+			mk(EForGen(eit,e),p1,pmax(e));
 		case "break": mk(EBreak);
 		case "continue": mk(EContinue);
 		case "else": unexpected(TId(id));
@@ -803,8 +814,8 @@ class Parser {
 				return parseExprNext(mk(EUnop(op,false,e1),pmin(e1)));
 			}
 			return makeBinop(op,e1,parseExpr());
-		case TId(op) if ( op == 'is' ):
-			return makeBinop(op,e1,parseExpr());
+		case TId(op) if( opPriority.exists(op) ):
+			return parseExprNext(makeBinop(op,e1,parseExpr()));
 		case TDot:
 			var field = getIdent();
 			return parseExprNext(mk(EField(e1,field),pmin(e1)));

hscript/Printer.hx

@@ -208,6 +208,11 @@ class Printer {
 			expr(it);
 			add(" ) ");
 			expr(e);
+		case EForGen(it, e):
+			add("for( ");
+			expr(it);
+			add(" ) ");
+			expr(e);
 		case EBreak:
 			add("break");
 		case EContinue:

hscript/Tools.hx

@@ -38,6 +38,7 @@ class Tools {
 		case EWhile(c, e): f(c); f(e);
 		case EDoWhile(c, e): f(c); f(e);
 		case EFor(_, it, e): f(it); f(e);
+		case EForGen(it, e): f(it); f(e);
 		case EBreak,EContinue:
 		case EFunction(_, e, _, _): f(e);
 		case EReturn(e): if( e != null ) f(e);
@@ -74,6 +75,7 @@ class Tools {
 		case EWhile(c, e): EWhile(f(c),f(e));
 		case EDoWhile(c, e): EDoWhile(f(c),f(e));
 		case EFor(v, it, e): EFor(v, f(it), f(e));
+		case EForGen(it, e): EForGen(f(it), f(e));
 		case EFunction(args, e, name, t): EFunction(args, f(e), name, t);
 		case EReturn(e): EReturn(if( e != null ) f(e) else null);
 		case EArray(e, i): EArray(f(e),f(i));
@@ -106,4 +108,24 @@ class Tools {
 		#end
 	}
 
+	public static inline function getKeyIterator<T>( e : Expr, callb : String -> String -> Expr -> T ) {
+		var key = null, value = null, it = e;
+		switch( expr(it) ) {
+		case EBinop("in", ekv, eiter):
+			switch( expr(ekv) ) {
+			case EBinop("=>",v1,v2):
+				switch( [expr(v1),expr(v2)] ) {
+				case [EIdent(v1), EIdent(v2)]:
+					key = v1;
+					value = v2;
+					it = eiter;
+				default:
+				}
+			default:
+			}
+		default:
+		}
+		return callb(key,value,it);
+	}
+
 }