commit eafd0524d02f24a8b677b9f4debd124f4f9e05a9
author Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Thu Jun 18 16:46:02 2015 +0900
committer Shinichiro Hamaji <shinichiro.hamaji@gmail.com> Fri Jun 19 12:49:19 2015 +0900
tree 188f1a12a7c95117b9d86ad2f923ce7a1d98228b
parent 3064f1fcc2deeb63fc030c953bcf8edc821ad64e

[C++] Introduce FindOutsideParen

parser.cc

diff --git a/parser.cc b/parser.cc
index 208cf4d..ab8a185 100644
--- a/parser.cc
+++ b/parser.cc
@@ -373,33 +373,10 @@
   }
 
   StringPiece RemoveComment(StringPiece line) {
-    bool prev_backslash = false;
-    stack<char> paren_stack;
-    for (size_t i = 0; i < line.size(); i++) {
-      char c = line[i];
-      switch (c) {
-        case '(':
-          paren_stack.push(')');
-          break;
-        case '{':
-          paren_stack.push('}');
-          break;
-
-        case ')':
-        case '}':
-          if (!paren_stack.empty() && c == paren_stack.top()) {
-            paren_stack.pop();
-          }
-          break;
-
-        case '#':
-          if (paren_stack.empty() && !prev_backslash)
-            return line.substr(0, i);
-
-      }
-      prev_backslash = c == '\\' && !prev_backslash;
-    }
-    return line;
+    size_t i = FindOutsideParen(line, '#');
+    if (i == string::npos)
+      return line;
+    return line.substr(0, i);
   }
 
   StringPiece GetDirective(StringPiece line) {