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

regress: simplify invoke model

Browse Source
This commit is contained in:
TopchetoEU 2024-11-23 20:11:12 +02:00
parent fe8f65faf5
commit 92fb0dbbfd
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/me/topchetoeu/jscript/runtime/values/Value.java
View File

@ -82,38 +82,25 @@ public abstract class Value {
return this == NumberValue.NAN || this instanceof NumberValue num && Double.isNaN(num.getDouble()); return this == NumberValue.NAN || this instanceof NumberValue num && Double.isNaN(num.getDouble());
} }
public Value call(Environment env, boolean isNew, String name, Value self, Value ...args) { public Value apply(Environment env, Value self, Value ...args) {
if (name == null || name.equals("")) name = "(intermediate value)"; throw EngineException.ofType("Value is not a function");
if (isNew) throw EngineException.ofType(name + " is not a constructor");
else throw EngineException.ofType(name + " is not a function");
} }
public Value construct(Environment env, Value self, Value ...args) {
throw EngineException.ofType("Value is not a constructor");
}
public final Value apply(Environment env, String name, Value self, Value ...args) { public final Value construct(Environment env, Value ...args) {
return call(env, false, name, self, args);
}
public final Value construct(Environment env, String name, Value ...args) {
var res = new ObjectValue(); var res = new ObjectValue();
var proto = getMember(env, StringValue.of("prototype")); var proto = getMember(env, StringValue.of("prototype"));
if (proto instanceof ObjectValue) res.setPrototype(env, (ObjectValue)proto); if (proto instanceof ObjectValue) res.setPrototype(env, (ObjectValue)proto);
var ret = this.call(env, true, name, res, args); var ret = this.construct(env, res, args);
if (!ret.isPrimitive()) return ret; if (ret == Value.UNDEFINED || ret.isPrimitive()) return res;
return res; return ret;
}
public final Value construct(Environment env, String name, Value self, Value ...args) {
var ret = this.call(env, true, name, self, args);
return ret.isPrimitive() ? self : ret;
} }
public final Value apply(Environment env, Value self, Value ...args) {
return apply(env, "", self, args);
}
public final Value construct(Environment env, Value ...args) {
return construct(env, "", args);
}
public abstract Value toPrimitive(Environment env); public abstract Value toPrimitive(Environment env);
public abstract NumberValue toNumber(Environment env); public abstract NumberValue toNumber(Environment env);