Merge pull request pboyer#9 from nuuman/patch-1

Update DefaultErrorStrategy.cpp
millergarym · Jun 26, 2016 · a6699ea · a6699ea
2 parents c8f80b1 + a2d6b62
commit a6699ea
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp b/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
@@ -199,8 +199,8 @@ void DefaultErrorStrategy::reportUnwantedToken(Parser *recognizer) {
   std::string tokenName = getTokenErrorDisplay(t);
   misc::IntervalSet expecting = getExpectedTokens(recognizer);
 
-  std::string msg = std::string("extraneous input ") + tokenName + std::string(" expecting ") +
-    expecting.toString(recognizer->getVocabulary());
+  std::string vocabulary = expecting.toString(recognizer->getVocabulary());
+  std::string msg = std::string("extraneous input ") + tokenName + std::string(" expecting ") + escapeWSAndQuote(vocabulary);
   recognizer->notifyErrorListeners(t, msg, nullptr);
 }