Merge branch 'master' into spelling

1 files changed, 25 insertions, 25 deletions

diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index fa2002e..375ff6c 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -23,7 +23,7 @@ namespace parser {
    */
   ParseException::ParseException(Token currentTokenVal,
                         int** expectedTokenSequencesVal,
-                        JJString* tokenImageVal
+                        JAVACC_STRING_TYPE* tokenImageVal
                        )
   {
     initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal);
@@ -46,7 +46,7 @@ namespace parser {
   }
 
   /** Constructor with message. */
-  ParseException::ParseException(const JJString& message) {
+  ParseException::ParseException(JAVACC_STRING_TYPE message) {
   }
 
 
@@ -69,7 +69,7 @@ namespace parser {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants class.
    */
-  JJString* tokenImage;
+  JAVACC_STRING_TYPE* 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.
    */
-  JJString ParseException::initialise(Token currentToken,
+  JAVACC_STRING_TYPE ParseException::initialise(Token currentToken,
                            int** expectedTokenSequences,
-                           JJString* tokenImage) {
+                           JAVACC_STRING_TYPE* tokenImage) {
 #if 0
-    //JJString eol = System.getProperty("line.separator", "\n");
-     expected = new JJString();
+    //JAVACC_STRING_TYPE eol = System.getProperty("line.separator", "\n");
+     expected = new JAVACC_STRING_TYPE();
     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((JJChar*)"...");
+        expected.append((JAVACC_CHAR_TYPE*)"...");
       }
       expected.append(eol).append("    ");
     }
-    JJString retval = (JJChar*)"Encountered \"";
+    JAVACC_STRING_TYPE retval = (JAVACC_CHAR_TYPE*)"Encountered \"";
     Token tok = currentToken.next;
     for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += (JJChar*)" ";
+      if (i != 0) retval += (JAVACC_CHAR_TYPE*)" ";
       if (tok.kind == 0) {
         retval += tokenImage[0];
         break;
       }
-      retval += (JJChar*)" " + tokenImage[tok.kind];
-      retval += (JJChar*)" \"";
+      retval += (JAVACC_CHAR_TYPE*)" " + tokenImage[tok.kind];
+      retval += (JAVACC_CHAR_TYPE*)" \"";
       retval += add_escapes(tok.image);
-      retval += (JJChar*)" \"";
+      retval += (JAVACC_CHAR_TYPE*)" \"";
       tok = tok.next;
     }
-    retval += (JJChar*)"\" at line " + currentToken.next.beginLine + (JJChar*)", column " + currentToken.next.beginColumn;
-    retval += (JJChar*)"." + eol;
+    retval += (JAVACC_CHAR_TYPE*)"\" at line " + currentToken.next.beginLine + (JAVACC_CHAR_TYPE*)", column " + currentToken.next.beginColumn;
+    retval += (JAVACC_CHAR_TYPE*)"." + eol;
     if (expectedTokenSequences.length == 1) {
-      retval += (JJChar*)"Was expecting:" + eol + (JJChar*)"    ";
+      retval += (JAVACC_CHAR_TYPE*)"Was expecting:" + eol + (JAVACC_CHAR_TYPE*)"    ";
     } else {
-      retval += (JJChar*)"Was expecting one of:" + eol + (JJChar*)"    ";
+      retval += (JAVACC_CHAR_TYPE*)"Was expecting one of:" + eol + (JAVACC_CHAR_TYPE*)"    ";
     }
     retval += expected.toString();
     return retval;
 #endif
-    return (JJChar*)"Parse exception";
+    return (JAVACC_CHAR_TYPE*)"Parse exception";
   }
 
   /**
-   * The end of line JJString for this machine.
+   * The end of line JAVACC_STRING_TYPE 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.
    */
-   JJString ParseException::add_escapes(const JJString& str) {
+   JAVACC_STRING_TYPE ParseException::add_escapes(JAVACC_STRING_TYPE str) {
 /*
-      JJString *retval = new JJString();
-      JJChar ch;
+      JAVACC_STRING_TYPE *retval = new JAVACC_STRING_TYPE();
+      JAVACC_CHAR_TYPE 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) {
-                 JJString s = "0000" + Integer.toString(ch, 16);
+                 JAVACC_STRING_TYPE 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=7a72405661a136830ccf7f3cab0fffdc (do not edit this line) */
+/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */