Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions polymod/hscript/_internal/Expr.hx
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ enum Error
EConflictingAccessModifier(access:String);
EInvalidVariableAccessor(access:String);
EInvalidStaticLocalInit(name:String, reason:String);
EInvalidConstructorCall(clsName:String);
// Fallback error type.
ECustom(msg:String);
}
Expand Down
16 changes: 16 additions & 0 deletions polymod/hscript/_internal/Interp.hx
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,12 @@ class Interp
checkTypeForDeprecation(oScriptCls);
checkFieldForDeprecation(oScriptCls, f);

if (f == "new" && (o is Class || o is PolymodStaticClassReference))
{
var clsName = o is Class ? Type.getClassName(o) : cast(o, PolymodStaticClassReference).getFullyQualifiedName();
return error(EInvalidConstructorCall(clsName));
}

if (Std.isOfType(o, PolymodStaticAbstractReference))
{
var ref:PolymodStaticAbstractReference = cast(o, PolymodStaticAbstractReference);
Expand Down Expand Up @@ -3894,6 +3900,16 @@ class Interp
}
}

if (f == "new" && (o is Class || o is PolymodStaticClassReference))
{
return Reflect.makeVarArgs((args:Array<Dynamic>) -> {
if (o is Class)
return Type.createInstance(cast o, args);
else
return cast(o, PolymodStaticClassReference).instantiate(args);
});
}

#if html5
if (o == Math)
{
Expand Down
1 change: 1 addition & 0 deletions polymod/hscript/_internal/Printer.hx
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,7 @@ class Printer
case EConflictingAccessModifier(access): 'Conflicting access modifier "$access"';
case EInvalidVariableAccessor(access): 'Invalid modifier: "$access" on variable';
case EInvalidStaticLocalInit(name, reason): 'Cannot initialize static variable "${name}": $reason';
case EInvalidConstructorCall(clsName): 'Invalid constructor call, use "new ${clsName}()" instead';
case ECustom(msg): msg;
};
#if hscriptPos
Expand Down
Loading