diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-02 16:28:03 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-01-02 16:28:03 (GMT) |
commit | 34b00c442308efe169cc89fad62588fdce1d84e8 (patch) | |
tree | 19ceab12fa37beece4a9a94a0dff26ed14a28779 /vhdlparser/ErrorHandler.h | |
parent | 981515820134a2171d2b6a912275e919f56532b4 (diff) | |
download | Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.zip Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.gz Doxygen-34b00c442308efe169cc89fad62588fdce1d84e8.tar.bz2 |
Various VHDL related fixes
Diffstat (limited to 'vhdlparser/ErrorHandler.h')
-rw-r--r-- | vhdlparser/ErrorHandler.h | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index f5e53e4..9f0d38c 100644 --- a/vhdlparser/ErrorHandler.h +++ b/vhdlparser/ErrorHandler.h @@ -1,21 +1,15 @@ -/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.2 */ -/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */ +/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.0 */ +/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #ifndef ERRORHANDLER_H #define ERRORHANDLER_H -#include <stdio.h> #include <string> #include "JavaCC.h" #include "Token.h" namespace vhdl { namespace parser { - -JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); - - class VhdlParser; +class VhdlParser; class ErrorHandler { - friend class VhdlParserTokenManager; - friend class VhdlParser; protected: int error_count; public: @@ -24,56 +18,26 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); // expectedKind - token kind that the parser was trying to consume. // expectedToken - the image of the token - tokenImages[expectedKind]. // actual - the actual token that the parser got instead. - virtual void handleUnexpectedToken(int /*expectedKind*/, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser * /*parser*/) { + virtual void handleUnexpectedToken(int, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *) { error_count++; fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str()); } // Called when the parser cannot continue parsing. // last - the last token successfully parsed. // unexpected - the token at which the error occurs. - // production - the production in which this error occurs. - virtual void handleParseError(Token * /*last*/, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser * /*parser*/) { + // production - the production in which this error occurrs. + virtual void handleParseError(Token *, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *) { error_count++; fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str()); } virtual int getErrorCount() { return error_count; } - virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser * /*parser*/) { - fprintf(stderr, "Error: %s\n", (char*)message.c_str()); - } virtual ~ErrorHandler() {} ErrorHandler() { error_count = 0; } }; - - class VhdlParserTokenManager; - class TokenManagerErrorHandler { - friend class VhdlParserTokenManager; - protected: - int error_count; - public: - // Returns a detailed message for the Error when it is thrown by the - // token manager to indicate a lexical error. - // Parameters : - // EOFSeen : indicates if EOF caused the lexical error - // curLexState : lexical state in which this error occurred - // errorLine : line number when the error occurred - // errorColumn : column number when the error occurred - // errorAfter : prefix that was seen before this error occurred - // curchar : the offending character - // - virtual void lexicalError(bool EOFSeen, int /*lexState*/, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* /*token_manager*/) { - // by default, we just print an error message and return. - fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str())); - } - virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* /*token_manager*/) { - fprintf(stderr, "%s\n", (char*)errorMessage.c_str()); - } - virtual ~TokenManagerErrorHandler() {} - }; - } } #endif -/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */ +/* JavaCC - OriginalChecksum=282223c3bcb53b7ff385aed35944d185 (do not edit this line) */ |