MCAsmParser: better handling for named arguments

Until this point only macro definition with named parameters were parsed but the
names were ignored.  This adds support for using that information for named
parameter instantiation.

In order to support the full semantics of the keyword arguments, the arguments
are no longer lazily initialised since the keyword arguments can be specified
out of order and partially if they are defaulted.  Prepopulate the arguments
with the default value for any defaulted parameters, and then parse the
specified arguments.

This simplies some of the handling of the arguments in the inner loop since
empty arguments simply increment the parameter index and move on.

Note that keyword and positional arguments cannot be mixed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201499 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp
index 03b004ecfac62ba0520a55a62c251ada94680494..4f7734153ace9bda764c05865e61d0ddfe1fd59a 100644 (file)
--- a/lib/MC/MCParser/AsmParser.cpp
+++ b/lib/MC/MCParser/AsmParser.cpp
@@ -1937,39 +1937,80 @@ bool AsmParser::parseMacroArguments(const MCAsmMacro *M,
                                     MCAsmMacroArguments &A) {
   const unsigned NParameters = M ? M->Parameters.size() : 0;
 
+  A.resize(NParameters);
+  for (unsigned PI = 0; PI < NParameters; ++PI)
+    if (!M->Parameters[PI].second.empty())
+      A[PI] = M->Parameters[PI].second;
+
+  bool NamedParametersFound = false;
+
   // Parse two kinds of macro invocations:
   // - macros defined without any parameters accept an arbitrary number of them
   // - macros defined with parameters accept at most that many of them
   for (unsigned Parameter = 0; !NParameters || Parameter < NParameters;
        ++Parameter) {
-    MCAsmMacroArgument MA;
+    MCAsmMacroParameter FA;
+    SMLoc L;
+
+    if (Lexer.is(AsmToken::Identifier) && Lexer.peekTok().is(AsmToken::Equal)) {
+      L = Lexer.getLoc();
+      if (parseIdentifier(FA.first)) {
+        Error(L, "invalid argument identifier for formal argument");
+        eatToEndOfStatement();
+        return true;
+      }
 
-    if (parseMacroArgument(MA))
+      if (!Lexer.is(AsmToken::Equal)) {
+        TokError("expected '=' after formal parameter identifier");
+        eatToEndOfStatement();
+        return true;
+      }
+      Lex();
+
+      NamedParametersFound = true;
+    }
+
+    if (NamedParametersFound && FA.first.empty()) {
+      Error(Lexer.getLoc(), "cannot mix positional and keyword arguments");
+      eatToEndOfStatement();
       return true;
+    }
 
-    if (!MA.empty() || (!NParameters && !Lexer.is(AsmToken::EndOfStatement)))
-      A.push_back(MA);
-    else if (NParameters) {
-      if (!M->Parameters[Parameter].second.empty())
-        A.push_back(M->Parameters[Parameter].second);
-      else
-        A.push_back(MA);
+    if (parseMacroArgument(FA.second))
+      return true;
+
+    unsigned PI = Parameter;
+    if (!FA.first.empty()) {
+      unsigned FAI = 0;
+      for (FAI = 0; FAI < NParameters; ++FAI)
+        if (M->Parameters[FAI].first == FA.first)
+          break;
+      if (FAI >= NParameters) {
+        Error(L,
+              "parameter named '" + FA.first + "' does not exist for macro '" +
+              M->Name + "'");
+        return true;
+      }
+      PI = FAI;
+    }
+
+    if (!FA.second.empty()) {
+      if (A.size() <= PI)
+        A.resize(PI + 1);
+      A[PI] = FA.second;
     }
 
     // At the end of the statement, fill in remaining arguments that have
     // default values. If there aren't any, then the next argument is
     // required but missing
-    if (Lexer.is(AsmToken::EndOfStatement)) {
-      if (NParameters && Parameter < NParameters - 1) {
-        continue;
-      }
+    if (Lexer.is(AsmToken::EndOfStatement))
       return false;
-    }
 
     if (Lexer.is(AsmToken::Comma))
       Lex();
   }
-  return TokError("Too many arguments");
+
+  return TokError("too many positional arguments");
 }
 
 const MCAsmMacro *AsmParser::lookupMacro(StringRef Name) {

diff --git a/test/MC/AsmParser/macro-err1.s b/test/MC/AsmParser/macro-err1.s
index 924deb0cf6e162c7a13d22e7d8fdedcb2b81ba8d..bd9c837d8be08fcc2a2dea3534d5c2d1c10647ef 100644 (file)
--- a/test/MC/AsmParser/macro-err1.s
+++ b/test/MC/AsmParser/macro-err1.s
@@ -7,4 +7,4 @@
 
 foo 42,  42
 
-// CHECK: Too many arguments
+// CHECK: too many positional arguments

diff --git a/test/MC/AsmParser/macros-argument-parsing-diagnostics.s b/test/MC/AsmParser/macros-argument-parsing-diagnostics.s
new file mode 100644 (file)
index 0000000..a1970e0
--- /dev/null
+++ b/test/MC/AsmParser/macros-argument-parsing-diagnostics.s
@@ -0,0 +1,24 @@
+# RUN: not llvm-mc -triple i386 -filetype asm -o /dev/null %s 2>&1 | FileCheck %s
+
+       .macro double first = -1, second = -1
+               # begin entry
+               .long \first
+               .long \second
+               # end entry
+       .endm
+
+       double 0, 1, 2
+# CHECK: error: too many positional arguments
+# CHECK:       double 0, 1, 2
+# CHECK:                     ^
+
+       double second = 1, 2
+# CHECK: error: cannot mix positional and keyword arguments
+# CHECK:       double second = 1, 2
+# CHECK:                           ^
+
+       double third = 0
+# CHECK: error: parameter named 'third' does not exist for macro 'double'
+# CHECK:       double third = 0
+# CHECK:               ^
+

diff --git a/test/MC/AsmParser/macros-argument-parsing.s b/test/MC/AsmParser/macros-argument-parsing.s
index 097a2702a06ce1e31905774d309db974c53238d5..11da298e00e9cf07e9ad057eb9b1a3ade5447e43 100644 (file)
--- a/test/MC/AsmParser/macros-argument-parsing.s
+++ b/test/MC/AsmParser/macros-argument-parsing.s
@@ -8,3 +8,54 @@
 
 # CHECK: .long 1
 
+       .macro double first = -1, second = -1
+               # begin entry
+               .long \first
+               .long \second
+               # end entry
+       .endm
+
+       double
+# CHECK: .long -1
+# CHECK: .long -1
+
+       double 1
+# CHECK: .long 1
+# CHECK: .long -1
+
+       double 2, 3
+# CHECK: .long 2
+# CHECK: .long 3
+
+       double , 4
+# CHECK: .long -1
+# CHECK: .long 4
+
+       double 5, second = 6
+# CHECK: .long 5
+# CHECK: .long 6
+
+       double first = 7
+# CHECK: .long 7
+# CHECK: .long -1
+
+       double second = 8
+# CHECK: .long -1
+# CHECK: .long 8
+
+       double second = 9, first = 10
+# CHECK: .long 10
+# CHECK: .long 9
+
+       double second + 11
+# CHECK: .long second+11
+# CHECK: .long -1
+
+       double , second + 12
+# CHECK: .long -1
+# CHECK: .long second+12
+
+       double second
+# CHECK: .long second
+# CHECK: .long -1
+