X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FJS.java;h=2ed9755d0bf33bbd523b1a19724c756cfadd3afc;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=094eba1b8444462e683bb44ba0d516fda431070e;hpb=10d0296318104e8b9ac8afbea71ef118aa77387c;p=org.ibex.core.git diff --git a/src/org/xwt/js/JS.java b/src/org/xwt/js/JS.java index 094eba1..2ed9755 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,37 +51,75 @@ 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); } + + // NOTE: There are about 3 pages of rules in ecma262 about string to number conversions + // We aren't even close to following all those rules. We probably never will be. + 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"); } - - + + /** coerce an object to a String */ + public static String toString(Object o) { + if(o == null) return "null"; + if(o instanceof String) return (String) o; + if(o instanceof Integer || o instanceof Long || o instanceof Boolean) return o.toString(); + if(o instanceof JS) return ((JS)o).coerceToString(); + if(o instanceof Double || o instanceof Float) { + double d = ((Number)o).doubleValue(); + if((int)d == d) return Integer.toString((int)d); + return o.toString(); + } + return o.toString(); + } + // 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 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 Object callMethod(Object method, 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); + } + } + + public Number coerceToNumber() { return new Integer(0); } + public String coerceToString() { throw new JS.Exn("tried to coerce a JavaScript object to a String"); } + public boolean coerceToBoolean() { return true; } + + public String typeName() { return "object"; } // Inner Classes ///////////////////////////////////////////////////////////////////////// /** A sensible implementation of the abstract methods in the JS class */ public static class Obj extends JS { - private Hash entries = new Hash(); + private Hash entries = null; private boolean sealed = false; public Obj() { this(false); } 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 void setSeal(boolean sealed) { this.sealed = sealed; } ///< a sealed object cannot have its properties modified + public void put(Object key, Object val) { put(key, null, val); } + protected void put(Object key, Object key2, Object val) { + if (sealed) return; + if (entries == null) entries = new Hash(); + entries.put(key, key2, val); } + public Object[] keys() { return entries == null ? new Object[0] : entries.keys(); } + public Object get(Object key) { return get(key, null); } + protected Object get(Object key, Object key2) { + if (entries == null) return null; + if(key2 == null && callMethod((String)key, null, true) == Boolean.TRUE) + return new Internal.CallableStub(this, key); + return entries.get(key, key2); + } } /** An exception which can be thrown and caught by JavaScript code */ @@ -115,11 +163,17 @@ 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); } + public int getNumFormalArgs() { return numFormalArgs; } 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(); @@ -128,13 +182,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(); } @@ -157,6 +211,9 @@ public abstract class JS { return ret; } + public static JS.Thread currentJSThread() { + return fromJavaThread(java.lang.Thread.currentThread()); + } } }