double bug in script name handling workaround (Fixes OpenMW#1730)

tangarr · Jan 3, 2015 · bbbf431 · bbbf431
1 parent 9f6a2d0
commit bbbf431
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
@@ -112,6 +112,7 @@ namespace Compiler
                 scanner.scan (mScriptParser);
 
                 mState = EndNameState;
+                scanner.allowNameStartingwithDigit();
                 return true;
             }
 

diff --git a/components/compiler/quickfileparser.cpp b/components/compiler/quickfileparser.cpp
@@ -19,6 +19,12 @@ bool Compiler::QuickFileParser::parseName (const std::string& name, const TokenL
 
 bool Compiler::QuickFileParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
 {
+    if (keyword==Scanner::K_begin)
+    {
+        scanner.allowNameStartingwithDigit();
+        return true;
+    }
+
     if (keyword==Scanner::K_end)
         return false;
 

diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
@@ -314,12 +314,10 @@ namespace Compiler
 
     bool Scanner::scanName (char c, std::string& name)
     {
-        bool first = true;
         bool error = false;
 
         name.clear();
-
-        putback (c);
+        name += c;
 
         while (get (c))
         {
@@ -352,13 +350,9 @@ namespace Compiler
                     putback (c);
                     break;
                 }
-
-                if (first && (std::isdigit (c) || c=='`' || c=='-'))
-                    error = true;
             }
 
             name += c;
-            first = false;
         }
 
         return !error;