From cbf9f83b855e382375c17c2fc64eec582e31714a Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 5 Aug 2015 17:20:01 +0200
Subject: [PATCH] allow use of IDs as function arguments, even if the ID
 matches a keyword (Fixes #2830)

---
 components/compiler/exprparser.cpp   |  5 ++++-
 components/compiler/lineparser.cpp   | 17 +++++++++++++++++
 components/compiler/stringparser.cpp | 24 +++++++++++++++++++++++-
 components/compiler/stringparser.hpp |  4 ++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index dc36b58d8..1818d04df 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -353,7 +353,10 @@ namespace Compiler
             if (extensions->isInstruction (keyword, argumentType, hasExplicit))
             {
                 // pretend this is not a keyword
-                return parseName (loc.mLiteral, loc, scanner);
+                std::string name = loc.mLiteral;
+                if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+                    name = name.substr (1, name.size()-2);
+                return parseName (name, loc, scanner);
             }
         }
 
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index a71672916..4d6e147fc 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -222,6 +222,23 @@ namespace Compiler
 
     bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
     {
+        if (mState==MessageState || mState==MessageCommaState)
+        {
+            if (const Extensions *extensions = getContext().getExtensions())
+            {
+                std::string argumentType; // ignored
+                bool hasExplicit = false; // ignored
+                if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+                {
+                    // pretend this is not a keyword
+                    std::string name = loc.mLiteral;
+                    if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+                        name = name.substr (1, name.size()-2);
+                    return parseName (name, loc, scanner);
+                }
+            }
+        }
+
         if (mState==SetMemberVarState)
         {
             mMemberName = loc.mLiteral;
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index a86c15794..7a2098fb3 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -4,9 +4,12 @@
 #include <algorithm>
 #include <iterator>
 
+#include <components/misc/stringops.hpp>
+
 #include "scanner.hpp"
 #include "generator.hpp"
-#include <components/misc/stringops.hpp>
+#include "context.hpp"
+#include "extensions.hpp"
 
 namespace Compiler
 {
@@ -33,6 +36,25 @@ namespace Compiler
         return Parser::parseName (name, loc, scanner);
     }
 
+    bool StringParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+    {
+        if (const Extensions *extensions = getContext().getExtensions())
+        {
+            std::string argumentType; // ignored
+            bool hasExplicit = false; // ignored
+            if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+            {
+                // pretend this is not a keyword
+                std::string name = loc.mLiteral;
+                if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+                    name = name.substr (1, name.size()-2);
+                return parseName (name, loc, scanner);
+            }
+        }
+
+        return Parser::parseKeyword (keyword, loc, scanner);
+    }
+
     bool StringParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
     {
         if (code==Scanner::S_comma && mState==StartState)
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index 3859a2496..52469128f 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -32,6 +32,10 @@ namespace Compiler
             ///< Handle a name token.
             /// \return fetch another token?
 
+            virtual bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner);
+            ///< Handle a keyword token.
+            /// \return fetch another token?
+
             virtual bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner);
             ///< Handle a special character token.
             /// \return fetch another token?