iasmgcc: Remove colonColon special case from the parser

Handle the mix of colon and colonColon tokens in the GCC IASM parser
instead of the D and ImportC parsers.

Author: ibuclaw

compiler/src/dmd/cparse.d

@@ -3512,21 +3512,6 @@ final class CParser(AST) : Parser!AST
                     error("matching `)` expected, not end of file");
                     break;
 
-                case TOK.colonColon:  // treat as two separate : tokens for iasmgcc
-                    *ptoklist = allocateToken();
-                    **ptoklist = this.token;
-                    (*ptoklist).value = TOK.colon;
-                    ptoklist = &(*ptoklist).next;
-
-                    *ptoklist = allocateToken();
-                    **ptoklist = this.token;
-                    (*ptoklist).value = TOK.colon;
-                    ptoklist = &(*ptoklist).next;
-
-                    *ptoklist = null;
-                    nextToken();
-                    continue;
-
                 default:
                     *ptoklist = allocateToken();
                     **ptoklist = this.token;

compiler/src/dmd/iasmgcc.d

@@ -231,6 +231,7 @@ int parseExtAsmOperands(Parser)(Parser p, GccAsmStatement s)
     int numargs = 0;
 
     if (p.token.value == TOK.colon ||
+        p.token.value == TOK.colonColon ||
         p.token.value == TOK.semicolon ||
         p.token.value == TOK.endOfFile)
         return numargs;
@@ -252,7 +253,7 @@ int parseExtAsmOperands(Parser)(Parser p, GccAsmStatement s)
             }
             else
             {
-                p.eSink.error(p.token.loc, "expected identifier after `[`");
+                p.eSink.error(p.token.loc, "identifier expected after `[`");
                 goto Lerror;
             }
             // Look for closing `]`
@@ -331,6 +332,7 @@ Expressions* parseExtAsmClobbers(Parser)(Parser p)
     Expressions* clobbers;
 
     if (p.token.value == TOK.colon ||
+        p.token.value == TOK.colonColon ||
         p.token.value == TOK.semicolon ||
         p.token.value == TOK.endOfFile)
         return clobbers;
@@ -387,10 +389,6 @@ Identifiers* parseExtAsmGotoLabels(Parser)(Parser p)
 {
     Identifiers* labels;
 
-    if (p.token.value == TOK.semicolon ||
-        p.token.value == TOK.endOfFile)
-        return labels;
-
     while (1)
     {
         if (p.token.value == TOK.identifier)
@@ -408,7 +406,7 @@ Identifiers* parseExtAsmGotoLabels(Parser)(Parser p)
         }
         else
         {
-            p.eSink.error(p.token.loc, "expected identifier for goto label name, not `%s`",
+            p.eSink.error(p.token.loc, "identifier expected for goto label name, not `%s`",
                           p.token.toChars());
             goto Lerror;
         }
@@ -451,44 +449,55 @@ GccAsmStatement parseGccAsm(Parser)(Parser p, GccAsmStatement s)
         return s;
 
     // No semicolon followed after instruction template, treat as extended asm.
-    if (p.token.value == TOK.semicolon || p.token.value == TOK.endOfFile)
-        goto Ldone;
+    if (p.token.value == TOK.colon || p.token.value == TOK.colonColon)
+    {
+        bool inputs;
+        bool clobbers;
+        bool labels;
 
-    // Look for outputs.
-    if (p.requireToken(TOK.colon))
-        s.outputargs = p.parseExtAsmOperands(s);
-    else
-        return s;
+        // Look for outputs.
+        if (p.token.value == TOK.colon)
+        {
+            // Skip over the `:` token.
+            p.nextToken();
+            // Parse the output operands.
+            s.outputargs = p.parseExtAsmOperands(s);
+        }
+        else if (p.token.value == TOK.colonColon)
+            inputs = true;
 
-    // Look for inputs.
-    if (p.token.value == TOK.colon)
-    {
-        // Skip over the `:` token.
-        p.nextToken();
-        p.parseExtAsmOperands(s);
-    }
-    else
-        goto Ldone;
+        // Look for inputs.
+        if (inputs || p.token.value == TOK.colon)
+        {
+            // Skip over the `:` or `::` token.
+            p.nextToken();
+            // Parse the input operands.
+            p.parseExtAsmOperands(s);
+        }
+        else if (p.token.value == TOK.colonColon)
+            clobbers = true;
 
-    // Look for clobbers.
-    if (p.token.value == TOK.colon)
-    {
-        // Skip over the `:` token.
-        p.nextToken();
-        s.clobbers = p.parseExtAsmClobbers();
-    }
-    else
-        goto Ldone;
+        // Look for clobbers.
+        if (clobbers || p.token.value == TOK.colon)
+        {
+            // Skip over the `:` or `::` token.
+            p.nextToken();
+            // Parse the clobbers.
+            s.clobbers = p.parseExtAsmClobbers();
+        }
+        else if (p.token.value == TOK.colonColon)
+            labels = true;
 
-    // Look for labels.
-    if (p.token.value == TOK.colon)
-    {
-        // Skip over the `:` token.
-        p.nextToken();
-        s.labels = p.parseExtAsmGotoLabels();
+        // Look for labels.
+        if (labels || p.token.value == TOK.colon)
+        {
+            // Skip over the `:` or `::` token.
+            p.nextToken();
+            // Parse the labels.
+            s.labels = p.parseExtAsmGotoLabels();
+        }
     }
 
-Ldone:
     if (p.token.value == TOK.endOfFile)
         assert(global.errors);
     else
@@ -624,6 +633,7 @@ unittest
         q{ asm { "" :: : "memory"; } },
         q{ asm { "" : :: "memory"; } },
         q{ asm { "" ::: "memory"; } },
+        q{ asm { "" :::: label; } },
     ];
 
     immutable string[] failAsmTests = [
@@ -648,6 +658,12 @@ unittest
         q{ asm { "", "";
         } },
 
+        // Identifier expected, not ';'
+        q{ asm { "" : ::: ; } },
+        q{ asm { "" :: :: ; } },
+        q{ asm { "" ::: : ; } },
+        q{ asm { "" :::: ; } },
+
         // https://issues.dlang.org/show_bug.cgi?id=20593
         q{ asm { "instruction" : : "operand" 123; } },
 

compiler/src/dmd/parse.d

@@ -7103,21 +7103,6 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 error("matching `}` expected, not end of file");
                 break;
 
-            case TOK.colonColon:  // treat as two separate : tokens for iasmgcc
-                *ptoklist = allocateToken();
-                **ptoklist = this.token;
-                (*ptoklist).value = TOK.colon;
-                ptoklist = &(*ptoklist).next;
-
-                *ptoklist = allocateToken();
-                **ptoklist = this.token;
-                (*ptoklist).value = TOK.colon;
-                ptoklist = &(*ptoklist).next;
-
-                *ptoklist = null;
-                nextToken();
-                continue;
-
             default:
                 *ptoklist = allocateToken();
                 **ptoklist = this.token;