From 257ad3c2c5e633d2fd3f2228021ac3ae8d6d07cb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Dec 2014 11:30:04 +0200
Subject: Initial buildfile parser implementation

g++-4.9 -std=c++14 -g -I../../.. -o driver driver.cxx ../../../build/lexer.cxx ../../../build/parser.cxx && ./driver
---
 build/lexer.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'build/lexer.cxx')

diff --git a/build/lexer.cxx b/build/lexer.cxx
index 8566788..9e3521a 100644
--- a/build/lexer.cxx
+++ b/build/lexer.cxx
@@ -56,10 +56,7 @@ namespace build
     if (!is_eos (c))
       return c;
 
-    if (!name_.empty ())
-      cerr << name_ << ':' << c.line () << ':' << c.column () << ": error: " <<
-        "unterminated escape sequence" << endl;
-
+    error (c) << "unterminated escape sequence" << endl;
     throw lexer_error ();
   }
 
@@ -219,4 +216,11 @@ namespace build
     buf_ = c;
     unget_ = true;
   }
+
+  ostream& lexer::
+  error (const xchar& c)
+  {
+    return diag_ << name_ << ':' << c.line () << ':' <<
+      c.column () << ": error: ";
+  }
 }
-- 
cgit v1.1