Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

For compatibility allow jsFunction_* to return non-scriptable type. Not to

Browse Source 
perform type conversion checks for methods that do return proper JS type the
type check is done only once in the constructor and if necessary a flag is set
to call WrapFaactory.wrap on method return.
This commit is contained in:
igor%mir2.org 2004-09-25 09:24:43 +00:00
parent cab30c29b3
commit 33b74641f5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/rhino/src/org/mozilla/javascript/FunctionObject.java
View File

@ -173,12 +173,7 @@ public class FunctionObject extends BaseFunction
if (returnType == Void.TYPE) {
hasVoidReturn = true;
} else {
int returnTypeTag = getTypeTag(returnType);
if (returnTypeTag == JAVA_UNSUPPORTED_TYPE) {
throw Context.reportRuntimeError2(
"msg.bad.method.return",
returnType.getName(), methodName);
}
returnTypeTag = getTypeTag(returnType);
}
member.prepareInvokerOptimization();
} else {
@ -446,6 +441,9 @@ public class FunctionObject extends BaseFunction
Object result;
if (member.isMethod()) {
result = member.invoke(thisObj, invokeArgs);
if (returnTypeTag == JAVA_UNSUPPORTED_TYPE) {
result = cx.getWrapFactory().wrap(cx, scope, result, null);
}
} else {
result = member.newInstance(invokeArgs);
}
@ -510,6 +508,15 @@ public class FunctionObject extends BaseFunction
typeTags[i] = (byte)getTypeTag(types[i]);
}
}
if (member.isMethod()) {
Method method = member.method();
Class returnType = method.getReturnType();
if (returnType == Void.TYPE) {
hasVoidReturn = true;
} else {
returnTypeTag = getTypeTag(returnType);
}
}
}
private static final short VARARGS_METHOD = -1;
@ -526,8 +533,9 @@ public class FunctionObject extends BaseFunction
public static final int JAVA_OBJECT_TYPE = 6;
MemberBox member;
transient private byte[] typeTags;
private transient byte[] typeTags;
private int parmsLength;
private boolean hasVoidReturn;
private transient boolean hasVoidReturn;
private transient int returnTypeTag;
private boolean isStatic;
}