X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fjs%2FParser.java;h=38d15ea73b0ca00341d6a7979b3b1fe1a96f4334;hb=9886bf61ea5fbbc8eec3969ca21d72a4dce69afe;hp=a4621db77c4810331d247712cbc26672d1d38eca;hpb=b5f5696f48099cede3bb5f2331b406f6ded1fe4a;p=org.ibex.core.git

diff --git a/src/org/ibex/js/Parser.java b/src/org/ibex/js/Parser.java
index a4621db..38d15ea 100644
--- a/src/org/ibex/js/Parser.java
+++ b/src/org/ibex/js/Parser.java
@@ -206,9 +206,17 @@ class Parser extends Lexer implements ByteCodes {
             consume(RB);
             break;
         }
-        case SUB: {  // negative literal (like "3 * -1")
-            consume(NUMBER);
-            b.add(parserLine, LITERAL, JS.N(number.doubleValue() * -1));
+        case SUB: case ADD: {
+            if(peekToken() == NUMBER) {   // literal
+                consume(NUMBER);
+                b.add(parserLine, LITERAL, JS.N(number.doubleValue() * (tok == SUB ? -1 : 1)));
+            } else { // unary +/- operator
+                if(tok == SUB) b.add(parserLine, LITERAL, JS.ZERO);
+                // BITNOT has the same precedence as the unary +/- operators
+                startExpr(b,precedence[BITNOT]);
+                if(tok == ADD) b.add(parserLine, LITERAL, JS.ZERO); // HACK to force expr into a numeric context
+                b.add(parserLine, SUB);
+            }
             break;
         }
         case LP: {  // grouping (not calling)
@@ -408,7 +416,7 @@ class Parser extends Lexer implements ByteCodes {
             b.add(parserLine, SWAP, null);
             b.add(parserLine, POP, null);
             b.add(parserLine, LITERAL, JS.N(1));
-            b.add(parserLine, tok == INC ? SUB : ADD, null);   // undo what we just did, since this is postfix
+            b.add(parserLine, tok == INC ? SUB : ADD, JS.N(2));   // undo what we just did, since this is postfix
             break;
         }
         case ASSIGN: {
@@ -835,58 +843,73 @@ class Parser extends Lexer implements ByteCodes {
             pushBackToken(tok, varName);
             
             if (forIn) {
-                b.add(parserLine, NEWSCOPE);
-                b.add(parserLine, DECLARE, varName);
-                b.add(parserLine, POP);
-                
                 consume(NAME);
                 consume(IN);
                 startExpr(b,-1);
                 consume(RP);
+                
                 b.add(parserLine, PUSHKEYS);
                 b.add(parserLine, DUP); 
                 b.add(parserLine, LITERAL, "length"); 
                 b.add(parserLine, GET);
+                // Stack is now: n, keys, obj, ...
                 
                 int size = b.size;
                 b.add(parserLine, LOOP);
                 b.add(parserLine, POP);
+                // Stack is now: LoopMarker, n, keys, obj, ...
+                // NOTE: This will break if the interpreter ever becomes more strict 
+                //       and prevents bytecode from messing with the Markers
                 b.add(parserLine, SWAP, JS.N(3));
+                // Stack is now: Tn, keys, obj, LoopMarker, ...
                 
                 b.add(parserLine, LITERAL, JS.N(1));
                 b.add(parserLine, SUB);
                 b.add(parserLine, DUP);
+                // Stack is now: index, keys, obj, LoopMarker
                 b.add(parserLine, LITERAL, JS.ZERO);
                 b.add(parserLine, LT);
+                // Stack is now index<0, index, keys, obj, LoopMarker, ...
                 
-                b.add(parserLine, JF, JS.N(5));
+                b.add(parserLine, JF, JS.N(5)); // if we're >= 0 jump 5 down (to NEWSCOPE)
+                // Move the LoopMarker back  into place - this is sort of ugly
                 b.add(parserLine, SWAP, JS.N(3));
                 b.add(parserLine, SWAP, JS.N(3));
                 b.add(parserLine, SWAP, JS.N(3));
+                // Stack is now: LoopMarker, -1, keys, obj, ...
                 b.add(parserLine, BREAK);
                 
-                b.add(parserLine, GET_PRESERVE);
-                b.add(parserLine, TOPSCOPE);
-                b.add(parserLine, SWAP);
-                b.add(parserLine, LITERAL, varName);
-                b.add(parserLine, SWAP);
-                b.add(parserLine, PUT);
-                b.add(parserLine, POP);
-                b.add(parserLine, POP);
+                b.add(parserLine, NEWSCOPE);
+                if(hadVar) {
+                    b.add(parserLine, DECLARE, varName);
+                    b.add(parserLine, POP);
+                }
+                
+                // Stack is now: index, keys, obj, LoopMarker, ...
+                b.add(parserLine, GET_PRESERVE);     // key, index, keys, obj, LoopMarker, ...
+                b.add(parserLine, TOPSCOPE);         // scope, key, index, keys, obj, LoopMarker, ...
+                b.add(parserLine, SWAP);             // key, scope, index, keys, obj, LoopMarker, ...
+                b.add(parserLine, LITERAL, varName); // varName, key, scope, index, keys, obj, LoopMaker, ...
+                b.add(parserLine, SWAP);             // key, varName, scope, index, keys, obj, LoopMarker, ...
+                b.add(parserLine, PUT);              // key, scope, index, keys, obj, LoopMarker, ...
+                b.add(parserLine, POP);              // scope, index, keys, obj, LoopMarker
+                b.add(parserLine, POP);              // index, keys, obj, LoopMarker, ...
+                // Move the LoopMarker back into place - this is sort of ugly
                 b.add(parserLine, SWAP, JS.N(3));
                 b.add(parserLine, SWAP, JS.N(3));
                 b.add(parserLine, SWAP, JS.N(3));
                 
                 parseStatement(b, null);
                 
+                b.add(parserLine, OLDSCOPE);
                 b.add(parserLine, CONTINUE);
+                // jump here on break
                 b.set(size, JS.N(b.size - size));
                 
                 b.add(parserLine, POP); // N
                 b.add(parserLine, POP); // KEYS
                 b.add(parserLine, POP); // OBJ
-                b.add(parserLine, OLDSCOPE);
-                                          
+                
             } else {
                 if (hadVar) pushBackToken(VAR, null);                    // yeah, this actually matters
                 b.add(parserLine, NEWSCOPE);                             // grab a fresh scope