From bfb0e62c4ab2fc3b6cb391e40ba8a70adc6c3c28 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 12 Feb 2014 09:10:05 +0100
Subject: [PATCH] ignore additional string argument after enable/disable

---
 components/compiler/lineparser.cpp | 14 +++++++++++---
 components/compiler/lineparser.hpp |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index 4a5e1cbd09..3b2b1f11b3 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -84,6 +84,13 @@ namespace Compiler
     bool LineParser::parseName (const std::string& name, const TokenLoc& loc,
         Scanner& scanner)
     {
+        if (mState==PotentialEndState)
+        {
+            getErrorHandler().warning ("stay string argument (ignoring it)", loc);
+            mState = EndState;
+            return true;
+        }
+
         if (mState==SetState)
         {
             std::string name2 = Misc::StringUtils::lowerCase (name);
@@ -219,13 +226,13 @@ namespace Compiler
                 case Scanner::K_enable:
 
                     Generator::enable (mCode, mLiterals, mExplicit);
-                    mState = EndState;
+                    mState = PotentialEndState;
                     return true;
 
                 case Scanner::K_disable:
 
                     Generator::disable (mCode, mLiterals, mExplicit);
-                    mState = EndState;
+                    mState = PotentialEndState;
                     return true;
             }
 
@@ -406,7 +413,8 @@ namespace Compiler
 
     bool LineParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
     {
-        if (code==Scanner::S_newline && (mState==EndState || mState==BeginState))
+        if (code==Scanner::S_newline &&
+            (mState==EndState || mState==BeginState || mState==PotentialEndState))
             return false;
 
         if (code==Scanner::S_comma && mState==MessageState)
diff --git a/components/compiler/lineparser.hpp b/components/compiler/lineparser.hpp
index 0aba30d4b5..c54c764bce 100644
--- a/components/compiler/lineparser.hpp
+++ b/components/compiler/lineparser.hpp
@@ -23,7 +23,7 @@ namespace Compiler
                 SetState, SetLocalVarState, SetGlobalVarState, SetPotentialMemberVarState,
                 SetMemberVarState, SetMemberVarState2,
                 MessageState, MessageCommaState, MessageButtonState, MessageButtonCommaState,
-                EndState,
+                EndState, PotentialEndState /* may have a stray string argument */,
                 PotentialExplicitState, ExplicitState, MemberState
             };