antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Simplify getValidPrototype() and hasFunction() a bit.

Browse source 
* No need to catch exceptions in hasFunction().
This commit is contained in:
hns 2006-01-12 16:01:11 +00:00
parent 63b6b2843d
commit dcf63357f7
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/helma/scripting/rhino/RhinoCore.java
View file

@ -382,10 +382,13 @@ public final class RhinoCore implements ScopeProvider {
throw new EvaluatorException(globalError); throw new EvaluatorException(globalError);
} }
TypeInfo type = getPrototypeInfo(protoName); TypeInfo type = getPrototypeInfo(protoName);
if (type != null && type.hasError()) { if (type != null) {
throw new EvaluatorException(type.getError()); if (type.hasError()) {
throw new EvaluatorException(type.getError());
}
return type.objProto;
} }
return type == null ? null : type.objProto; return null;
} }
/** /**
@ -458,27 +461,15 @@ public final class RhinoCore implements ScopeProvider {
* is a java object) with that name. * is a java object) with that name.
*/ */
public boolean hasFunction(String protoname, String fname) { public boolean hasFunction(String protoname, String fname) {
// System.err.println ("HAS_FUNC: "+fname);
// throws EvaluatorException if type has a syntax error // throws EvaluatorException if type has a syntax error
Scriptable op = getValidPrototype(protoname); Scriptable op = getValidPrototype(protoname);
try { // if this is an untyped object return false
// if this is an untyped object return false if (op == null) {
if (op == null) {
return false;
}
Object func = ScriptableObject.getProperty(op, fname);
if ((func != null) && func instanceof Function) {
return true;
}
} catch (Exception esx) {
// System.err.println ("Error in hasFunction: "+esx);
return false; return false;
} }
return false; return ScriptableObject.getProperty(op, fname) instanceof Function;
} }
/** /**