2003/06/09 00:07:40

[org.ibex.core.git] / src / org / xwt / js / ByteCodeBlock.java

diff --git a/src/org/xwt/js/ByteCodeBlock.java b/src/org/xwt/js/ByteCodeBlock.java
index a0e675c..5813274 100644 (file)
--- a/src/org/xwt/js/ByteCodeBlock.java
+++ b/src/org/xwt/js/ByteCodeBlock.java
@@ -39,7 +39,6 @@ class ByteCodeBlock implements ByteCodes, Tokens {
         return this;
     }
         
-    public Object eval(final JS.Scope s) throws ControlTransferException, JS.Exn { return eval(s, new Vec()); }
     public Object eval(final JS.Scope s, Vec t) throws ControlTransferException {
         for(int i=0; i<size; i++) switch(op[i]) {
             case LABEL: break;
@@ -54,17 +53,29 @@ class ByteCodeBlock implements ByteCodes, Tokens {
             case POP: t.pop(); break;
             case SWAP: { Object o1 = t.pop(); Object o2 = t.pop(); t.push(o1); t.push(o2); break; }
             case DUP: t.push(t.peek()); break;
-            case SCOPE: t.push(((ByteCodeBlock)arg[i]).eval(new JS.Scope(s))); break;
+
+               // FIXME: shouldn't need its own stack
+            case SCOPE: t.push(((ByteCodeBlock)arg[i]).eval(new JS.Scope(s), new Vec())); break;
+
             case ASSERT: if (!JS.toBoolean(t.pop())) throw new EvaluatorException(line, sourceName, "assertion failed"); break;
             case RETURN: throw new ReturnException(t.pop());
             case THROW: throw new JS.Exn(t.pop());
             case TRY: break;
+
+               // FIXME: implement
             case TYPEOF: break;
+
             case BREAK: return Boolean.FALSE;
             case CONTINUE: return Boolean.TRUE;
             case BITNOT: t.push(new Long(~JS.toLong(t.pop()))); break;
             case BANG: t.push(new Boolean(!JS.toBoolean(t.pop()))); break;
 
+            case NEWFUNCTION: {
+               ByteCodeBlock bytes = (ByteCodeBlock)arg[i];
+               t.push(new JS.Function(bytes.line, bytes.sourceName, bytes, s));
+               break;
+           }
+
             case PUSHKEYS: {
                 Object o = t.peek();
                 Object[] keys = ((JS)o).keys();
@@ -81,7 +92,7 @@ class ByteCodeBlock implements ByteCodes, Tokens {
                 stack2.push(Boolean.TRUE);
                 while (true) {
                     Boolean result;
-                    try { result = (Boolean)loop.eval(new JS.Scope(s), stack2);
+                   try { result = (Boolean)loop.eval(new JS.Scope(s), stack2);
                     } catch (ContinueException c) { result = Boolean.TRUE;
                     } catch (BreakException b) { result = Boolean.FALSE; }
                     if (result == Boolean.FALSE) break;
@@ -95,7 +106,8 @@ class ByteCodeBlock implements ByteCodes, Tokens {
                 Object val = t.pop();
                 Object key = t.pop();
                 JS target = (JS)t.peek();
-                if (target == null) throw new JS.Exn("tried to put a value to the " + key + " property on the null value");
+                if (target == null)
+                   throw new EvaluatorException(line, sourceName, "tried to put a value to the " + key + " property on the null value");
                 target.put(key, val);
                 t.push(val);
                 break;
@@ -127,28 +139,6 @@ class ByteCodeBlock implements ByteCodes, Tokens {
                 break;
             }
 
-            case NEWFUNCTION: {
-                final ByteCodeBlock myBytes = (ByteCodeBlock)arg[i];
-                t.push(new JS.Function() {
-                        public String getSourceName() throws JS.Exn { return sourceName; }
-                        public int getLine() throws JS.Exn { return line; }
-                        public Object _call(final JS.Array args) throws JS.Exn, ControlTransferException {
-                            JS.Scope scope = new JS.Scope(s) {
-                                    public String getSourceName() { return sourceName; }
-                                    public Object get(Object key) throws JS.Exn {
-                                        if (key.equals("trapee")) return org.xwt.Trap.currentTrapee();
-                                        else if (key.equals("cascade")) return org.xwt.Trap.cascadeFunction;
-                                        return super.get(key);
-                                    }
-                                };
-                           Vec stack = new Vec();
-                            stack.push(args);
-                           return myBytes.eval(scope, stack);
-                        }
-                    });
-                break;
-            }
-
             case INC: case DEC: {
                 boolean isPrefix = JS.toBoolean(arg[i]);
                 Object key = t.pop();