jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

rollback #1740. Useful stuff but breaks C++ unit tests.

This commit is contained in:
parrt 2017-03-15 10:34:27 -07:00
parent a872323474
commit e7979dcf63
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/Cpp/runtime/src/InputMismatchException.cpp
View File

@ -10,6 +10,6 @@
using namespace antlr4; using namespace antlr4;
InputMismatchException::InputMismatchException(Parser *recognizer) InputMismatchException::InputMismatchException(Parser *recognizer)
: RecognitionException("Input mismatch", recognizer, recognizer->getInputStream(), recognizer->getContext(), : RecognitionException(recognizer, recognizer->getInputStream(), recognizer->getContext(),
recognizer->getCurrentToken()) { recognizer->getCurrentToken()) {
} }

4
runtime/Cpp/runtime/src/RecognitionException.cpp
View File

@ -10,7 +10,6 @@
#include "misc/IntervalSet.h" #include "misc/IntervalSet.h"
#include "RecognitionException.h" #include "RecognitionException.h"
#include "Token.h"
using namespace antlr4; using namespace antlr4;
@ -21,8 +20,7 @@ RecognitionException::RecognitionException(Recognizer *recognizer, IntStream *in
RecognitionException::RecognitionException(const std::string &message, Recognizer *recognizer, IntStream *input, RecognitionException::RecognitionException(const std::string &message, Recognizer *recognizer, IntStream *input,
ParserRuleContext *ctx, Token *offendingToken) ParserRuleContext *ctx, Token *offendingToken)
: RuntimeException(message + (offendingToken ? " near token " + offendingToken->getText() + " in line " + std::to_string(offendingToken->getLine()) : "")) : RuntimeException(message), _recognizer(recognizer), _input(input), _ctx(ctx), _offendingToken(offendingToken) {
, _recognizer(recognizer), _input(input), _ctx(ctx), _offendingToken(offendingToken) {
InitializeInstanceFields(); InitializeInstanceFields();
if (recognizer != nullptr) { if (recognizer != nullptr) {
_offendingState = recognizer->getState(); _offendingState = recognizer->getState();