X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FJS.java;h=cdc7e359d9630c89df119b173dcedda79d1db45c;hb=e8442c40f5b8c03a4e6993cbcc9ce64dddab6a90;hp=1e246b14db9d3c3b2e64b451a91ae8747d5391a7;hpb=00a29178bac1ee7725928dc5c7022babf6b454f4;p=org.ibex.core.git diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java index 1e246b1..cdc7e35 100644 --- a/src/org/xwt/js/JS.java +++ b/src/org/xwt/js/JS.java @@ -27,13 +27,23 @@ public abstract class JS { public static boolean toBoolean(Object o) { if (o == null) return false; if (o instanceof Boolean) return ((Boolean)o).booleanValue(); - if (o instanceof Number) return o.equals(new Integer(0)); + if (o instanceof Long) return ((Long)o).longValue() != 0; + if (o instanceof Integer) return ((Integer)o).intValue() != 0; + if (o instanceof Number) { + double d = ((Number) o).doubleValue(); + // NOTE: d == d is a test for NaN. It should be faster than Double.isNaN() + return d != 0.0 && d == d; + } + if (o instanceof String) return ((String)o).length() != 0; return true; } /** coerce an object to a Long */ public static long toLong(Object o) { return toNumber(o).longValue(); } + /** coerce an object to an Int */ + public static int toInt(Object o) { return toNumber(o).intValue(); } + /** coerce an object to a Double */ public static double toDouble(Object o) { return toNumber(o).doubleValue(); } @@ -41,22 +51,26 @@ public abstract class JS { public static Number toNumber(Object o) { if (o == null) return new Long(0); if (o instanceof Number) return ((Number)o); - if (o instanceof String) try { return new Double((String)o); } catch (NumberFormatException e) { return new Double(0); } + // FIXME: There are about 3 pages of rules in ecma262 about string to number conversions + // We aren't even close to following all those rules + if (o instanceof String) try { return new Double((String)o); } catch (NumberFormatException e) { return new Double(Double.NaN); } if (o instanceof Boolean) return ((Boolean)o).booleanValue() ? new Long(1) : new Long(0); if (o instanceof JS) return ((JS)o).coerceToNumber(); throw new Error("toNumber() got object of type " + o.getClass().getName() + " which we don't know how to handle"); } - - + // Instance Methods //////////////////////////////////////////////////////////////////// public abstract Object get(Object key) throws JS.Exn; public abstract void put(Object key, Object val) throws JS.Exn; public abstract Object[] keys(); + public abstract Object callMethod(Object method, JS.Array args, boolean justChecking); public Number coerceToNumber() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a Number"); } public String coerceToString() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a String"); } public boolean coerceToBoolean() { throw new Error("you cannot coerce a " + this.getClass().getName() + " into a Boolean"); } + + public String typeName() { return "object"; } // Inner Classes ///////////////////////////////////////////////////////////////////////// @@ -69,9 +83,24 @@ public abstract class JS { public Obj(boolean sealed) { this.sealed = sealed; } /** a sealed object cannot have its properties modified */ public void setSeal(boolean sealed) { this.sealed = sealed; } - public Object get(Object key) { return entries.get(key); } public void put(Object key, Object val) { if (!sealed) entries.put(key, val); } public Object[] keys() { return(entries.keys()); } + public Object get(Object key) { + if(callMethod((String)key,null,true) == Boolean.TRUE) + return new Internal.CallableStub(this,key); + return entries.get(key); + } + public Object callMethod(Object method, JS.Array args, boolean checkOnly) throws JS.Exn { + if(checkOnly) return Boolean.FALSE; + Object o = get(method); + if(o instanceof JS.Callable) { + return ((JS.Callable)o).call(args); + } else if(o == null) { + throw new JS.Exn("Attempted to call non-existent method: " + method); + } else { + throw new JS.Exn("Attempted to call a non-method: " +method); + } + } } /** An exception which can be thrown and caught by JavaScript code */ @@ -92,6 +121,8 @@ public abstract class JS { public Object elementAt(int i) { return super.elementAt(i); } public void addElement(Object o) { super.addElement(o); } public void setElementAt(Object o, int i) { super.setElementAt(o, i); } + public Object get(Object key) { return super._get(key); } + public void put(Object key, Object val) { super._put(key, val); } } /** Any object which becomes part of the scope chain must support this interface */ @@ -101,6 +132,8 @@ public abstract class JS { /** transparent scopes are not returned by THIS */ public boolean isTransparent() { return super.isTransparent(); } public boolean has(Object key) { return super.has(key); } + public Object get(Object key) { return super._get(key); } + public void put(Object key, Object val) { super._put(key, val); } public void declare(String s) { super.declare(s); } } @@ -111,11 +144,16 @@ public abstract class JS { /** a Callable which was compiled from JavaScript code */ public static class CompiledFunction extends CompiledFunctionImpl { - public Object call(JS.Array args, JS.Scope scope) throws JS.Exn { return super.call(args, scope); } CompiledFunction(String sourceName, int firstLine, Reader sourceCode, Scope scope) throws IOException { super(sourceName, firstLine, sourceCode, scope); } } + + /** a scope that is populated with js objects and functions normally found in the global scope */ + public static class GlobalScope extends GlobalScopeImpl { + public GlobalScope() { this(null); } + public GlobalScope(JS.Scope parent) { super(parent); } + } public static final JS Math = new org.xwt.js.Math(); @@ -124,13 +162,13 @@ public abstract class JS { CompiledFunction currentCompiledFunction = null; Vec stack = new Vec(); - int line = -1; + int pc; /** binds this thread to the current Java Thread */ public void bindToCurrentJavaThread() { javaThreadToJSThread.put(java.lang.Thread.currentThread(), this); } /** returns the line of code that is currently executing */ - public int getLine() { return line; } + public int getLine() { return currentCompiledFunction == null ? -1 : currentCompiledFunction.getLine(pc); } /** returns the name of the source code file which declared the currently executing function */ public String getSourceName() { return currentCompiledFunction == null ? null : currentCompiledFunction.getSourceName(); } @@ -153,6 +191,9 @@ public abstract class JS { return ret; } + public static JS.Thread currentJSThread() { + return fromJavaThread(java.lang.Thread.currentThread()); + } } }