Refactored checklabel

Author: yullin-ms

lib/Parser/Parse.cpp

@@ -10510,36 +10510,31 @@ ParseNodePtr Parser::ParseStatement()
             {
                 this->GetScanner()->Scan();
                 // Check if label is found within the current label id list.
-                for (LabelId* pLabelId = pLabelIdList; pLabelId; pLabelId = pLabelId->next) 
+                auto checkLabelList = [&](LabelId* list, OpCode checkOp)
                 {
-                    if (pid == pLabelId->pid)
-                    {
-                        if (fnop == fnopContinue &&
-                            !(ParseNode::Grfnop(m_pstmtCur->op) & fnop)) 
-                        {
-                            Error(ERRbadContinue);
-                        }
-                        goto LNeedTerminator;
-                    }
-                }
-                for (pstmt = m_pstmtCur; pstmt; pstmt = pstmt->pstmtOuter)
-                {
-                    LabelId* pLabelId;
-                    for (pLabelId = pstmt->pLabelId; pLabelId; pLabelId = pLabelId->next)
+                    for (LabelId* pLabelId = list; pLabelId; pLabelId = pLabelId->next)
                     {
                         if (pid == pLabelId->pid)
                         {
                             // Found the label. Make sure we can use it. We can
                             // break out of any statement, but we can only
                             // continue loops.
                             if (fnop == fnopContinue &&
-                                !(ParseNode::Grfnop(pstmt->op) & fnop))
+                                !(ParseNode::Grfnop(checkOp) & fnop))
                             {
                                 Error(ERRbadContinue);
                             }
-                            goto LNeedTerminator;
+                            return true;
                         }
                     }
+                    return false;
+                };
+
+                if (checkLabelList(pLabelIdList, m_pstmtCur->op)) goto LNeedTerminator;
+
+                for (pstmt = m_pstmtCur; pstmt; pstmt = pstmt->pstmtOuter)
+                {
+                    if (checkLabelList(pstmt->pLabelId, pstmt->op)) goto LNeedTerminator;
                 }
             }
             Error(ERRnoLabel);

test/Basics/Labels.js

@@ -343,15 +343,13 @@ testSyntaxErrorWithContinueAfterLabel=
     `function fn() {
         L:
             continue L;
-    }
-    fn1()`
+    }`
 
-testReferenceErrorWithBreakAfterLabel=
+testNoLabelNotFoundWithBreakAfterLabel=
     `function fn() {
         L:
             break L;
-    }
-    fn1()`
+    }`
 
 
 function testModuleScript(source, message, shouldFail = false) {
@@ -483,7 +481,7 @@ var tests = [
             assert.throws(() => eval(testRuntimeErrorWithDanglingStaticAfterLabel), ReferenceError, "Expected reference error from stranded static being used after label", "'static' is not defined")
             assert.doesNotThrow(() => eval(testNoSyntaxErrorWithDanglingStaticAfterLabel), "Expected no issue parsing since static is viewed as an identifier")
             assert.throws(() => eval(testSyntaxErrorWithContinueAfterLabel), SyntaxError, "Expected syntax error from having continue outside of loop", "Can't have 'continue' outside of loop")
-            assert.throws(() => eval(testReferenceErrorWithBreakAfterLabel), ReferenceError, "Expected reference error from fn1 not being defined", "'fn1' is not defined")
+            assert.doesNotThrow(() => eval(testNoLabelNotFoundWithBreakAfterLabel), "Expected no issue from finding label")
         }
     }
 ];