fix "::" not split crrectly bug

nfer · nfer · commit 665f33ebda93 · 2015-06-04T17:55:46.000+08:00
diff --git a/split.cpp b/split.cpp
@@ -76,7 +76,6 @@ void split(const char * data, int datalen, int line, Meta_Vector & wordVector)
                 case '\'':
                 case ',':
                 case ';':
-                case ':':
                 case '*':
                 case '&':
                 case '!':
@@ -90,6 +89,7 @@ void split(const char * data, int datalen, int line, Meta_Vector & wordVector)
                     isStringMode = !isStringMode;
                     break;
 
+                case ':':
                 case '/':
                     if (wordlen == 0){
                         PRINT_LAST_TYPE();
diff --git a/test/split_unittest.cpp b/test/split_unittest.cpp
@@ -112,3 +112,19 @@ TEST(SplitTest, Viriable) {
     "char", " ", "word", "[",  "256", "]",  " ", "=",
     " ",    "{", "'",   "\\", "0",   "'", "}", ";");
 }
+
+TEST(SplitTest, Special) {
+  // check /=
+  runTest("max/=10;", 4, "max", "/=", "10", ";");
+
+  // check ::
+  runTest("QTextEdit::ExtraSelection selection;", 6,
+    "QTextEdit", "::", "ExtraSelection", " ", "selection", ";");
+
+  // check (), )), ), );
+  runTest("func(aa(), bb());", 12,
+    "func", "(", "aa", "(", ")", ",", " ", "bb", "(", ")", ")", ";");
+
+  // check ++ and ++)
+  runTest("func(i++)", 5, "func", "(", "i", "++", ")");
+}
