Clean up for-in ops and naming nit (443039, r=igor).

2008-07-01 18:59:18 -07:00
parent c829565d63
commit f77560b092
13 changed files with 69 additions and 80 deletions
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -62,7 +62,7 @@
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
-#include "jslock.h"
+#include "jsiter.h"
 #include "jsobj.h"
 #include "jsopcode.h"
 #include "jsregexp.h"
@@ -4528,8 +4528,9 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                inXML = JS_FALSE;
                break;

-              case JSOP_FOREACH:
-                foreach = JS_TRUE;
+              case JSOP_ITER:
+                foreach = (pc[1] & (JSITER_FOREACH | JSITER_KEYVALUE)) ==
+                          JSITER_FOREACH;
                todo = -2;
                break;