topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

fix: respect return value of constructors

Browse Source
This commit is contained in:
TopchetoEU 2024-02-21 11:01:33 +02:00
parent 285960bdd6
commit c6dc031cfd
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/me/topchetoeu/jscript/core/engine/values/FunctionValue.java
View File

@ -6,7 +6,6 @@ import me.topchetoeu.jscript.core.engine.Context;
public abstract class FunctionValue extends ObjectValue { public abstract class FunctionValue extends ObjectValue {
public String name = ""; public String name = "";
public boolean special = false;
public int length; public int length;
@Override @Override

2
src/java/me/topchetoeu/jscript/core/engine/values/Values.java
View File

@ -411,7 +411,7 @@ public class Values {
var ret = call(ctx, func, res, args); var ret = call(ctx, func, res, args);
if (ret != null && func instanceof FunctionValue && ((FunctionValue)func).special) return ret; if (!isPrimitive(ret)) return ret;
return res; return res;
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {

2
src/java/me/topchetoeu/jscript/utils/interop/NativeWrapperProvider.java
View File

@ -247,8 +247,6 @@ public class NativeWrapperProvider implements WrapperProvider {
new NativeFunction(getName(clazz), args -> { throw EngineException.ofError("This constructor is not invokable."); }) : new NativeFunction(getName(clazz), args -> { throw EngineException.ofError("This constructor is not invokable."); }) :
create(getName(clazz), constr); create(getName(clazz), constr);
res.special = true;
apply(res, ctx, ExposeTarget.CONSTRUCTOR, clazz); apply(res, ctx, ExposeTarget.CONSTRUCTOR, clazz);
return res; return res;