From ac7c2a1473d931adf9bc5d66c7a6cf424b1bfd3f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 3 Jan 2015 13:59:59 +0100
Subject: [PATCH] some cleanup

---
 components/compiler/scanner.cpp | 11 ++++++-----
 components/compiler/scanner.hpp |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 705e90eb3..14ab99c21 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -270,8 +270,9 @@ namespace Compiler
     bool Scanner::scanName (char c, Parser& parser, bool& cont)
     {
         std::string name;
+        name += c;
 
-        if (!scanName (c, name))
+        if (!scanName (name))
             return false;
 
         TokenLoc loc (mLoc);
@@ -312,13 +313,11 @@ namespace Compiler
         return true;
     }
 
-    bool Scanner::scanName (char c, std::string& name)
+    bool Scanner::scanName (std::string& name)
     {
+        char c;
         bool error = false;
 
-        name.clear();
-        name += c;
-
         while (get (c))
         {
             if (!name.empty() && name[0]=='"')
@@ -333,12 +332,14 @@ namespace Compiler
 //                {
 //                    if (!get (c))
 //                    {
+//                        error = true;
 //                        mErrorHandler.error ("incomplete escape sequence", mLoc);
 //                        break;
 //                    }
 //                }
                 else if (c=='\n')
                 {
+                    error = true;
                     mErrorHandler.error ("incomplete string or name", mLoc);
                     break;
                 }
diff --git a/components/compiler/scanner.hpp b/components/compiler/scanner.hpp
index 349a8afb6..ed01bbe44 100644
--- a/components/compiler/scanner.hpp
+++ b/components/compiler/scanner.hpp
@@ -89,7 +89,8 @@ namespace Compiler
 
             bool scanName (char c, Parser& parser, bool& cont);
 
-            bool scanName (char c, std::string& name);
+            /// \param name May contain the start of the name (one or more characters)
+            bool scanName (std::string& name);
 
             bool scanSpecial (char c, Parser& parser, bool& cont);