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

fix: handle native errors properly-ish

Browse Source
This commit is contained in:
TopchetoEU 2023-11-25 14:18:46 +02:00
parent 55e3d46bc2
commit 987f8b8f00
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/me/topchetoeu/jscript/interop/NativeWrapperProvider.java
View File

@ -108,6 +108,12 @@ public class NativeWrapperProvider implements WrappersProvider {
} }
} }
public static String getName(Class<?> clazz) {
var classNat = clazz.getAnnotation(Native.class);
if (classNat != null && !classNat.value().trim().equals("")) return classNat.value().trim();
else return clazz.getSimpleName();
}
/** /**
* Generates a prototype for the given class. * Generates a prototype for the given class.
* The returned object will have appropriate wrappers for all instance members. * The returned object will have appropriate wrappers for all instance members.
@ -117,10 +123,7 @@ public class NativeWrapperProvider implements WrappersProvider {
public static ObjectValue makeProto(Environment ctx, Class<?> clazz) { public static ObjectValue makeProto(Environment ctx, Class<?> clazz) {
var res = new ObjectValue(); var res = new ObjectValue();
var name = clazz.getName(); res.defineProperty(null, ctx.symbol("Symbol.typeName"), getName(clazz));
var classNat = clazz.getAnnotation(Native.class);
if (classNat != null && !classNat.value().trim().equals("")) name = classNat.value().trim();
res.defineProperty(null, ctx.symbol("Symbol.typeName"), name);
for (var overload : clazz.getDeclaredMethods()) { for (var overload : clazz.getDeclaredMethods()) {
var init = overload.getAnnotation(NativeInit.class); var init = overload.getAnnotation(NativeInit.class);
@ -142,11 +145,7 @@ public class NativeWrapperProvider implements WrappersProvider {
* @param clazz The class for which a constructor should be generated * @param clazz The class for which a constructor should be generated
*/ */
public static FunctionValue makeConstructor(Environment ctx, Class<?> clazz) { public static FunctionValue makeConstructor(Environment ctx, Class<?> clazz) {
var name = clazz.getName(); FunctionValue func = new OverloadFunction(getName(clazz));
var classNat = clazz.getAnnotation(Native.class);
if (classNat != null && !classNat.value().trim().equals("")) name = classNat.value().trim();
FunctionValue func = new OverloadFunction(name);
for (var overload : clazz.getDeclaredConstructors()) { for (var overload : clazz.getDeclaredConstructors()) {
var nat = overload.getAnnotation(Native.class); var nat = overload.getAnnotation(Native.class);
@ -261,7 +260,27 @@ public class NativeWrapperProvider implements WrappersProvider {
constructors.put(clazz, value); constructors.put(clazz, value);
} }
private void initError() {
var proto = new ObjectValue();
proto.defineProperty(null, "message", new NativeFunction("message", (ctx, thisArg, args) -> {
if (thisArg instanceof Throwable) return ((Throwable)thisArg).getMessage();
else return null;
}));
proto.defineProperty(null, "name", new NativeFunction("name", (ctx, thisArg, args) -> getName(thisArg.getClass())));
var constr = makeConstructor(null, Throwable.class);
proto.defineProperty(null, "constructor", constr, true, false, false);
constr.defineProperty(null, "prototype", proto, true, false, false);
proto.setPrototype(null, getProto(Object.class));
constr.setPrototype(null, getConstr(Object.class));
setProto(Throwable.class, proto);
setConstr(Throwable.class, constr);
}
public NativeWrapperProvider(Environment env) { public NativeWrapperProvider(Environment env) {
this.env = env; this.env = env;
initError();
} }
} }

10
src/me/topchetoeu/jscript/interop/OverloadFunction.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import me.topchetoeu.jscript.Location; import me.topchetoeu.jscript.Location;
import me.topchetoeu.jscript.engine.Context; import me.topchetoeu.jscript.engine.Context;
import me.topchetoeu.jscript.engine.values.FunctionValue; import me.topchetoeu.jscript.engine.values.FunctionValue;
import me.topchetoeu.jscript.engine.values.NativeWrapper;
import me.topchetoeu.jscript.engine.values.Values; import me.topchetoeu.jscript.engine.values.Values;
import me.topchetoeu.jscript.exceptions.ConvertException; import me.topchetoeu.jscript.exceptions.ConvertException;
import me.topchetoeu.jscript.exceptions.EngineException; import me.topchetoeu.jscript.exceptions.EngineException;
@ -92,7 +93,14 @@ public class OverloadFunction extends FunctionValue {
throw new InterruptException(); throw new InterruptException();
} }
else { else {
throw EngineException.ofError(e.getTargetException().getMessage()).add(name, loc); var target = e.getTargetException();
var targetClass = target.getClass();
var err = new NativeWrapper(e.getTargetException());
err.defineProperty(ctx, "message", target.getMessage());
err.defineProperty(ctx, "name", NativeWrapperProvider.getName(targetClass));
throw new EngineException(err).add(name, loc);
} }
} }
catch (ReflectiveOperationException e) { catch (ReflectiveOperationException e) {