Merge remote-tracking branch 'haxe/master' into funkin-dev

Author: EliteMasterEric

TestHScript.hx

@@ -49,6 +49,10 @@ class TestHScript extends TestCase {
 		assertScript("- 123",-123);
 		assertScript("1.546",1.546);
 		assertScript(".545",.545);
+		assertScript("1e5",100000);
+		assertScript("1.2e2",120);
+		assertScript("100e-2",1);
+		assertScript("1.2e-1",0.12);
 		assertScript("'bla'","bla");
 		assertScript("null",null);
 		assertScript("true",true);
@@ -120,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] });
@@ -245,4 +255,4 @@ class TestHScript extends TestCase {
 		#end
 	}
 
-}
+}

haxelib.json

@@ -3,7 +3,7 @@
   "url": "https://github.com/HaxeFoundation/hscript",
   "license": "MIT",
   "description": "Haxe Script is a scripting engine for a subset of the Haxe language",
-  "version": "2.5.1",
-  "releasenote": "Haxe 4.2 compat and bug fixes",
+  "version": "2.6.0",
+  "releasenote": "More Haxe 4/5 features",
   "contributors": ["ncannasse","HaxeFoundation"]
 }

hscript/Checker.hx

@@ -327,6 +327,7 @@ class Checker {
 	var currentFunType : TType;
 	var isCompletion : Bool;
 	var allowDefine : Bool;
+	var hasReturn : Bool;
 	public var allowAsync : Bool;
 	public var allowReturn : Null<TType>;
 	public var allowGlobalsDefine : Bool;
@@ -337,10 +338,10 @@ class Checker {
 		this.types = types;
 	}
 
-	public function setGlobals( cl : CClass ) {
+	public function setGlobals( cl : CClass, allowPrivate = false ) {
 		while( true ) {
 			for( f in cl.fields )
-				if( f.isPublic )
+				if( f.isPublic || allowPrivate )
 					setGlobal(f.name, f.params.length == 0 ? f.t : TLazy(function() return apply(f.t,f.params,[for( i in 0...f.params.length) makeMono()])));
 			if( cl.superClass == null )
 				break;
@@ -367,6 +368,10 @@ class Checker {
 		return globals;
 	}
 
+	public dynamic function onTopDownEnum( en : CEnum, field : String ) {
+		return false;
+	}
+
 	function typeArgs( args : Array<Argument>, pos : Expr ) {
 		return [for( i in 0...args.length ) {
 			var a = args[i];
@@ -709,7 +714,7 @@ class Checker {
 					default: throw "assert";
 					}
 				}
-				if( !typeEq(f1.t,f2.t) )
+				if( !typeEq(apply(f1.t,cl1.params,pl1),f2.t) )
 					return false;
 			}
 			return true;
@@ -815,6 +820,9 @@ class Checker {
 		case TAnon(fl):
 			for( f in fl )
 				fields.push({ name : f.name, t : f.t });
+		case TFun(args, ret):
+			if( isCompletion )
+				fields.push({ name : "bind", t : TFun(args,TVoid) });
 		default:
 		}
 		return fields;
@@ -956,7 +964,19 @@ class Checker {
 			case "trace":
 				return TDynamic;
 			default:
-				if( isCompletion) return TDynamic;
+				switch( withType ) {
+				case WithType(et = TEnum(e, args)):
+					for( c in e.constructors )
+						if( c.name == v ) {
+							if( onTopDownEnum(e,v) ) {
+								var ct = c.args == null ? et : TFun(c.args, et);
+								return apply(ct, e.params, args);
+							}
+							break;
+						}
+				default:
+				}
+				if( isCompletion ) return TDynamic;
 				error("Unknown identifier "+v, expr);
 			}
 		case EBlock(el):
@@ -977,7 +997,29 @@ class Checker {
 		case EParent(e):
 			return typeExpr(e,withType);
 		case ECall(e, params):
-			var ft = typeExpr(e, Value);
+			switch( edef(e) ) {
+			case EField(val, "bind"):
+				var ft = typeExpr(val, Value);
+				switch( ft ) {
+				case TFun(args,ret):
+					var remainArgs = args.copy();
+					for( p in params ) {
+						var a = remainArgs.shift();
+						if( a == null ) {
+							error("Too many arguments", p);
+							return TFun([], ret);
+						}
+						typeExprWith(p, a.t);
+					}
+					return TFun(remainArgs, ret);
+				default:
+				}
+			default:
+			}
+			var ft = typeExpr(e, switch( [edef(e),withType] ) {
+				case [EIdent(_),WithType(TEnum(_))]: withType;
+				default: Value;
+			});
 			switch( follow(ft) ) {
 			case TFun(args, ret):
 				for( i in 0...params.length ) {
@@ -1047,6 +1089,7 @@ class Checker {
 			return TVoid;
 		case EReturn(v):
 			var et = v == null ? TVoid : typeExpr(v, allowReturn == null ? Value : WithType(allowReturn));
+			hasReturn = true;
 			if( allowReturn == null )
 				error("Return not allowed here", expr);
 			else
@@ -1089,8 +1132,10 @@ class Checker {
 			var locals = saveLocals();
 			var oldRet = allowReturn;
 			var oldGDef = allowDefine;
+			var oldHasRet = hasReturn;
 			allowReturn = tret;
 			allowDefine = false;
+			hasReturn = false;
 			var withArgs = null;
 			if( name != null && !withType.match(WithType(follow(_) => TFun(_))) ) {
 				var ev = events.get(name);
@@ -1115,8 +1160,11 @@ class Checker {
 			if( withArgs != null && targs.length < withArgs.length )
 				error("Missing "+(withArgs.length - targs.length)+" arguments ("+[for( i in targs.length...withArgs.length ) typeStr(withArgs[i].t)].join(",")+")", expr);
 			typeExpr(body,NoValue);
+			if( !hasReturn && !tryUnify(tret, TVoid) )
+				error("Missing return "+typeStr(tret), expr);
 			allowDefine = oldGDef;
 			allowReturn = oldRet;
+			hasReturn = oldHasRet;
 			this.locals = locals;
 			if( ft == null ) {
 				ft = TFun(targs, tret);
@@ -1284,7 +1332,8 @@ class Checker {
 			case TAbstract(a, args):
 				// special case : we allow unconditional access
 				// to an abstract iterator() underlying value (eg: ArrayProxy)
-				ft = getField(apply(a.t,a.params,args),"iterator",it);
+				var at = apply(a.t,a.params,args);
+				return getIteratorType(it, at);
 			default:
 			}
 		if( ft != null )

hscript/JsInterp.hx

@@ -80,7 +80,7 @@ class JsInterp extends Interp {
 		#if hscriptPos
 		var expr = curExpr;
 		var p = '{pmin:,pmax:,origin:"",line:}';
-		return '($$i._p(${expr.pmin},${expr.pmax},${expr.origin},${expr.line}),$estr)';
+		return '($$i._p(${expr.pmin},${expr.pmax},"${expr.origin}",${expr.line}),$estr)';
 		#else
 		return estr;
 		#end

hscript/Parser.hx

@@ -601,10 +601,17 @@ class Parser {
 				tk = token();
 			}
 			var e = null;
-			if( Type.enumEq(tk,TOp("=")) )
-				e = parseExpr();
-			else
-				push(tk);
+
+			switch (tk)
+			{
+				case TOp("="): e = parseExpr();
+				case TOp(_): unexpected(tk);
+				case TComma | TSemicolon: push(tk);
+				// Above case should be enough but semicolon is not mandatory after }
+				case _ if (t != null): push(tk);
+				default: unexpected(tk);
+			}
+
 			mk(EVar(ident,t,e),p1,(e == null) ? tokenMax : pmax(e));
 		case "while":
 			var econd = parseExpr();
@@ -1393,6 +1400,8 @@ class Parser {
 						}
 						if( pow == null )
 							invalidChar(char);
+						if( exp == 0 )
+							exp = 10;
 						return TConst(CFloat((Math.pow(10, pow) / exp) * n * 10));
 					case ".".code:
 						if( exp > 0 ) {