PEG: Improved quote detection

pbeckingham · pbeckingham · commit 62d128eb90a7 · 2018-01-17T20:51:07.000-05:00
diff --git a/src/PEG.cpp b/src/PEG.cpp
@@ -336,15 +336,23 @@ std::string PEG::removeComment (const std::string& line)
 
   while ((character = utf8_next_char (line, i)))
   {
-    if (character == '\'' && previous != '\\')
+    if (insideQuote)
+    {
+       if (character == quote)
+       {
+         quote = 0;
+         insideQuote = false;
+       }
+    }
+    else if (character == '\'' && previous != '\\')
     {
       quote = '\'';
-      insideQuote = ! insideQuote;
+      insideQuote = true;
     }
     else if (character == '"' && previous != '\\')
     {
       quote = '"';
-      insideQuote = ! insideQuote;
+      insideQuote = true;
     }
 
     if (character == '#' && previous != '\\'  && ! insideQuote)

Original file line number	Diff line number	Diff line change
`@@ -336,15 +336,23 @@ std::string PEG::removeComment (const std::string& line)`
`336`	`336`
`337`	`337`	`while ((character = utf8_next_char (line, i)))`
`338`	`338`	`{`
`339`		`- if (character == '\'' && previous != '\\')`
	`339`	`+ if (insideQuote)`
	`340`	`+ {`
	`341`	`+ if (character == quote)`
	`342`	`+ {`
	`343`	`+ quote = 0;`
	`344`	`+ insideQuote = false;`
	`345`	`+ }`
	`346`	`+ }`
	`347`	`+ else if (character == '\'' && previous != '\\')`
`340`	`348`	`{`
`341`	`349`	`quote = '\'';`
`342`		`- insideQuote = ! insideQuote;`
	`350`	`+ insideQuote = true;`
`343`	`351`	`}`
`344`	`352`	`else if (character == '"' && previous != '\\')`
`345`	`353`	`{`
`346`	`354`	`quote = '"';`
`347`		`- insideQuote = ! insideQuote;`
	`355`	`+ insideQuote = true;`
`348`	`356`	`}`
`349`	`357`
`350`	`358`	`if (character == '#' && previous != '\\' && ! insideQuote)`