From bbbf431ae377fcbd442592ad29c7b79548ac8346 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 3 Jan 2015 13:54:46 +0100
Subject: [PATCH] double bug in script name handling workaround (Fixes #1730)

---
 components/compiler/fileparser.cpp      | 1 +
 components/compiler/quickfileparser.cpp | 6 ++++++
 components/compiler/scanner.cpp         | 8 +-------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index 37ad1f258..423841ac3 100644
--- 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
index f3d8063b2..895b7ce65 100644
--- 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
index 3fdbdb9f0..705e90eb3 100644
--- 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;