Changeset 9551 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

Jun 30, 2005, 5:45:50 PM (20 years ago)

Author:

ggaren

Message:

-rolled in KDE fix to <rdar://problem/4167660> JavaScript fails to
throw exceptions for invalid break/continue statements

No layout tests because it's already covered by the Mozilla suite

Reviewed by mjs.

• kjs/internal.h: LabelStack now tracks where you are relative to switch and iteration (loop) statements

(KJS::LabelStack::LabelStack):
(KJS::LabelStack::pushIteration):
(KJS::LabelStack::popIteration):
(KJS::LabelStack::inIteration):
(KJS::LabelStack::pushSwitch):
(KJS::LabelStack::popSwitch):
(KJS::LabelStack::inSwitch):

• kjs/nodes.cpp: These files were updated to use the new LabelStack: (DoWhileNode::execute): (WhileNode::execute): (ForNode::execute): (ForInNode::execute): (SwitchNode::execute):

These files were updated to throw exceptions for invalid
break/continue statements:
(BreakNode::execute):
(ContinueNode::execute):

• tests/mozilla/expected.html: Updated expected results to reflect fix

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/internal.h

@@ -164 +164 @@
   class LabelStack {
   public:
-    LabelStack(): tos(0L) {}
+    LabelStack(): tos(0L), iterationDepth(0), switchDepth(0) {}
     ~LabelStack();
 
@@ -183 +183 @@
      */
     void pop();
+    
+    void pushIteration() { iterationDepth++; }
+    void popIteration() { iterationDepth--; }
+    bool inIteration() const { return (iterationDepth > 0); }
+    
+    void pushSwitch() { switchDepth++; }
+    void popSwitch() { switchDepth--; }
+    bool inSwitch() const { return (switchDepth > 0); }
+    
   private:
     struct StackElem {
@@ -191 +200 @@
     StackElem *tos;
     void clear();
+    int iterationDepth;
+    int switchDepth;
   };