summaryrefslogtreecommitdiffstats
path: root/vhdlparser
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-05-01 17:25:19 (GMT)
committerGitHub <noreply@github.com>2018-05-01 17:25:19 (GMT)
commitd50acc2b7161fdee0c5a4a988d3f58c6f888420f (patch)
tree6ca2894e86b4181c83a9dc392eae2dedb80458dc /vhdlparser
parentc33bb00b648606a72df51ed8ee41e03cb85d312c (diff)
parent12ea0367d27b47280e8d768d04c8c332e9657491 (diff)
downloadDoxygen-d50acc2b7161fdee0c5a4a988d3f58c6f888420f.zip
Doxygen-d50acc2b7161fdee0c5a4a988d3f58c6f888420f.tar.gz
Doxygen-d50acc2b7161fdee0c5a4a988d3f58c6f888420f.tar.bz2
Merge pull request #686 from albert-github/feature/bug_vhdl_error_message
Making VHDL error messages more doxygen like
Diffstat (limited to 'vhdlparser')
-rw-r--r--vhdlparser/VhdlParserErrorHandler.hpp27
-rw-r--r--vhdlparser/VhdlParserIF.cpp2
2 files changed, 23 insertions, 6 deletions
diff --git a/vhdlparser/VhdlParserErrorHandler.hpp b/vhdlparser/VhdlParserErrorHandler.hpp
index d98f029..9576ce6 100644
--- a/vhdlparser/VhdlParserErrorHandler.hpp
+++ b/vhdlparser/VhdlParserErrorHandler.hpp
@@ -7,32 +7,47 @@
#include "VhdlParser.h"
#include "ErrorHandler.h"
#include "vhdlstring.h"
+#include "message.h"
+
+const char *getVhdlFileName(void);
namespace vhdl { namespace parser {
-class VhdlErrorHandler: public ErrorHandler
+class VhdlErrorHandler: public ErrorHandler
{
- virtual void handleUnexpectedToken(int expectedKind, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *parser)
+ virtual void handleUnexpectedToken(int expectedKind, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *parser)
{
- fprintf(stderr,"\n\n syntax error at line: %d : %s\n", actual->beginLine,actual->image.data());
+ warn(getVhdlFileName(),actual->beginLine,"syntax error '%s'",actual->image.data());
error_count++;
throw std::exception();
}
- virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser)
+ virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser)
{
- fprintf(stderr,"\n\n unexpected token at line: %d %s\n", last->beginLine,unexpected->image.data());
+ warn(getVhdlFileName(),last->beginLine,"unexpected token: '%s'", unexpected->image.data());
error_count++;
throw std::exception();
}
virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *parser)
{
- fprintf(stderr, "\n\n unexpected error: %s\n", (char*)message.c_str());
+ warn(getVhdlFileName(), -1, "unexpected error: '%s'", (char*)message.c_str());
error_count++;
throw std::exception();
}
};
+
+class VhdlTokenManagerErrorHandler: public TokenManagerErrorHandler {
+ virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* token_manager)
+ {
+ warn(getVhdlFileName(),errorLine,"Lexical error, Encountered: '%c' after: '%s'",curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str()));
+ }
+
+ virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* token_manager)
+ {
+ warn(getVhdlFileName(),-1,"Unknown error: '%s'", (char*)errorMessage.c_str());
+ }
+ };
}
}
diff --git a/vhdlparser/VhdlParserIF.cpp b/vhdlparser/VhdlParserIF.cpp
index f9f689b..3a6746f 100644
--- a/vhdlparser/VhdlParserIF.cpp
+++ b/vhdlparser/VhdlParserIF.cpp
@@ -14,6 +14,8 @@ void VhdlParserIF::parseVhdlfile(const char* inputBuffer,bool inLine)
JAVACC_STRING_TYPE s =inputBuffer;
CharStream *stream = new CharStream(s.c_str(), (int)s.size(), 1, 1);
VhdlParserTokenManager *tokenManager = new VhdlParserTokenManager(stream);
+ VhdlTokenManagerErrorHandler *myTokErr=new VhdlTokenManagerErrorHandler();
+ tokenManager->setErrorHandler(myTokErr);
myParser=new VhdlParser(tokenManager);
VhdlErrorHandler *myErr=new VhdlErrorHandler();
myParser->setErrorHandler(myErr);