commit adeea690eced2fdce2a5b5c7f5143b4a6e1c6cbf
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Wed Jun 17 17:57:31 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jun 18 11:25:44 2015 +0900
tree f24b8798c51932c2d37cd841dbc6daf1cacbc186
parent d146f4c482adb0c51bfc1bef101361845f74407c

[C++] Fix the error message for extraneous text after ifeq

parser.cc

diff --git a/parser.cc b/parser.cc
index a8d01ba..670a42d 100644
--- a/parser.cc
+++ b/parser.cc
@@ -279,7 +279,7 @@
         return false;
       s = TrimLeftSpace(s.substr(n+1));
       ast->rhs = ParseExprImpl(s, NULL, false, &n);
-      return TrimSpace(s.substr(n)) == "";
+      s = TrimLeftSpace(s.substr(n));
     } else {
       for (int i = 0; i < 2; i++) {
         if (s.empty())
@@ -297,8 +297,11 @@
           ast->rhs = v;
         s = TrimLeftSpace(s.substr(end+1));
       }
-      return s.empty();
     }
+    if (!s.empty()) {
+      Error("extraneous text after `ifeq' directive");
+    }
+    return true;
   }
 
   void ParseIfeq(StringPiece line, StringPiece directive) {