Changeset 9551 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

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/nodes.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1894 +1894 @@
     KJS_CHECKEXCEPTION
 
+    exec->context().imp()->seenLabels()->pushIteration();
     c = statement->execute(exec);
+    exec->context().imp()->seenLabels()->popIteration();
     if (!((c.complType() == Continue) && ls.contains(c.target()))) {
       if ((c.complType() == Break) && ls.contains(c.target()))
@@ -1954 +1956 @@
       return Completion(Normal, value);
 
+    exec->context().imp()->seenLabels()->pushIteration();
     c = statement->execute(exec);
+    exec->context().imp()->seenLabels()->popIteration();
     if (c.isValueCompletion())
       value = c.value();
@@ -2021 +2025 @@
     KJS_CHECKEXCEPTION
 
+    exec->context().imp()->seenLabels()->pushIteration();
     Completion c = statement->execute(exec);
+    exec->context().imp()->seenLabels()->popIteration();
     if (c.isValueCompletion())
       cval = c.value();
@@ -2132 +2138 @@
     ref.putValue(exec, String(name.ustring()));
 
+    exec->context().imp()->seenLabels()->pushIteration();
     c = statement->execute(exec);
+    exec->context().imp()->seenLabels()->popIteration();
     if (c.isValueCompletion())
       retval = c.value();
@@ -2166 +2174 @@
 
   Value dummy;
-  return exec->context().imp()->seenLabels()->contains(ident) ?
-    Completion(Continue, dummy, ident) :
-    Completion(Throw,
-               throwError(exec, SyntaxError, "Label %s not found in containing block. Can't continue.", ident));
+
+  if (ident.isEmpty() && !exec->context().imp()->seenLabels()->inIteration())
+    return Completion(Throw,
+                      throwError(exec, SyntaxError, "Invalid continue statement."));
+  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->contains(ident))
+    return Completion(Throw,
+                      throwError(exec, SyntaxError, "Label %s not found.", ident));
+  else
+    return Completion(Continue, dummy, ident);
 }
 
@@ -2180 +2193 @@
 
   Value dummy;
-  return exec->context().imp()->seenLabels()->contains(ident) ?
-    Completion(Break, dummy, ident) :
-    Completion(Throw,
-               throwError(exec, SyntaxError, "Label %s not found in containing block. Can't break.", ident));
+
+  if (ident.isEmpty() && !exec->context().imp()->seenLabels()->inIteration() &&
+      !exec->context().imp()->seenLabels()->inSwitch())
+    return Completion(Throw,
+                      throwError(exec, SyntaxError, "Invalid break statement."));
+  else if (!ident.isEmpty() && !exec->context().imp()->seenLabels()->contains(ident))
+    return Completion(Throw,
+                      throwError(exec, SyntaxError, "Label %s not found.", ident));
+  else
+    return Completion(Break, dummy, ident);
 }
 
@@ -2490 +2509 @@
   Value v = expr->evaluate(exec);
   KJS_CHECKEXCEPTION
+
+  exec->context().imp()->seenLabels()->pushSwitch();
   Completion res = block->evalBlock(exec,v);
+  exec->context().imp()->seenLabels()->popSwitch();
 
   if ((res.complType() == Break) && ls.contains(res.target()))