X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXWT.java;h=8c9debbbda3eca5553f8014b3fef91ce2681af8a;hb=e8442c40f5b8c03a4e6993cbcc9ce64dddab6a90;hp=015255bc0a24ca455b92bc430697a9ebbcd11306;hpb=9999130dda9fa3b8b3d70387d87e123fad958a28;p=org.ibex.core.git

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 015255b..8c9debb 100644
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -13,6 +13,8 @@ import org.bouncycastle.util.encoders.Base64;
 public final class XWT extends JS.Obj {
 
     public static final XWT singleton = new XWT();
+    private final JS xwtMath = new XWTMath();
+    private final JS xwtString = new XWTString();
 
     /** each key is a string representing a filename which the user has already given XWT permission to write to */
     private static Hashtable safeFiles = new Hashtable();
@@ -55,7 +57,8 @@ public final class XWT extends JS.Obj {
         super.put("fileSeparator", File.separator);
         super.put("homeDir", System.getProperty("user.home"));
         super.put("tempDir", System.getProperty("java.io.tempdir"));
-        super.put("math", org.xwt.js.JS.Math);
+        super.put("math", xwtMath);
+        super.put("string", xwtString);
 
         super.put("newBrowserWindow", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
             if (args.length() != 1 || args.elementAt(0) == null) return null;
@@ -109,9 +112,7 @@ public final class XWT extends JS.Obj {
         }});
 
         super.put("regexp", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
-            //throw new Error("not implemented");
-            Log.log(XWT.class, "regexp not implemented");
-            return null;
+            return new Regexp(args);
         }});
 
         super.put("listfonts", new JS.Callable() { public Object call(JS.Array args) throws JS.Exn {
@@ -357,12 +358,32 @@ public final class XWT extends JS.Obj {
             mythread.go.block();
         }
     }
+    
+    private static class XWTMath extends JS.Obj {
+        public XWTMath() {
+            JS gs = new JS.GlobalScope();
+            put("isNaN",gs.get("isNaN"));
+            put("isFinite",gs.get("isFinite"));
+            put("NaN",gs.get("NaN"));
+            put("Infinity",gs.get("Infinity"));
+            setSeal(true);
+        }
+        public Object get(Object key) {
+            Object ret = super.get(key);
+            if(ret == null) ret = JS.Math.get(key);
+            return ret;
+        }
+    }
+    private static class XWTString extends JS.Obj {
+        public XWTString() {
+            JS gs = new JS.GlobalScope();
+            put("parseInt",gs.get("parseInt"));
+            put("parseFloat",gs.get("parseFloat"));
+            put("decodeURI",gs.get("decodeURI"));
+            put("decodeURIComponent",gs.get("decodeURIComponent"));
+            put("encodeURI",gs.get("encodeURI"));
+            put("encodeURIComponent",gs.get("encodeURIComponent"));
+            setSeal(true);
+        }
+    }
 }
-
-
-
-
-
-
-
-