diff options
Diffstat (limited to 'vhdlparser/ParseException.cc')
-rw-r--r-- | vhdlparser/ParseException.cc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc index 375ff6c..9f256d9 100644 --- a/vhdlparser/ParseException.cc +++ b/vhdlparser/ParseException.cc @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */ +/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 7.0 */ /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ #include "ParseException.h" @@ -23,7 +23,7 @@ namespace parser { */ ParseException::ParseException(Token currentTokenVal, int** expectedTokenSequencesVal, - JAVACC_STRING_TYPE* tokenImageVal + JJString* tokenImageVal ) { initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal); @@ -46,14 +46,14 @@ namespace parser { } /** Constructor with message. */ - ParseException::ParseException(JAVACC_STRING_TYPE message) { + ParseException::ParseException(const JJString& message) { } /** * This is the last token that has been consumed successfully. If * this object has been created due to a parse error, the token - * following this token will (therefore) be the first error token. + * followng this token will (therefore) be the first error token. */ Token currentToken; @@ -69,7 +69,7 @@ namespace parser { * parser within which the parse error occurred. This array is * defined in the generated ...Constants class. */ - JAVACC_STRING_TYPE* tokenImage; + JJString* tokenImage; /** * It uses "currentToken" and "expectedTokenSequences" to generate a parse @@ -78,12 +78,12 @@ namespace parser { * from the parser) the correct error message * gets displayed. */ - JAVACC_STRING_TYPE ParseException::initialise(Token currentToken, + JJString ParseException::initialise(Token currentToken, int** expectedTokenSequences, - JAVACC_STRING_TYPE* tokenImage) { + JJString* tokenImage) { #if 0 - //JAVACC_STRING_TYPE eol = System.getProperty("line.separator", "\n"); - expected = new JAVACC_STRING_TYPE(); + //JJString eol = System.getProperty("line.separator", "\n"); + expected = new JJString(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { if (maxSize < expectedTokenSequences[i].length) { @@ -93,39 +93,39 @@ namespace parser { expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' '); } if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { - expected.append((JAVACC_CHAR_TYPE*)"..."); + expected.append((JJChar*)"..."); } expected.append(eol).append(" "); } - JAVACC_STRING_TYPE retval = (JAVACC_CHAR_TYPE*)"Encountered \""; + JJString retval = (JJChar*)"Encountered \""; Token tok = currentToken.next; for (int i = 0; i < maxSize; i++) { - if (i != 0) retval += (JAVACC_CHAR_TYPE*)" "; + if (i != 0) retval += (JJChar*)" "; if (tok.kind == 0) { retval += tokenImage[0]; break; } - retval += (JAVACC_CHAR_TYPE*)" " + tokenImage[tok.kind]; - retval += (JAVACC_CHAR_TYPE*)" \""; + retval += (JJChar*)" " + tokenImage[tok.kind]; + retval += (JJChar*)" \""; retval += add_escapes(tok.image); - retval += (JAVACC_CHAR_TYPE*)" \""; + retval += (JJChar*)" \""; tok = tok.next; } - retval += (JAVACC_CHAR_TYPE*)"\" at line " + currentToken.next.beginLine + (JAVACC_CHAR_TYPE*)", column " + currentToken.next.beginColumn; - retval += (JAVACC_CHAR_TYPE*)"." + eol; + retval += (JJChar*)"\" at line " + currentToken.next.beginLine + (JJChar*)", column " + currentToken.next.beginColumn; + retval += (JJChar*)"." + eol; if (expectedTokenSequences.length == 1) { - retval += (JAVACC_CHAR_TYPE*)"Was expecting:" + eol + (JAVACC_CHAR_TYPE*)" "; + retval += (JJChar*)"Was expecting:" + eol + (JJChar*)" "; } else { - retval += (JAVACC_CHAR_TYPE*)"Was expecting one of:" + eol + (JAVACC_CHAR_TYPE*)" "; + retval += (JJChar*)"Was expecting one of:" + eol + (JJChar*)" "; } retval += expected.toString(); return retval; #endif - return (JAVACC_CHAR_TYPE*)"Parse exception"; + return (JJChar*)"Parse exception"; } /** - * The end of line JAVACC_STRING_TYPE for this machine. + * The end of line JJString for this machine. */ #define eol "\n" @@ -134,10 +134,10 @@ namespace parser { * when these raw version cannot be used as part of an ASCII * string literal. */ - JAVACC_STRING_TYPE ParseException::add_escapes(JAVACC_STRING_TYPE str) { + JJString ParseException::add_escapes(const JJString& str) { /* - JAVACC_STRING_TYPE *retval = new JAVACC_STRING_TYPE(); - JAVACC_CHAR_TYPE ch; + JJString *retval = new JJString(); + JJChar ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { @@ -167,7 +167,7 @@ namespace parser { continue; default: if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) { - JAVACC_STRING_TYPE s = "0000" + Integer.toString(ch, 16); + JJString s = "0000" + Integer.toString(ch, 16); retval.append("\\u" + s.substring(s.length() - 4, s.length())); } else { retval.append(ch); @@ -181,4 +181,4 @@ namespace parser { } } -/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */ +/* JavaCC - OriginalChecksum=7a72405661a136830ccf7f3cab0fffdc (do not edit this line) */ |