Ticket #251: comments.patch

source/ps/tests/test_Parser.h

@@ -109 +109 @@
         TS_ASSERT(! Line.ParseString(Parser, "a a x"));
         TS_ASSERT(Line.ParseString(Parser, "a x a b x a x b x b x b x b x a x a x a b x a b x b x a x"));
     }
+
+    void test5()
+    {
+        CParser Parser;
+        Parser.InputTaskType("assignment", "_$ident_=_$value[[;]$rest]");
+        std::string str;
+
+        CParserLine Line;
+
+        TS_ASSERT(Line.ParseString(Parser, "12 = 34 ; comment"));
+        TS_ASSERT_EQUALS((int)Line.GetArgCount(), 2);
+        TS_ASSERT(Line.GetArgString(0, str) && str == "12");
+        TS_ASSERT(Line.GetArgString(1, str) && str == "34");
+    }
 };

source/ps/Parser.cpp

@@ -710 +710 @@
                                 ++Progress;
                                 break;
                             case typeRest:
-                                // Extract the whole of the std::string
-                                
-                                // Reset, probably is but still
-                                value.m_String = std::string();
-
-                                for (i=Progress; i<Segments.size(); ++i)
-                                {
-                                    value.m_String += Segments[i];
-
-                                    // If argument starts with => " <=, add one to the end of it too
-                                    if (Segments[i][0] == '"')
-                                        value.m_String += "\"";
-                                }
-
-                                m_Arguments.push_back(value);
-
+                                // This is a comment, don't store it.
                                 // Now BREAK EVERYTHING !
                                 //  We're done, we found our match and let's get out
                                 LookNoFurther = true;