fix vexi.string

[org.ibex.core.git] / src / org / ibex / js / JSScope.java

diff --git a/src/org/ibex/js/JSScope.java b/src/org/ibex/js/JSScope.java
index 675ddc7..f025b24 100644 (file)
--- a/src/org/ibex/js/JSScope.java
+++ b/src/org/ibex/js/JSScope.java
@@ -43,6 +43,7 @@ public class JSScope extends JS {
             case "undefined": return null;
             case "stringFromCharCode": return METHOD;
             case "parseInt": return METHOD;
+            case "parseFloat": return METHOD;
             case "isNaN": return METHOD;
             case "isFinite": return METHOD;
             case "decodeURI": return METHOD;
@@ -51,7 +52,6 @@ public class JSScope extends JS {
             case "encodeURIComponent": return METHOD;
             case "escape": return METHOD;
             case "unescape": return METHOD;
-            case "parseInt": return METHOD;
             //#end
             return super.get(key);
         }
@@ -70,6 +70,7 @@ public class JSScope extends JS {
                 case 1: {
                     //#switch(method)
                     case "parseInt": return parseInt(a0, N(0));
+                    case "parseFloat": return parseFloat(a0);
                     case "isNaN": { double d = toDouble(a0); return d == d ? F : T; }
                     case "isFinite": { double d = toDouble(a0); return (d == d && !Double.isInfinite(d)) ? T : F; }
                     case "decodeURI": throw new JSExn("unimplemented");
@@ -91,9 +92,9 @@ public class JSScope extends JS {
             return super.callMethod(method, a0, a1, a2, rest, nargs);
         }
 
-        private Object parseInt(Object arg, Object r) {
+        private Object parseInt(Object arg, Object r) throws JSExn {
             int radix = JS.toInt(r);
-            String s = (String)arg;
+            String s = JS.toString(arg);
             int start = 0;
             int length = s.length();
             int sign = 1;
@@ -132,8 +133,8 @@ public class JSScope extends JS {
             return JS.N((long)sign*n);
         }
 
-        private Object parseFloat(Object arg) {
-            String s = (String)arg;
+        private Object parseFloat(Object arg) throws JSExn {
+            String s = JS.toString(arg);
             int start = 0;
             int length = s.length();
             while(start < length && Character.isWhitespace(s.charAt(0))) start++;