From b5f5696f48099cede3bb5f2331b406f6ded1fe4a Mon Sep 17 00:00:00 2001 From: brian Date: Fri, 19 Mar 2004 05:00:53 +0000 Subject: [PATCH] fix for(key in obj) darcs-hash:20040319050053-24bed-bc4eafa62703dcd69ac60c71522fb0c12981faa1.gz --- Makefile.upstream | 3 +- src/org/ibex/js/Parser.java | 69 ++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/Makefile.upstream b/Makefile.upstream index 43ee8d1..ec5835f 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -17,7 +17,8 @@ url_jikes-1.18 := http://dist.xwt.org/jikes-1.18.tgz url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz url_vera-1.10 := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz -url_bcel-5.1 := http://www.apache.org/dist/jakarta/bcel/binaries/bcel-5.1.tar.gz +url_bcel-5.1 := http://apache.webmeta.com/jakarta/bcel/binaries/bcel-5.1.tar.gz + .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz diff --git a/src/org/ibex/js/Parser.java b/src/org/ibex/js/Parser.java index ded2556..a4621db 100644 --- a/src/org/ibex/js/Parser.java +++ b/src/org/ibex/js/Parser.java @@ -835,37 +835,58 @@ class Parser extends Lexer implements ByteCodes { pushBackToken(tok, varName); if (forIn) { - b.add(parserLine, NEWSCOPE); // for-loops always create new scopes - b.add(parserLine, LITERAL, varName); // declare the new variable - b.add(parserLine, DECLARE); - - b.add(parserLine, LOOP); // we actually only add this to ensure that BREAK works - b.add(parserLine, POP); // discard the first-iteration indicator - int size = b.size; + b.add(parserLine, NEWSCOPE); + b.add(parserLine, DECLARE, varName); + b.add(parserLine, POP); + consume(NAME); consume(IN); - startExpr(b, -1); - b.add(parserLine, PUSHKEYS); // push the keys as an array; check the length - b.add(parserLine, LITERAL, "length"); - b.add(parserLine, GET); + startExpr(b,-1); consume(RP); - - b.add(parserLine, LITERAL, JS.N(1)); // decrement the length + b.add(parserLine, PUSHKEYS); + b.add(parserLine, DUP); + b.add(parserLine, LITERAL, "length"); + b.add(parserLine, GET); + + int size = b.size; + b.add(parserLine, LOOP); + b.add(parserLine, POP); + b.add(parserLine, SWAP, JS.N(3)); + + b.add(parserLine, LITERAL, JS.N(1)); b.add(parserLine, SUB); b.add(parserLine, DUP); - b.add(parserLine, LITERAL, JS.ZERO); // see if we've exhausted all the elements + b.add(parserLine, LITERAL, JS.ZERO); b.add(parserLine, LT); - b.add(parserLine, JF, JS.N(2)); - b.add(parserLine, BREAK); // if we have, then BREAK - b.add(parserLine, GET_PRESERVE); // get the key out of the keys array + + b.add(parserLine, JF, JS.N(5)); + b.add(parserLine, SWAP, JS.N(3)); + b.add(parserLine, SWAP, JS.N(3)); + b.add(parserLine, SWAP, JS.N(3)); + 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, PUT); // write it to this[varName] - parseStatement(b, null); // do some stuff - b.add(parserLine, CONTINUE); // continue if we fall out the bottom - - b.set(size - 1, JS.N(b.size - size + 1)); // BREAK to here - b.add(parserLine, OLDSCOPE); // restore the scope - + b.add(parserLine, SWAP); + b.add(parserLine, PUT); + b.add(parserLine, POP); + b.add(parserLine, POP); + 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, CONTINUE); + 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 -- 1.7.10.4