X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJS.java;h=cd63638a547ad418c556b4957697a04c20ef08b5;hp=96ab988b48d7b69968b4a64acd6f8633afdf2984;hb=a19b897271a8ab6b25aba63e4b30223c2477c28d;hpb=e471904257ff52be6a0b77cd5946cb4219e36da5

diff --git a/src/org/ibex/js/JS.java b/src/org/ibex/js/JS.java
index 96ab988..cd63638 100644
--- a/src/org/ibex/js/JS.java
+++ b/src/org/ibex/js/JS.java
@@ -7,9 +7,6 @@ import java.util.*;
 
 /** The minimum set of functionality required for objects which are manipulated by JavaScript */
 public abstract class JS { 
-
-    public static boolean checkAssertions = false;
-
     public static final JS METHOD = new JS() { };
     public final JS unclone() { return _unclone(); }
     public final JS jsclone() throws JSExn { return new Clone(this); }
@@ -28,23 +25,27 @@ public abstract class JS {
         throw new JSExn("method not found (" + JS.debugToString(method) + ")");
     }
     
-    // FIXME: JSArgs objects, pointers into stack frame
     public JS call(JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
         throw new JSExn("you cannot call this object (class=" + this.getClass().getName() +")");
     }
     
     public final boolean equals(Object o) { return this == o || ((o instanceof JS) && jsequals((JS)o)); }
     
-    // FIXME: Remove this, eventually
-    public final String toString() { throw new Error("you shouldn't use toString() on JS objects"); }
+    public final String toString() {
+        // Discourage people from using toString()
+        String s = "JS Object [class=" + getClass().getName() + "]";
+        String ext = extendedToString();
+        return ext == null ? s : s + " " + ext;
+    }
     
     // These are only used internally by org.ibex.js
     Trap getTrap(JS key) { return null; }
     void putTrap(JS key, Trap value) throws JSExn { throw new JSExn("traps cannot be placed on this object (class=" + this.getClass().getName() +")"); }
     String coerceToString() throws JSExn { throw new JSExn("can't coerce to a string (class=" + getClass().getName() +")"); }
     boolean jsequals(JS o) { return this == o; }
+    String extendedToString() { return null; }
     
-    public static class O extends JS {
+    public static class O extends JS implements Cloneable {
         private Hash entries;
         
         public Enumeration keys() throws JSExn { return entries == null ? (Enumeration)EMPTY_ENUMERATION : (Enumeration)new JavaEnumeration(null,entries.keys()); }
@@ -74,18 +75,12 @@ public abstract class JS {
         public final void replaceNode(int index, Object o) { bt().replaceNode(index,o); }
         public final int indexNode(Object o) { return bt().indexNode(o); }
     }
-    
-    // FEATURE: JS.StringKeys
-    /* public static StringKeys extends JS {
-        public JS get(JS key) { return JS.isString(key) ? get(JS.toString(key) : null; }
-        ...
-    */
-    
+        
     JS _unclone() { return this; }
     
     public interface Cloneable { }
     
-    public static class Clone extends JS.O implements Cloneable {
+    public static class Clone extends JS.O {
         protected final JS clonee;
         JS _unclone() { return clonee.unclone(); }
         public JS getClonee() { return clonee; }
@@ -95,8 +90,8 @@ public abstract class JS {
         }
         public boolean jsequals(JS o) { return unclone().jsequals(o.unclone()); }
         public Enumeration keys() throws JSExn { return clonee.keys(); }
-        public JS get(JS key) throws JSExn { return clonee.get(key); }
-        public void put(JS key, JS val) throws JSExn { clonee.put(key, val); }
+        public JS get(JS key) throws JSExn { return clonee.getAndTriggerTraps(key); }
+        public void put(JS key, JS val) throws JSExn { clonee.putAndTriggerTraps(key, val); }
         public JS callMethod(JS method, JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
             return clonee.callMethod(method, a0, a1, a2, rest, nargs);
         }
@@ -120,7 +115,7 @@ public abstract class JS {
         public final JS nextElement() throws JSExn { return !done ? _nextElement() : parent != null ? parent.nextElement() : null; }
         
         public JS get(JS key) throws JSExn {
-            //#switch(JS.toString(key))
+            //#jswitch(key)
             case "hasMoreElements": return B(hasMoreElements());
             case "nextElement": return nextElement();
             //#end
@@ -189,7 +184,7 @@ public abstract class JS {
     public static boolean toBoolean(JS o) {
         if(o == null) return false;
         if(o instanceof JSNumber) return ((JSNumber)o).toBoolean();
-        if(o instanceof JSString) return ((JSString)o).length() != 0;
+        if(o instanceof JSString) return ((JSString)o).s.length() != 0;
         return true;
     }
     //#repeat long/int/double/float toLong/toInt/toDouble/toFloat Long/Integer/Double/Float parseLong/parseInt/parseDouble/parseFloat
@@ -209,7 +204,7 @@ public abstract class JS {
     
     public static String debugToString(JS o) {
         try { return toString(o); }
-        catch(JSExn e) { return "[class=" + o.getClass().getName() + "]"; }
+        catch(JSExn e) { return o.toString(); }
     }
     
     public static boolean isInt(JS o) {
@@ -233,12 +228,16 @@ public abstract class JS {
         if(o instanceof JSString) return true;
         return false;
     }
+    
+    public static JS newArray() { return new JSArray(); }
+    public static JS newRegexp(JS pat, JS flags) throws JSExn { return new JSRegexp(pat,flags); }
 
     // Instance Methods ////////////////////////////////////////////////////////////////////
  
     public final static JS NaN = new JSNumber.D(Double.NaN);
     public final static JS ZERO = new JSNumber.I(0);
     public final static JS ONE = new JSNumber.I(1);
+    public final static JS MATH = new JSMath();
         
     public static final JS T = new JSNumber.B(true);
     public static final JS F = new JSNumber.B(false);
@@ -248,13 +247,14 @@ public abstract class JS {
     
     private static final int CACHE_SIZE = 65536 / 4; // must be a power of two
     private static final JSString[] stringCache = new JSString[CACHE_SIZE];
-    public static final JS S(String s)  {
+    public static final JS S(String s) {
         if(s == null) return null;
         int slot = s.hashCode()&(CACHE_SIZE-1);
         JSString ret = stringCache[slot];
         if(ret == null || !ret.s.equals(s)) stringCache[slot] = ret = new JSString(s);
         return ret;
     }
+    public static final JS S(String s, boolean intern) { return intern ? JSString.intern(s) : S(s); }
 
     public static final JS N(double d) { return new JSNumber.D(d); }
     public static final JS N(long l) { return new JSNumber.L(l); }
@@ -300,15 +300,21 @@ public abstract class JS {
     /** performs a put, triggering traps if present; traps are run in an unpauseable interpreter */
     public void putAndTriggerTraps(JS key, JS value) throws JSExn {
         Trap t = getTrap(key);
-        if (t != null) t.invoke(value);
-        else put(key, value);
+        if(t == null || (t = t.writeTrap()) == null) put(key,value);
+        else new Interpreter(t,value,false).resume();
     }
 
     /** performs a get, triggering traps if present; traps are run in an unpauseable interpreter */
     public JS getAndTriggerTraps(JS key) throws JSExn {
         Trap t = getTrap(key);
-        if (t != null) return t.invoke();
-        else return get(key);
+        if (t == null || (t = t.readTrap()) == null) return get(key);
+        else return new Interpreter(t,null,false).resume();
+    }
+    
+    public JS justTriggerTraps(JS key, JS value) throws JSExn {
+        Trap t = getTrap(key);
+        if(t == null || (t = t.writeTrap()) == null) return value;
+        else return new Interpreter(t,value,true).resume();
     }
 
     /** adds a trap, avoiding duplicates */
@@ -323,7 +329,7 @@ public abstract class JS {
     final void delTrap(JS key, JSFunction f) throws JSExn {
         Trap t = (Trap)getTrap(key);
         if (t == null) return;
-        if (t.f == f) { putTrap(t.name, t.next); return; }
+        if (t.f == f) { putTrap(t.target, t.next); return; }
         for(; t.next != null; t = t.next) if (t.next.f == f) { t.next = t.next.next; return; }
     }