move static function references to Script.java

[org.ibex.js.git] / src / org / ibex / js / Test.java

diff --git a/src/org/ibex/js/Test.java b/src/org/ibex/js/Test.java
index ea436b9..fe138bc 100644 (file)
--- a/src/org/ibex/js/Test.java
+++ b/src/org/ibex/js/Test.java
@@ -16,8 +16,8 @@ public class Test extends JS.Obj {
         JS f = JS.fromReader(args[0],1,new FileReader(args[0]));
         System.out.println(((JSFunction)f).dump());
         JS s = new JS.O();
-        s.put(JS.S("sys"),new Test());
-        f = JS.cloneWithNewGlobalScope(f,s);
+        s.put(Script.S("sys"),new Test());
+        f = Script.cloneWithNewGlobalScope(f,s);
         //JS ret = f.call(null,null,null,null,0);
         Interpreter i = new Interpreter((JSFunction)f, true, new JS[0]);
         JS ret = (JS)i.run(null);
@@ -50,8 +50,8 @@ public class Test extends JS.Obj {
     }
         
     public void put(JS key, JS val) throws JSExn {
-        if("bgput".equals(JS.toString(key))) {
-            action = JS.toString(val);
+        if("bgput".equals(Script.toString(key))) {
+            action = Script.toString(val);
             try {
                 Script.pause();
             } catch(Pausable.NotPausableException e) {
@@ -59,8 +59,8 @@ public class Test extends JS.Obj {
             }
             return;
         }   
-        if("exit".equals(JS.toString(key))) {
-            System.exit(JS.toInt(val));
+        if("exit".equals(Script.toString(key))) {
+            System.exit(Script.toInt(val));
             return;
         }
         super.put(key,val);
@@ -68,18 +68,18 @@ public class Test extends JS.Obj {
     
     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.debugToString(a0));
+        if("print".equals(Script.toString(method))) {
+            System.out.println(Script.str(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);
+        if("clone".equals(Script.toString(method))) return a0 == null ? null : a0.jsclone();
+        if("firethis".equals(Script.toString(method))) {
+            String action = Script.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"));
+            else if(action.equals("put")) a1.putAndTriggerTraps(key,Script.S("some value"));
+            else if(action.equals("trigger")) return target.justTriggerTraps(key,Script.S("some trigger value"));
             return null;
         }
         return null;