X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FJSArray.java;h=2f5f04d8e7b3aeb3aa774e599e21814f6d9b9aa8;hb=6261c41b2ac9d182d8c3541e8e0e5fd00062fa43;hp=880e64fecc5b14806d570cba53b46ca37ae9a8aa;hpb=67eeff476179a91ae930ea89cbecde22132ca532;p=org.ibex.core.git

diff --git a/src/org/xwt/js/JSArray.java b/src/org/xwt/js/JSArray.java
index 880e64f..2f5f04d 100644
--- a/src/org/xwt/js/JSArray.java
+++ b/src/org/xwt/js/JSArray.java
@@ -6,7 +6,7 @@ import java.io.*;
 import java.util.*;
 
 /** A JavaScript JSArray */
-public class JSArray extends JSCallable {
+public class JSArray extends JS {
     private Vec vec = new Vec();
     public JSArray() { }
     public JSArray(int size) { vec.setSize(size); }
@@ -22,52 +22,65 @@ public class JSArray extends JSCallable {
         return Integer.parseInt(s);
     }
     
-    public Object call(Object method, JSArray args) {
-        if(method.equals("push")) {
-            for(int i=0;i<args.length();i++)
-                vec.push(args.elementAt(i));
-            return new Integer(vec.size());
-        }
-        if(method.equals("pop")) {
-            return vec.pop(); // this'll return null on size()==0 
-        }
-        if(method.equals("shift")) {
-            if(length() > 0) {
-                Object o = vec.elementAt(0);
-                vec.removeElementAt(0);
-                return o;
-            } else {
-                return null;
-            }
-        }
-        if(method.equals("unshift")) {
-            // FEATURE: could be optimized a bit with some help from Vec
-            for(int i=0;i<args.length();i++)
-                vec.insertElementAt(args.elementAt(i),i);
-            return new Integer(vec.size());
-        }
-        if(method.equals("slice")) return slice(args);
-        if(method.equals("join")) return join(args);
-        if(method.equals("reverse")) return reverse(args);
-        if(method.equals("toString")) return join(",");
-        if(method.equals("sort")) return sort(args);
-        if(method.equals("splice")) return splice(args);
-        throw new JS.Exn("unknown method " + method);
+    public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
+        //#switch(method)
+        case "pop": return vec.pop();
+        case "reverse": return reverse();
+        case "toString": return join(",");
+        case "shift":
+            if(length() == 0) return null;
+            Object o = vec.elementAt(0);
+            vec.removeElementAt(0);
+            return o;
+        case "join":
+            return join(nargs == 0 ? "," : JS.toString(a0));
+        case "sort":
+            return sort(nargs < 1 ? null : a0);
+        case "slice":
+            int start = toInt(nargs < 1 ? null : a0);
+            int end = nargs < 2 ? length() : toInt(a1);
+            return slice(start, end);
+        case "push":
+            for(int i=0; i<nargs; i++) vec.push(i==0?a0:i==1?a1:i==2?a2:rest[i-3]);
+            return N(vec.size());
+        case "unshift":
+            for(int i=0; i<nargs; i++) vec.insertElementAt(i==0?a0:i==1?a1:i==2?a2:rest[i-3], i);
+            return N(vec.size());
+        case "splice":
+            JSArray array = new JSArray();
+            for(int i=0; i<nargs; i++) array.addElement(i==0?a0:i==1?a1:i==2?a2:rest[i-3]);
+            return splice(array);
+        //#end
+        return super.callMethod(method, a0, a1, a2, rest, nargs);
     }
         
-    public Object get(Object key) throws JS.Exn {
-        if (key.equals("length")) return new Long(vec.size());
-                
-        int i = intVal(key);
-        if (i == Integer.MIN_VALUE) return super.get(key);
-        try {
-            return vec.elementAt(i);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return null;
+    public Object get(Object key) throws JSExn {
+        if (key instanceof Number) {
+            int i = intVal(key);
+            if (i == Integer.MIN_VALUE) return super.get(key);
+            try {
+                return vec.elementAt(i);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
         }
+        //#switch(key)
+        case "pop": return METHOD;
+        case "reverse": return METHOD;
+        case "toString": return METHOD;
+        case "shift": return METHOD;
+        case "join": return METHOD;
+        case "sort": return METHOD;
+        case "slice": return METHOD;
+        case "push": return METHOD;
+        case "unshift": return METHOD;
+        case "splice": return METHOD;
+        case "length": return N(vec.size());
+        //#end
+        return super.get(key);
     }
 
-    public void put(Object key, Object val) {
+    public void put(Object key, Object val) throws JSExn {
         if (key.equals("length")) vec.setSize(toNumber(val).intValue());
         int i = intVal(key);
         if (i == Integer.MIN_VALUE) super.put(key, val);
@@ -96,10 +109,6 @@ public class JSArray extends JSCallable {
     public int size() { return vec.size(); }
     public String typeName() { return "array"; }
         
-    private Object join(JSArray args) {
-        return join(args.length() == 0 ? "," : JS.toString(args.elementAt(0)));
-    }
-    
     private Object join(String sep) {
         int length = vec.size();
         if(length == 0) return "";
@@ -114,20 +123,17 @@ public class JSArray extends JSCallable {
         return sb.toString();
     }
     
-    private Object reverse(JSArray args) {
+    private Object reverse() {
         Vec oldVec = vec;
         int size = oldVec.size();
         if(size < 2) return this;
         vec = new Vec(size);
-        for(int i=size-1;i>=0;i--)
-            vec.addElement(oldVec.elementAt(i));
+        for(int i=size-1;i>=0;i--) vec.addElement(oldVec.elementAt(i));
         return this;
     }
     
-    private Object slice(JSArray args) {
+    private Object slice(int start, int end) {
         int length = length();
-        int start = JS.toInt(args.length() < 1 ? null : args.elementAt(0));
-        int end = args.length() < 2 ? length : JS.toInt(args.elementAt(1));
         if(start < 0) start = length+start;
         if(end < 0) end = length+end;
         if(start < 0) start = 0;
@@ -145,16 +151,20 @@ public class JSArray extends JSCallable {
             return JS.toString(a).compareTo(JS.toString(b));
         }
     };
-    private Object sort(JSArray args) {
-        Object tmp = args.length() < 1 ? null : args.elementAt(0);
-        if(tmp instanceof JSCallable) {
+    private Object sort(Object tmp) throws JSExn {
+        if(tmp instanceof JS) {
             final JSArray funcArgs = new JSArray(2);
-            final JSCallable jsFunc = (JSCallable) tmp;
+            final JS jsFunc = (JS) tmp;
             vec.sort(new Vec.CompareFunc() {
                 public int compare(Object a, Object b) {
-                    funcArgs.setElementAt(a,0);
-                    funcArgs.setElementAt(b,1);
-                    return JS.toInt(jsFunc.call(null, funcArgs));
+                    try {
+                        funcArgs.setElementAt(a,0);
+                        funcArgs.setElementAt(b,1);
+                        return JS.toInt(jsFunc.call(a, b, null, null, 2));
+                    } catch (Exception e) {
+                        // FIXME
+                        throw new JSRuntimeExn(e.toString());
+                    }
                 }
             });
         } else {