Merge pull request #79 from tgehr/unpacking-extern-scope-fix

Parse extern (a, b) = ...; and scope (a, b) = ...;.
opendlang · Oct 11, 2024 · fb70ba6 · fb70ba6
2 parents a8b2a88 + 3af1106
commit fb70ba6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/compiler/src/dmd/parse.d b/compiler/src/dmd/parse.d
@@ -804,7 +804,8 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 }
             case TOK.extern_:
                 {
-                    if (peekNext() != TOK.leftParenthesis)
+                    Token* next = peek(&token);
+                    if (next.value != TOK.leftParenthesis || peekPastParen(next).value == TOK.assign)
                     {
                         stc = STC.extern_;
                         goto Lstc;
@@ -4520,7 +4521,8 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
 
             case TOK.extern_:
                 {
-                    if (peekNext() != TOK.leftParenthesis)
+                    Token* next = peek(&token);
+                    if (next.value != TOK.leftParenthesis || peekPastParen(next).value == TOK.assign)
                     {
                         stc = STC.extern_;
                         goto L1;
@@ -6468,7 +6470,8 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
             goto Lerror;
 
         case TOK.scope_:
-            if (peekNext() != TOK.leftParenthesis)
+            auto next = peek(&token);
+            if (next.value != TOK.leftParenthesis || peekPastParen(next).value == TOK.assign)
                 goto Ldeclaration; // scope used as storage class
             nextToken();
             check(TOK.leftParenthesis);