X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FTest.java;h=1bf62e103c72a122c4e922b3a90eb13030362f3d;hp=d2dd77f56726561bfc3a8f093e8bbdab6652015f;hb=3f8aa5300e178e8975b0edc896a5a9d303e7bdf3;hpb=4c96b0f7e40e4689434c46e4300cc9bef9d0fab9

diff --git a/src/org/ibex/js/Test.java b/src/org/ibex/js/Test.java
index d2dd77f..1bf62e1 100644
--- a/src/org/ibex/js/Test.java
+++ b/src/org/ibex/js/Test.java
@@ -10,11 +10,11 @@ public class Test extends JS {
         if(args.length == 0) { System.err.println("Usage Test filename"); System.exit(1); }
         JS f = JS.fromReader(args[0],1,new FileReader(args[0]));
         System.out.println(((JSFunction)f).dump());
-        JSScope s = new JSScope(new JSScope.Global());
+        JS s = new JS.O();
         s.put(JS.S("sys"),new Test());
-        f = JS.cloneWithNewParentScope(f,s);
+        f = JS.cloneWithNewGlobalScope(f,s);
         //JS ret = f.call(null,null,null,null,0);
-        Interpreter i = new Interpreter((JSFunction)f, true, new JSArray());
+        Interpreter i = new Interpreter((JSFunction)f, true, new Interpreter.JSArgs(f));
         JS ret = i.resume();
         while(up != null) {
             JS.UnpauseCallback up = Test.up; Test.up = null;
@@ -31,6 +31,8 @@ public class Test extends JS {
     public JS get(JS key) throws JSExn {
         if(!JS.isString(key)) return null;
         if("print".equals(JS.toString(key))) return METHOD;
+        if("clone".equals(JS.toString(key))) return METHOD;
+        if("firethis".equals(JS.toString(key))) return METHOD;
         if("bgget".equals(JS.toString(key))) {
             action = "bgget";
             try {
@@ -51,15 +53,29 @@ public class Test extends JS {
             } catch(NotPauseableException e) {
                 throw new Error("should never happen");
             }
-        return;
-        }        
+            return;
+        }   
+        if("exit".equals(JS.toString(key))) {
+            System.exit(JS.toInt(val));
+            return;
+        }
         super.put(key,val);
     }
     
     public JS callMethod(JS method, JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
         if(!JS.isString(method)) return null;
         if("print".equals(JS.toString(method))) {
-            System.out.println(JS.toString(a0));
+            System.out.println(JS.debugToString(a0));
+            return null;
+        }
+        if("clone".equals(JS.toString(method))) return a0 == null ? null : a0.jsclone();
+        if("firethis".equals(JS.toString(method))) {
+            String action = JS.toString(a0);
+            JS target = a1;
+            JS key = a2;
+            if(action.equals("get")) return a1.getAndTriggerTraps(key);
+            else if(action.equals("put")) a1.putAndTriggerTraps(key,JS.S("some value"));
+            else if(action.equals("trigger")) return target.justTriggerTraps(key,JS.S("some trigger value"));
             return null;
         }
         return null;