X-Git-Url: http://git.megacz.com/?p=org.ibex.js.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJSPrimitive.java;h=57f9c9ed076f8097233173af3b9bf39ed8a0356f;hp=be81749b66af10641bc6077c0ed1a1f15d8aa460;hb=a1e6b7e9307319c0195b0efbe5e5354c128be481;hpb=f637057f12669bb9fe8d76a72e0bfcc898dc0715

diff --git a/src/org/ibex/js/JSPrimitive.java b/src/org/ibex/js/JSPrimitive.java
index be81749..57f9c9e 100644
--- a/src/org/ibex/js/JSPrimitive.java
+++ b/src/org/ibex/js/JSPrimitive.java
@@ -8,89 +8,89 @@ class JSPrimitive extends JS.Immutable {
     private static final JS.Method METHOD = new JS.Method();
 
     public JS callMethod(JS method, JS[] args) throws JSExn {
-        //#switch(Script.str(method))
+        //#switch(JSU.str(method))
         case "toFixed": throw new JSExn("toFixed() not implemented");
         case "toExponential": throw new JSExn("toExponential() not implemented");
         case "toPrecision": throw new JSExn("toPrecision() not implemented");
-        case "toString": return this instanceof JSString ? this : Script.S(Script.toString(this));
+        case "toString": return this instanceof JSString ? this : JSU.S(JSU.toString(this));
         //#end
             
         String s = coerceToString();
         int slength = s.length();
             
-        //#switch(Script.toString(method))
+        //#switch(JSU.toString(method))
         case "substring": {
-            int a = args.length >= 1 ? Script.toInt(args[0]) : 0;
-            int b = args.length >= 2 ? Script.toInt(args[1]) : slength;
+            int a = args.length >= 1 ? JSU.toInt(args[0]) : 0;
+            int b = args.length >= 2 ? JSU.toInt(args[1]) : slength;
             if (a > slength) a = slength;
             if (b > slength) b = slength;
             if (a < 0) a = 0;
             if (b < 0) b = 0;
             if (a > b) { int tmp = a; a = b; b = tmp; }
-            return Script.S(s.substring(a,b));
+            return JSU.S(s.substring(a,b));
         }
         case "substr": {
-            int start = args.length >= 1 ? Script.toInt(args[0]) : 0;
-            int len = args.length >= 2 ? Script.toInt(args[1]) : Integer.MAX_VALUE;
+            int start = args.length >= 1 ? JSU.toInt(args[0]) : 0;
+            int len = args.length >= 2 ? JSU.toInt(args[1]) : Integer.MAX_VALUE;
             if (start < 0) start = slength + start;
             if (start < 0) start = 0;
             if (len < 0) len = 0;
             if (len > slength - start) len = slength - start;
-            if (len <= 0) return Script.S("");
-            return Script.S(s.substring(start,start+len));
+            if (len <= 0) return JSU.S("");
+            return JSU.S(s.substring(start,start+len));
         }
         case "charAt": {
-            int p = args.length >= 1 ? Script.toInt(args[0]) : 0;
-            if (p < 0 || p >= slength) return Script.S("");
-            return Script.S(s.substring(p,p+1));
+            int p = args.length >= 1 ? JSU.toInt(args[0]) : 0;
+            if (p < 0 || p >= slength) return JSU.S("");
+            return JSU.S(s.substring(p,p+1));
         }
         case "charCodeAt": {
-            int p = args.length >= 1 ? Script.toInt(args[0]) : 0;
-            if (p < 0 || p >= slength) return Script.N(Double.NaN);
-            return Script.N(s.charAt(p));
+            int p = args.length >= 1 ? JSU.toInt(args[0]) : 0;
+            if (p < 0 || p >= slength) return JSU.N(Double.NaN);
+            return JSU.N(s.charAt(p));
         }
         case "concat": {
             StringBuffer sb = new StringBuffer(slength*2).append(s);
             for (int i=0; i < args.length; i++) sb.append(args[i]);
-            return Script.S(sb.toString());
+            return JSU.S(sb.toString());
         }
         case "indexOf": {
-            String search = args.length >= 1 ? Script.toString(args[0]) : "null";
-            int start = args.length >= 2 ? Script.toInt(args[1]) : 0;
+            String search = args.length >= 1 ? JSU.toString(args[0]) : "null";
+            int start = args.length >= 2 ? JSU.toInt(args[1]) : 0;
             // Java's indexOf handles an out of bounds start index, it'll return -1
-            return Script.N(s.indexOf(search,start));
+            return JSU.N(s.indexOf(search,start));
         }
         case "lastIndexOf": {
-            String search = args.length >= 1 ? Script.toString(args[0]) : "null";
-            int start = args.length >= 2 ? Script.toInt(args[1]) : 0;
+            String search = args.length >= 1 ? JSU.toString(args[0]) : "null";
+            int start = args.length >= 2 ? JSU.toInt(args[1]) : 0;
             // Java's indexOf handles an out of bounds start index, it'll return -1
-            return Script.N(s.lastIndexOf(search,start));            
+            return JSU.N(s.lastIndexOf(search,start));            
         }
         case "match": return JSRegexp.stringMatch(this,args[0]);
         case "replace": return JSRegexp.stringReplace(this,args[0],args[1]);
         case "search": return JSRegexp.stringSearch(this,args[0]);
         case "split": return JSRegexp.stringSplit(this,args[0],args[1],args.length);
-        case "toLowerCase": return Script.S(s.toLowerCase());
-        case "toUpperCase": return Script.S(s.toUpperCase());
+        case "toLowerCase": return JSU.S(s.toLowerCase());
+        case "toUpperCase": return JSU.S(s.toUpperCase());
         case "slice": {
-            int a = args.length >= 1 ? Script.toInt(args[0]) : 0;
-            int b = args.length >= 2 ? Script.toInt(args[1]) : slength;
+            int a = args.length >= 1 ? JSU.toInt(args[0]) : 0;
+            int b = args.length >= 2 ? JSU.toInt(args[1]) : slength;
             if (a < 0) a = slength + a;
             if (b < 0) b = slength + b;
             if (a < 0) a = 0;
             if (b < 0) b = 0;
             if (a > slength) a = slength;
             if (b > slength) b = slength;
-            if (a > b) return Script.S("");
-            return Script.S(s.substring(a,b));
+            if (a > b) return JSU.S("");
+            return JSU.S(s.substring(a,b));
         }
         //#end
         return super.call(method, args);
     }
     
     public JS get(JS key) throws JSExn {
-        //#switch(Script.toString(key))
-        case "length": return Script.N(Script.toString(this).length());
+        //#switch(JSU.toString(key))
+        case "length": return JSU.N(JSU.toString(this).length());
         case "substring": return METHOD;
         case "charAt": return METHOD;
         case "charCodeAt": return METHOD;