Change init to not use the super constructor arguments

Author: NotHyper-474

polymod/hscript/_internal/HScriptedClassMacro.hx

@@ -123,7 +123,7 @@ class HScriptedClassMacro
 								for (arg in args)
 									{name: arg.name, opt: arg.opt, type: Context.toComplexType(arg.t)}
 							];
-							var initField:Field = buildScriptedClassInit(cls, superCls, constArgs);
+							var initField:Field = buildScriptedClassInit(cls, superCls);
 							fields.push(initField);
 							constructor = buildScriptedClassConstructor(constArgs);
 						case TLazy(builder):
@@ -136,7 +136,7 @@ class HScriptedClassMacro
 										for (arg in args)
 											{name: arg.name, opt: arg.opt, type: Context.toComplexType(arg.t)}
 									];
-									var initField:Field = buildScriptedClassInit(cls, superCls, constArgs);
+									var initField:Field = buildScriptedClassInit(cls, superCls);
 									fields.push(initField);
 									constructor = buildScriptedClassConstructor(constArgs);
 								default:
@@ -151,7 +151,7 @@ class HScriptedClassMacro
 					constructor = buildEmptyScriptedClassConstructor();
 					// Create scripted class utility functions.
 					Context.info('  Creating scripted class utils...', Context.currentPos());
-					var initField:Field = buildScriptedClassInit(cls, superCls, []);
+					var initField:Field = buildScriptedClassInit(cls, superCls);
 					fields.push(initField);
 					fields.push(constructor);
 				}
@@ -166,13 +166,10 @@ class HScriptedClassMacro
 		return fields;
 	}
 
-	static function buildScriptedClassInit(cls:haxe.macro.Type.ClassType, superCls:haxe.macro.Type.ClassType, superConstArgs:Array<FunctionArg>):Field
+	static function buildScriptedClassInit(cls:haxe.macro.Type.ClassType, superCls:haxe.macro.Type.ClassType):Field
 	{
 		// Context.info('  Building scripted class init() function', Context.currentPos());
 		var clsTypeName:String = cls.pack.join('.') != '' ? '${cls.pack.join('.')}.${cls.name}' : cls.name;
-		var superClsTypeName:String = superCls.pack.join('.') != '' ? '${superCls.pack.join('.')}.${superCls.name}' : superCls.name;
-
-		var constArgs = [for (arg in superConstArgs) macro $i{arg.name}];
 		var typePath:haxe.macro.TypePath = {
 			pack: cls.pack,
 			name: cls.name,
@@ -184,7 +181,7 @@ class HScriptedClassMacro
 			meta: null,
 			pos: cls.pos,
 			kind: FFun({
-				args: [{name: 'clsName', type: macro :String},].concat(superConstArgs),
+				args: [{name: 'clsName', type: macro :String}, {name: 'args', type: macro :...Dynamic}],
 				params: null,
 				ret: Context.toComplexType(Context.getType(clsTypeName)),
 				expr: macro
@@ -198,7 +195,9 @@ class HScriptedClassMacro
 					}
 
 					try {
-						var result = clsRef.instantiate([$a{constArgs}]);
+						if (args == null) args = haxe.Rest.of([]);
+
+						var result = clsRef.instantiate(args.toArray());
 						if (result == null)
 						{
 							polymod.Polymod.error(SCRIPT_RUNTIME_EXCEPTION, 'Could not construct instance of scripted class (${clsName} extends ' + $v{clsTypeName} + '):\nUnknown error instantiating class');

polymod/hscript/_internal/PolymodInterpEx.hx

@@ -1184,6 +1184,14 @@ class PolymodInterpEx extends Interp
 		if (o == null)
 			errorEx(ENullObjectReference(f));
 
+		// Backwards compatibility for HScriptedClass.init since Haxe.Rest doesn't work with reflection.
+		// Std.isOfType(o, HScriptedClass) doesn't work if the type was retrieved from Type.resolveClass
+		// so to double check, we see if the function scriptStaticGet exists
+		if (f == 'init' && o.scriptStaticGet != null)
+		{
+			return Reflect.makeVarArgs((args:Array<Dynamic>) -> return o.init(args[0], args.slice(1)));
+		}
+
 		var oCls:String = Util.getTypeName(Type.typeof(o));
 
 		// Check if the field is a blacklisted static field.