Refactoring: remove implicit conversion from QCString to const char *

This commit changes the following in relation to string use
- The implicit convert from 'QCString' to 'const char *' is removed
- Strings parameters use 'const QCString &' as much as possible in favor
  over 'const char *'
- 'if (s)' where s is a QCString has been replaced by 'if(!s.isEmpty())'
- data() now always returns a valid C-string and not a 0-pointer.
- when passing a string 's' to printf and related functions 'qPrint(s)' is
  used instead of 's.data()'
- for empty string arguments 'QCString()' is used instead of '0'
- The copy() operation has been removed
- Where possible 'qstrcmp(a,b)==0' has been replaces by 'a==b' and
  'qstrcmp(a,b)<0' has been replaced by 'a<b'
- Parameters of string type that were default initialized with '= 0' are
  no initialized with '= QCString()'

5 files changed, 1204 insertions, 1209 deletions

diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 0a57c6f..16753ea 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -28,7 +28,7 @@ QCString VhdlParser::abstract_literal() {Token *tok;
       tok = jj_consume_token(DECIMAL_LITERAL);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -37,7 +37,7 @@ return tok->image.c_str();
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -46,7 +46,7 @@ return tok->image.c_str();
       tok = jj_consume_token(BASED_LITERAL);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -66,7 +66,7 @@ QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;
     if (!hasError) {
     str1 = subtype_indication();
     }
-str=tok->image.c_str(); return str+str1;
+str=tok->image; return str+str1;
 assert(false);
 }
 
@@ -78,7 +78,7 @@ QCString VhdlParser::actual_designator() {QCString str;Token *t=0;
       t = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
-return t->image.c_str();
+return QCString(t->image);
       }
       break;
       }
@@ -241,7 +241,7 @@ s+=","+s1;
     if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
-return "("+s+")";
+return QCString("("+s+")");
 assert(false);
 }
 
@@ -330,7 +330,7 @@ return s;
       tok = jj_consume_token(CHARACTER_LITERAL);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -401,7 +401,7 @@ QCString t=s1+"::"+s;
     m_sharedState->genLabels.resize(0);
     outlineParser()->pushLabel(m_sharedState->genLabels,s1);
     m_sharedState->lastCompound=m_sharedState->current;
-    outlineParser()->addVhdlType(t,outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
+    outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
     }
     if (!hasError) {
     try {
@@ -724,7 +724,7 @@ return s;
       tok = jj_consume_token(RANGE_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -830,7 +830,7 @@ QCString VhdlParser::base() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(INTEGER);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -839,7 +839,7 @@ QCString VhdlParser::base_specifier() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -857,7 +857,7 @@ QCString VhdlParser::based_integer() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -866,7 +866,7 @@ QCString VhdlParser::based_literal() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BASED_LITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -875,7 +875,7 @@ QCString VhdlParser::basic_identifier() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -930,7 +930,7 @@ QCString VhdlParser::bit_string_literal() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BIT_STRING_LITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -939,7 +939,7 @@ QCString VhdlParser::bit_value() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -1391,7 +1391,7 @@ void VhdlParser::case_statement() {QCString s;
     }
     if (!hasError) {
 QCString ca="case "+s;
-     FlowChart::addFlowChart(FlowChart::CASE_NO,0,ca);
+     FlowChart::addFlowChart(FlowChart::CASE_NO,QCString(),ca);
     }
     if (!hasError) {
     jj_consume_token(IS_T);
@@ -1440,7 +1440,7 @@ QCString ca="case "+s;
     jj_consume_token(SEMI_T);
     }
 FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
+         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",QCString());
 }
 
 
@@ -1455,9 +1455,9 @@ void VhdlParser::case_statement_alternative() {QCString s;
     jj_consume_token(ARROW_T);
     }
     if (!hasError) {
-QCString t="when ";
+QCString t("when ");
     t+=s+"=> ";
-    FlowChart::addFlowChart(FlowChart::WHEN_NO,s.data(),t);
+    FlowChart::addFlowChart(FlowChart::WHEN_NO,s,t);
     }
     if (!hasError) {
     sequence_of_statement();
@@ -1470,7 +1470,7 @@ QCString VhdlParser::character_literal() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(CHARACTER_LITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -1703,8 +1703,8 @@ void VhdlParser::component_instantiation_statement() {QCString s,s1;
     if (!hasError) {
 QCString s3;
        if (s1.contains("|")) {
-         s3=VhdlDocGen::getIndexWord(s1.data(),0);
-         s1=VhdlDocGen::getIndexWord(s1.data(),1);
+         s3=VhdlDocGen::getIndexWord(s1,0);
+         s1=VhdlDocGen::getIndexWord(s1,1);
        }
 
        outlineParser()->addCompInst(s.lower().data(),s1.lower().data(),s3.data(),outlineParser()->getLine());
@@ -2337,7 +2337,7 @@ QCString VhdlParser::decimal_literal() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(DECIMAL_LITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -2489,7 +2489,7 @@ QCString VhdlParser::direction() {Token *tok=0;
       tok = jj_consume_token(TO_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -2498,7 +2498,7 @@ return tok->image.c_str();
       tok = jj_consume_token(DOWNTO_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -2664,7 +2664,7 @@ return s;
       s = name();
       }
       if (!hasError) {
-return tok->image.c_str()+s;
+return QCString(tok->image)+s;
       }
       break;
       }
@@ -2673,7 +2673,7 @@ return tok->image.c_str()+s;
       tok = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -3508,7 +3508,7 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
 m_sharedState->lab.resize(0);
   if(t) s+=":";
   if(t1) s2.prepend(" when ");
-   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2.data(),s1.data());
+   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2,s1);
 
   return s+s1+s2+";";
 assert(false);
@@ -3621,7 +3621,7 @@ QCString VhdlParser::extended_identifier() {Token *t;
     if (!hasError) {
     t = jj_consume_token(EXTENDED_CHARACTER);
     }
-return t->image.c_str();
+return QCString(t->image);
 assert(false);
 }
 
@@ -3860,7 +3860,7 @@ return s;
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -4258,7 +4258,7 @@ QCString VhdlParser::identifier() {Token *tok=0;
       tok = jj_consume_token(EXTENDED_CHARACTER);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -4267,7 +4267,7 @@ return tok->image.c_str();
       tok = jj_consume_token(BASIC_IDENTIFIER);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -4341,7 +4341,7 @@ void VhdlParser::if_statement() {QCString s,s1;
     }
     if (!hasError) {
 s.prepend("if ");
-      FlowChart::addFlowChart(FlowChart::IF_NO,0,s);
+      FlowChart::addFlowChart(FlowChart::IF_NO,QCString(),s);
     }
     if (!hasError) {
     sequence_of_statement();
@@ -4368,7 +4368,7 @@ s.prepend("if ");
       }
       if (!hasError) {
 s1.prepend("elsif ");
-     FlowChart::addFlowChart(FlowChart::ELSIF_NO,0,s1.data());
+     FlowChart::addFlowChart(FlowChart::ELSIF_NO,QCString(),s1);
       }
       if (!hasError) {
       sequence_of_statement();
@@ -4383,7 +4383,7 @@ s1.prepend("elsif ");
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
+FlowChart::addFlowChart(FlowChart::ELSE_NO,QCString(),QCString());
       }
       if (!hasError) {
       sequence_of_statement();
@@ -4419,7 +4419,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     jj_consume_token(SEMI_T);
     }
 FlowChart::moveToPrevLevel();
-    FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
+    FlowChart::addFlowChart(FlowChart::ENDIF_NO,QCString(),QCString());
 }
 
 
@@ -4438,7 +4438,7 @@ assert(false);
 }
 
 
-QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;
+QCString VhdlParser::index_constraint() {QCString s("("); QCString s1,s2;
     if (!hasError) {
     jj_consume_token(LPAREN_T);
     }
@@ -4660,7 +4660,7 @@ return s;
       tok = jj_consume_token(OTHER_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -4669,7 +4669,7 @@ return tok->image.c_str();
       tok = jj_consume_token(ALL_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -4686,7 +4686,7 @@ QCString VhdlParser::integer() {Token *t;
     if (!hasError) {
     t = jj_consume_token(INTEGER);
     }
-return t->image.c_str();
+return QCString(t->image);
 assert(false);
 }
 
@@ -4790,7 +4790,7 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1;
     s1 = subtype_indication();
     }
 outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
-    return " file "+s+":"+s1;
+    return QCString(" file "+s+":"+s1);
 assert(false);
 }
 
@@ -4929,7 +4929,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
 if(tok)
-        s5=tok->image.c_str();
+        s5=QCString(tok->image);
 
       if(tok1)
         s3=tok1->image.data();
@@ -4970,7 +4970,7 @@ QCString VhdlParser::iteration_scheme() {QCString s;
       }
       if (!hasError) {
 s.prepend("while ");
-   FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),m_sharedState->lab.data());
+   FlowChart::addFlowChart(FlowChart::WHILE_NO,QCString(),s,m_sharedState->lab);
    m_sharedState->lab="";
   return s;
       }
@@ -4985,7 +4985,7 @@ s.prepend("while ");
       }
       if (!hasError) {
 QCString q=m_sharedState->lab+" for "+s;
-    FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),m_sharedState->lab.data());
+    FlowChart::addFlowChart(FlowChart::FOR_NO,QCString(),q,m_sharedState->lab);
     m_sharedState->lab="";
     return q;
       }
@@ -5159,7 +5159,7 @@ s+=":";
     }
     if (!hasError) {
 if(s1.isEmpty())
-        FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
+        FlowChart::addFlowChart(FlowChart::LOOP_NO,QCString(),"infinite");
     }
     if (!hasError) {
     jj_consume_token(LOOP_T);
@@ -5193,7 +5193,7 @@ if(s1.isEmpty())
 QCString q = s+" loop "+s2+" end loop" +s3;
          QCString endLoop="end loop" + s3;
          FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
+         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop,QCString());
         return q;
 assert(false);
 }
@@ -5300,7 +5300,7 @@ QCString VhdlParser::multiplying_operation() {Token *tok=0;
       tok = jj_consume_token(MULT_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -5309,7 +5309,7 @@ return tok->image.c_str();
       tok = jj_consume_token(SLASH_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -5318,7 +5318,7 @@ return tok->image.c_str();
       tok = jj_consume_token(MOD_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -5327,7 +5327,7 @@ return tok->image.c_str();
       tok = jj_consume_token(REM_T);
       }
       if (!hasError) {
-return tok->image.c_str();
+return QCString(tok->image);
       }
       break;
       }
@@ -5680,7 +5680,7 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     jj_consume_token(SEMI_T);
     }
 if(t) s+=":";
-   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data());
+   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2,s1);
     m_sharedState->lab.resize(0);
   if(t1) s2.prepend("when ");
   return s+s1+s2+";";
@@ -5823,7 +5823,7 @@ QCString VhdlParser::operator_symbol() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(STRINGLITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -5876,7 +5876,7 @@ void VhdlParser::package_body() {QCString s;
     if (!hasError) {
 m_sharedState->lastCompound=m_sharedState->current;
                         s.prepend("_");
-                        outlineParser()->addVhdlType(s,outlineParser()->getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
+                        outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
     }
     if (!hasError) {
     package_body_declarative_part();
@@ -6087,7 +6087,7 @@ m_sharedState->lastCompound=m_sharedState->current;
                           clone->bodyLine=outlineParser()->getLine(PACKAGE_T);
                           clone->protection=Package;
                           m_sharedState->current_root->moveToSubEntryAndKeep(clone);
-                          outlineParser()->addVhdlType(s,outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
+                          outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
     }
     if (!hasError) {
     package_header();
@@ -6529,7 +6529,7 @@ return s;
       allocator();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6668,7 +6668,7 @@ QCString VhdlParser::process_declarative_item() {QCString s;
       subprogram_declaration();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
       break;
       }
@@ -6906,8 +6906,8 @@ m_sharedState->currP=VhdlDocGen::PROCESS;
     }
     if (!hasError) {
 if (s2.data())
-                FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
-                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+                FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2,QCString());
+                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",QCString());
     }
     if (!hasError) {
     jj_consume_token(BEGIN_T);
@@ -6961,8 +6961,8 @@ if(s.isEmpty())
           m_sharedState->current->endBodyLine=outlineParser()->getLine();
           m_sharedState->currP=0;
           if(tok)
-            s1=tok->image.data();
-          outlineParser()->createFunction(m_sharedState->currName,VhdlDocGen::PROCESS,s1.data());
+            s1=tok->image;
+          outlineParser()->createFunction(m_sharedState->currName.data(),VhdlDocGen::PROCESS,s1.data());
           outlineParser()->createFlow();
           m_sharedState->currName="";
           outlineParser()->newEntry();
@@ -7286,7 +7286,7 @@ return "?=";
       jj_consume_token(QNEQU_T);
       }
       if (!hasError) {
-return  "?/=";
+return "?/=";
       }
       break;
       }
@@ -7678,42 +7678,42 @@ QCString VhdlParser::sequential_statement() {QCString s;
       s = signal_assignment_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_85(3)) {
       if (!hasError) {
       s = assertion_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_86(3)) {
       if (!hasError) {
       s = report_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_87(3)) {
       if (!hasError) {
       s = wait_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_88(2147483647)) {
       if (!hasError) {
       s = variable_assignment_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_89(3)) {
       if (!hasError) {
       s = procedure_call_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
       }
     } else if (jj_2_90(3)) {
       if (!hasError) {
@@ -7755,7 +7755,7 @@ return s;
       s = return_statement();
       }
       if (!hasError) {
-FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::RETURN_NO,s,QCString());return s;
       }
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7766,7 +7766,7 @@ FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;
         s = null_statement();
         }
         if (!hasError) {
-FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
+FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;
         }
         break;
         }
@@ -7910,14 +7910,14 @@ QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
       conditional_signal_assignment_wave();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
     } else if (jj_2_98(2147483647)) {
       if (!hasError) {
       selected_signal_assignment_wave();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -8277,7 +8277,7 @@ QCString VhdlParser::string_literal() {Token *tok=0;
     if (!hasError) {
     tok = jj_consume_token(STRINGLITERAL);
     }
-return tok->image.c_str();
+return QCString(tok->image);
 assert(false);
 }
 
@@ -8293,9 +8293,9 @@ void VhdlParser::subprogram_body() {QCString s;
     if (!hasError) {
 if (s.data())
       {
-        FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,0);
+        FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,QCString());
       }
-      FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+      FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",QCString());
     }
     if (!hasError) {
     jj_consume_token(BEGIN_T);
@@ -8407,7 +8407,7 @@ QCString VhdlParser::subprogram_declarative_item() {QCString s;
       subprogram_declaration();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
       break;
       }
@@ -8425,7 +8425,7 @@ return s;
       subprogram_body();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
       break;
       }
@@ -9052,7 +9052,6 @@ QCString VhdlParser::type_definition() {QCString s;
     case RANGE_T:
     case LPAREN_T:{
       if (!hasError) {
-      //try{
       s = scalar_type_definition();
       }
       if (!hasError) {
@@ -9095,7 +9094,7 @@ return s;
         protected_type_body();
         }
         if (!hasError) {
-return "";
+return QCString();
         }
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -9104,7 +9103,7 @@ return "";
           protected_type_declaration();
           }
           if (!hasError) {
-return "";
+return QCString();
           }
           break;
           }
@@ -9276,7 +9275,7 @@ return s+s1+":="+s2+";";
       selected_variable_assignment();
       }
       if (!hasError) {
-return "";
+return QCString();
       }
       break;
       }
@@ -9563,7 +9562,7 @@ QCString VhdlParser::protected_type_body() {
       ;
     }
     }
-return "";
+return QCString();
 assert(false);
 }
 
@@ -9736,7 +9735,7 @@ outlineParser()->error_skipto(END_T);
       ;
     }
     }
-return "";
+return QCString();
 assert(false);
 }
 
@@ -10415,7 +10414,7 @@ QCString VhdlParser::sig_stat() {Token *t;
       t = jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
-return t->image.data();
+return QCString(t->image);
       }
       break;
       }
@@ -10424,7 +10423,7 @@ return t->image.data();
       t = jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
-return t->image.data();
+return QCString(t->image);
       }
       break;
       }
@@ -10433,7 +10432,7 @@ return t->image.data();
       t = jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
-return t->image.data();
+return QCString(t->image);
       }
       break;
       }
@@ -11326,7 +11325,7 @@ QCString q;
      if (a>b) b=a;
      outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,Entry::VARIABLE_SEC,VhdlDocGen::GENERIC,ss.data(),0,Public);
    }
-   m_sharedState->currP=0;return "";
+   m_sharedState->currP=0;return QCString();
 assert(false);
 }
 
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 4eea915..c2f2cb2 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -1303,6 +1303,14 @@ void parseInline();
  { jj_save(124, xla); }
   }
 
+ inline bool jj_3R_207()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
  inline bool jj_3R_461()
  {
     if (jj_done) return true;
@@ -1520,24 +1528,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_427()
+ inline bool jj_3R_631()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_426()
+ inline bool jj_3R_427()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_631()
+ inline bool jj_3R_426()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
@@ -1630,6 +1638,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_628()
+ {
+    if (jj_done) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
  inline bool jj_3_125()
  {
     if (jj_done) return true;
@@ -1649,13 +1664,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_628()
- {
-    if (jj_done) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
  inline bool jj_3R_627()
  {
     if (jj_done) return true;
@@ -1734,6 +1742,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_630()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_268()) return true;
+    return false;
+  }
+
  inline bool jj_3R_443()
  {
     if (jj_done) return true;
@@ -1761,14 +1777,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_630()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_268()) return true;
-    return false;
-  }
-
  inline bool jj_3R_629()
  {
     if (jj_done) return true;
@@ -1779,20 +1787,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_360()
+ inline bool jj_3R_362()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_3R_442()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_362()
+ inline bool jj_3R_360()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_3R_442()) return true;
     return false;
   }
 
@@ -1853,6 +1861,18 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_205()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_362()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
  inline bool jj_3R_493()
  {
     if (jj_done) return true;
@@ -1876,29 +1896,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_205()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_362()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_399()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_scan_token(53)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(75)) return true;
-    return false;
-  }
-
  inline bool jj_3R_171()
  {
     if (jj_done) return true;
@@ -1932,6 +1929,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_399()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_scan_token(53)) return false;
+    jj_scanpos = xsp;
+    if (jj_scan_token(75)) return true;
+    return false;
+  }
+
  inline bool jj_3R_466()
  {
     if (jj_done) return true;
@@ -2003,13 +2011,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_124()
- {
-    if (jj_done) return true;
-    if (jj_3R_114()) return true;
-    return false;
-  }
-
  inline bool jj_3R_398()
  {
     if (jj_done) return true;
@@ -2024,6 +2025,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_124()
+ {
+    if (jj_done) return true;
+    if (jj_3R_114()) return true;
+    return false;
+  }
+
  inline bool jj_3R_385()
  {
     if (jj_done) return true;
@@ -2041,13 +2049,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_687()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
  inline bool jj_3R_492()
  {
     if (jj_done) return true;
@@ -2060,6 +2061,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_687()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_620()
+ {
+    if (jj_done) return true;
+    if (jj_3R_369()) return true;
+    return false;
+  }
+
  inline bool jj_3R_686()
  {
     if (jj_done) return true;
@@ -2086,28 +2101,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_620()
- {
-    if (jj_done) return true;
-    if (jj_3R_369()) return true;
-    return false;
-  }
-
- inline bool jj_3R_587()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
- inline bool jj_3_123()
- {
-    if (jj_done) return true;
-    if (jj_3R_150()) return true;
-    return false;
-  }
-
  inline bool jj_3R_619()
  {
     if (jj_done) return true;
@@ -2137,6 +2130,21 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_587()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
+ inline bool jj_3_123()
+ {
+    if (jj_done) return true;
+    if (jj_3R_150()) return true;
+    return false;
+  }
+
  inline bool jj_3R_542()
  {
     if (jj_done) return true;
@@ -2175,6 +2183,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_162()
+ {
+    if (jj_done) return true;
+    if (jj_3R_327()) return true;
+    return false;
+  }
+
  inline bool jj_3R_464()
  {
     if (jj_done) return true;
@@ -2182,6 +2197,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_39()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_280()
  {
     if (jj_done) return true;
@@ -2207,21 +2230,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_162()
- {
-    if (jj_done) return true;
-    if (jj_3R_327()) return true;
-    return false;
-  }
-
- inline bool jj_3_39()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_69()
  {
     if (jj_done) return true;
@@ -2233,34 +2241,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_462()
- {
-    if (jj_done) return true;
-    if (jj_3R_420()) return true;
-    return false;
-  }
-
- inline bool jj_3R_149()
+ inline bool jj_3R_336()
  {
     if (jj_done) return true;
-    if (jj_3R_119()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_scan_token(FORCE_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_314()) jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_315()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(IF_T)) return true;
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_462()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IF_T)) return true;
+    if (jj_3R_420()) return true;
     return false;
   }
 
@@ -2282,6 +2273,23 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_149()
+ {
+    if (jj_done) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_scan_token(FORCE_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_314()) jj_scanpos = xsp;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_315()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_545()
  {
     if (jj_done) return true;
@@ -2300,6 +2308,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_78()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
  inline bool jj_3R_384()
  {
     if (jj_done) return true;
@@ -2317,12 +2334,13 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_78()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_174()) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_236()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
@@ -2351,16 +2369,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_110()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_236()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_570()
  {
     if (jj_done) return true;
@@ -2385,6 +2393,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_481()
+ {
+    if (jj_done) return true;
+    if (jj_3R_549()) return true;
+    return false;
+  }
+
  inline bool jj_3R_147()
  {
     if (jj_done) return true;
@@ -2398,13 +2413,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_481()
- {
-    if (jj_done) return true;
-    if (jj_3R_549()) return true;
-    return false;
-  }
-
  inline bool jj_3R_624()
  {
     if (jj_done) return true;
@@ -2422,26 +2430,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_647()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(NEG_T)) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_623()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_647()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_647()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
  inline bool jj_3R_592()
  {
     if (jj_done) return true;
@@ -2458,11 +2446,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_119()
+ inline bool jj_3R_647()
  {
     if (jj_done) return true;
+    if (jj_scan_token(NEG_T)) return true;
     if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_147()) return true;
     return false;
   }
 
@@ -2477,6 +2465,26 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_623()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    if (jj_3R_647()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_647()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+ inline bool jj_3_119()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_147()) return true;
+    return false;
+  }
+
  inline bool jj_3R_569()
  {
     if (jj_done) return true;
@@ -2488,6 +2496,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_66()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_160()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_622()
  {
     if (jj_done) return true;
@@ -2496,13 +2514,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_66()
+ inline bool jj_3R_582()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_160()) jj_scanpos = xsp;
+    if (jj_3R_327()) return true;
     return false;
   }
 
@@ -2526,31 +2541,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_413()
  {
     if (jj_done) return true;
-    if (jj_3R_327()) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_512()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
-    if (jj_3R_570()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_412()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_413()) return true;
     return false;
   }
 
- inline bool jj_3R_511()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
-    if (jj_3R_569()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_512()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_570()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_511()
+ {
+    if (jj_done) return true;
+    if (jj_3R_569()) return true;
     return false;
   }
 
@@ -2574,24 +2600,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_326()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_412()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_413()) return true;
-    return false;
-  }
-
- inline bool jj_3R_412()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
  inline bool jj_3R_189()
  {
     if (jj_done) return true;
@@ -2650,6 +2658,19 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_549()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_591()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_592()) jj_scanpos = xsp;
+    if (jj_3R_593()) return true;
+    return false;
+  }
+
  inline bool jj_3_114()
  {
     if (jj_done) return true;
@@ -2665,16 +2686,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_593()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_591()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_592()) jj_scanpos = xsp;
-    if (jj_3R_593()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
@@ -2698,13 +2713,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_593()
- {
-    if (jj_done) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
  inline bool jj_3R_284()
  {
     if (jj_done) return true;
@@ -2712,13 +2720,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_116()
- {
-    if (jj_done) return true;
-    if (jj_3R_146()) return true;
-    return false;
-  }
-
  inline bool jj_3R_467()
  {
     if (jj_done) return true;
@@ -2741,6 +2742,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_116()
+ {
+    if (jj_done) return true;
+    if (jj_3R_146()) return true;
+    return false;
+  }
+
  inline bool jj_3R_273()
  {
     if (jj_done) return true;
@@ -2780,13 +2788,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_296()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    return false;
-  }
-
  inline bool jj_3R_141()
  {
     if (jj_done) return true;
@@ -2814,26 +2815,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_246()
+ inline bool jj_3R_296()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3_115()
+ inline bool jj_3R_251()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_251()
+ inline bool jj_3R_246()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_102()) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
@@ -2845,6 +2845,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_115()
+ {
+    if (jj_done) return true;
+    if (jj_3R_145()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_409()
  {
     if (jj_done) return true;
@@ -2852,56 +2860,56 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_144()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_296()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_648()
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_408()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XOR_T)) return true;
+    if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_188()
+ inline bool jj_3R_405()
  {
     if (jj_done) return true;
-    if (jj_3R_349()) return true;
+    if (jj_scan_token(NAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_144()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_296()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOR_T)) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_405()
+ inline bool jj_3R_188()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NAND_T)) return true;
+    if (jj_3R_349()) return true;
     return false;
   }
 
@@ -2959,16 +2967,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_136()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_327()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_129()
  {
     if (jj_done) return true;
@@ -2984,6 +2982,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_136()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_327()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_116()
  {
     if (jj_done) return true;
@@ -2998,6 +3006,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_218()
+ {
+    if (jj_done) return true;
+    if (jj_3R_369()) return true;
+    return false;
+  }
+
  inline bool jj_3R_137()
  {
     if (jj_done) return true;
@@ -3009,13 +3024,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_218()
- {
-    if (jj_done) return true;
-    if (jj_3R_369()) return true;
-    return false;
-  }
-
  inline bool jj_3R_217()
  {
     if (jj_done) return true;
@@ -3041,22 +3049,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_135()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_63()) return true;
-    if (jj_3R_245()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_284()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_684()
  {
     if (jj_done) return true;
@@ -3075,6 +3067,22 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_135()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_63()) return true;
+    if (jj_3R_245()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_284()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_645()
  {
     if (jj_done) return true;
@@ -3135,6 +3143,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_488()
+ {
+    if (jj_done) return true;
+    if (jj_3R_554()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_555()) return true;
+    return false;
+  }
+
  inline bool jj_3R_438()
  {
     if (jj_done) return true;
@@ -3149,12 +3166,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_488()
+ inline bool jj_3R_662()
  {
     if (jj_done) return true;
-    if (jj_3R_554()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_555()) return true;
+    if (jj_3R_245()) return true;
     return false;
   }
 
@@ -3178,13 +3193,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_662()
- {
-    if (jj_done) return true;
-    if (jj_3R_245()) return true;
-    return false;
-  }
-
  inline bool jj_3R_597()
  {
     if (jj_done) return true;
@@ -3258,6 +3266,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_644()
+ {
+    if (jj_done) return true;
+    if (jj_3R_661()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_662()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_348()
  {
     if (jj_done) return true;
@@ -3272,16 +3290,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_644()
- {
-    if (jj_done) return true;
-    if (jj_3R_661()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_662()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_692()
  {
     if (jj_done) return true;
@@ -3315,37 +3323,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3_36()
  {
     if (jj_done) return true;
-    if (jj_3R_364()) return true;
+    if (jj_3R_91()) return true;
     return false;
   }
 
- inline bool jj_3R_700()
+ inline bool jj_3_34()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_718()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_719()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_720()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3_36()
+ inline bool jj_3R_718()
  {
     if (jj_done) return true;
-    if (jj_3R_91()) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3_34()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_718()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_719()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_720()) return true;
     return false;
   }
 
@@ -3444,6 +3452,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_618()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BOX_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_714()
  {
     if (jj_done) return true;
@@ -3465,17 +3480,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_618()
+ inline bool jj_3R_711()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_3R_391()) return true;
     return false;
   }
 
- inline bool jj_3R_711()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
-    if (jj_3R_391()) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -3507,14 +3523,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_366()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_74()) return true;
-    return false;
-  }
-
  inline bool jj_3R_706()
  {
     if (jj_done) return true;
@@ -3574,6 +3582,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_557()
+ {
+    if (jj_done) return true;
+    if (jj_3R_555()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_618()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_544()
  {
     if (jj_done) return true;
@@ -3582,6 +3600,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_626()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_143()
  {
     if (jj_done) return true;
@@ -3597,13 +3624,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_557()
+ inline bool jj_3R_614()
  {
     if (jj_done) return true;
-    if (jj_3R_555()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_618()) jj_scanpos = xsp;
+    if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
@@ -3615,22 +3639,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_626()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_614()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_613()
  {
     if (jj_done) return true;
@@ -3694,16 +3702,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_463()
- {
-    if (jj_done) return true;
-    if (jj_3R_61()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_544()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_604()
  {
     if (jj_done) return true;
@@ -3732,24 +3730,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_600()
+ inline bool jj_3R_463()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_61()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_544()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_599()
+ inline bool jj_3R_600()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARCHITECTURE_T)) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_599()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNAFFECTED_T)) return true;
+    if (jj_scan_token(ARCHITECTURE_T)) return true;
     return false;
   }
 
@@ -3801,6 +3802,28 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_422()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(UNAFFECTED_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_576()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_575()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
  inline bool jj_3R_332()
  {
     if (jj_done) return true;
@@ -3824,21 +3847,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_576()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_575()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
  inline bool jj_3R_574()
  {
     if (jj_done) return true;
@@ -3906,14 +3914,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_723()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_722()) return true;
-    return false;
-  }
-
  inline bool jj_3_32()
  {
     if (jj_done) return true;
@@ -3921,18 +3921,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_31()
+ inline bool jj_3R_723()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_722()) return true;
     return false;
   }
 
- inline bool jj_3R_480()
+ inline bool jj_3_31()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
@@ -3954,6 +3954,21 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_480()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_168()
+ {
+    if (jj_done) return true;
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
  inline bool jj_3R_391()
  {
     if (jj_done) return true;
@@ -3970,35 +3985,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_168()
+ inline bool jj_3R_167()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_72()
  {
     if (jj_done) return true;
-    if (jj_3R_542()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_167()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_168()) return true;
     return false;
   }
 
- inline bool jj_3R_167()
+ inline bool jj_3R_458()
  {
     if (jj_done) return true;
-    if (jj_3R_88()) return true;
+    if (jj_3R_542()) return true;
     return false;
   }
 
- inline bool jj_3R_72()
+ inline bool jj_3R_489()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_167()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_168()) return true;
+    if (jj_3R_556()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -4042,15 +4059,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_489()
- {
-    if (jj_done) return true;
-    if (jj_3R_556()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
  inline bool jj_3R_397()
  {
     if (jj_done) return true;
@@ -4141,23 +4149,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_704()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_722()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_723()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_89()) return true;
-    return false;
-  }
-
  inline bool jj_3R_573()
  {
     if (jj_done) return true;
@@ -4176,10 +4167,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_722()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_723()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
@@ -4208,6 +4209,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_161()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
  inline bool jj_3R_193()
  {
     if (jj_done) return true;
@@ -4229,6 +4237,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_187()
+ {
+    if (jj_done) return true;
+    if (jj_3R_348()) return true;
+    return false;
+  }
+
+ inline bool jj_3_28()
+ {
+    if (jj_done) return true;
+    if (jj_3R_86()) return true;
+    return false;
+  }
+
  inline bool jj_3_110()
  {
     if (jj_done) return true;
@@ -4243,45 +4265,53 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_186()
  {
     if (jj_done) return true;
-    if (jj_3R_658()) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
-    if (jj_3R_657()) return true;
+    if (jj_3R_658()) return true;
     return false;
   }
 
- inline bool jj_3R_187()
+ inline bool jj_3R_185()
  {
     if (jj_done) return true;
-    if (jj_3R_348()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3_28()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_657()) return true;
     return false;
   }
 
- inline bool jj_3R_186()
+ inline bool jj_3R_184()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_346()) return true;
     return false;
   }
 
- inline bool jj_3R_185()
+ inline bool jj_3R_85()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_184()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_185()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_186()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_187()) return true;
     return false;
   }
 
@@ -4311,25 +4341,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_184()
- {
-    if (jj_done) return true;
-    if (jj_3R_346()) return true;
-    return false;
-  }
-
- inline bool jj_3R_85()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_184()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_185()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_186()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_187()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
@@ -4340,13 +4355,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_286()
- {
-    if (jj_done) return true;
-    if (jj_3R_65()) return true;
-    return false;
-  }
-
  inline bool jj_3R_476()
  {
     if (jj_done) return true;
@@ -4390,6 +4398,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_27()
+ {
+    if (jj_done) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
  inline bool jj_3R_111()
  {
     if (jj_done) return true;
@@ -4408,10 +4423,13 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_27()
+ inline bool jj_3R_703()
  {
     if (jj_done) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_65()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
@@ -4423,16 +4441,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_703()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_65()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_89()) return true;
-    return false;
-  }
-
  inline bool jj_3R_134()
  {
     if (jj_done) return true;
@@ -4452,6 +4460,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_389()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_205()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_477()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_119()
  {
     if (jj_done) return true;
@@ -4477,17 +4499,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_389()
+ inline bool jj_3_26()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_205()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_477()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
@@ -4505,13 +4520,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_26()
- {
-    if (jj_done) return true;
-    if (jj_3R_84()) return true;
-    return false;
-  }
-
  inline bool jj_3R_226()
  {
     if (jj_done) return true;
@@ -4529,6 +4537,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_579()
+ {
+    if (jj_done) return true;
+    if (jj_3R_345()) return true;
+    return false;
+  }
+
  inline bool jj_3R_105()
  {
     if (jj_done) return true;
@@ -4551,17 +4566,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3_105()
  {
     if (jj_done) return true;
-    if (jj_3R_345()) return true;
+    if (jj_3R_138()) return true;
     return false;
   }
 
- inline bool jj_3_105()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
-    if (jj_3R_138()) return true;
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_523()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_578()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_579()) return true;
     return false;
   }
 
@@ -4581,24 +4607,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_578()
- {
-    if (jj_done) return true;
-    if (jj_3R_84()) return true;
-    return false;
-  }
-
- inline bool jj_3R_523()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_578()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_579()) return true;
-    return false;
-  }
-
  inline bool jj_3R_138()
  {
     if (jj_done) return true;
@@ -4626,6 +4634,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_25()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_83()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_584()
  {
     if (jj_done) return true;
@@ -4637,15 +4654,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_25()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_83()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_367()
  {
     if (jj_done) return true;
@@ -4662,15 +4670,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_539()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_582()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_333()
  {
     if (jj_done) return true;
@@ -4681,6 +4680,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_539()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_582()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_173()
  {
     if (jj_done) return true;
@@ -4695,17 +4703,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_538()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_scan_token(84)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(52)) return true;
-    return false;
-  }
-
  inline bool jj_3R_75()
  {
     if (jj_done) return true;
@@ -4717,6 +4714,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_538()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_scan_token(84)) return false;
+    jj_scanpos = xsp;
+    if (jj_scan_token(52)) return true;
+    return false;
+  }
+
  inline bool jj_3_104()
  {
     if (jj_done) return true;
@@ -4777,6 +4785,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_23()
+ {
+    if (jj_done) return true;
+    if (jj_3R_81()) return true;
+    return false;
+  }
+
  inline bool jj_3R_364()
  {
     if (jj_done) return true;
@@ -4804,13 +4819,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_23()
- {
-    if (jj_done) return true;
-    if (jj_3R_81()) return true;
-    return false;
-  }
-
  inline bool jj_3_22()
  {
     if (jj_done) return true;
@@ -4818,17 +4826,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_638()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_scan_token(46)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) return true;
-    return false;
-  }
-
  inline bool jj_3R_79()
  {
     if (jj_done) return true;
@@ -4849,6 +4846,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_638()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_scan_token(46)) return false;
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) return true;
+    return false;
+  }
+
  inline bool jj_3R_636()
  {
     if (jj_done) return true;
@@ -4875,29 +4883,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_101()
+ inline bool jj_3_19()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_77()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(PROCESS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_675()
+ inline bool jj_3_101()
  {
     if (jj_done) return true;
-    if (jj_3R_398()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3_19()
+ inline bool jj_3R_675()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_77()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_scan_token(PROCESS_T)) return true;
+    if (jj_3R_398()) return true;
     return false;
   }
 
@@ -4989,24 +4997,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_667()
+ inline bool jj_3_17()
  {
     if (jj_done) return true;
-    if (jj_3R_388()) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
- inline bool jj_3R_666()
+ inline bool jj_3R_667()
  {
     if (jj_done) return true;
-    if (jj_3R_540()) return true;
+    if (jj_3R_388()) return true;
     return false;
   }
 
- inline bool jj_3_17()
+ inline bool jj_3R_666()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    if (jj_3R_540()) return true;
     return false;
   }
 
@@ -5072,43 +5080,43 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_100()
+ inline bool jj_3R_175()
  {
     if (jj_done) return true;
-    if (jj_3R_135()) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
- inline bool jj_3R_365()
+ inline bool jj_3_16()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_452()) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(137)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_452()
+ inline bool jj_3_100()
  {
     if (jj_done) return true;
-    if (jj_3R_540()) return true;
+    if (jj_3R_135()) return true;
     return false;
   }
 
- inline bool jj_3R_175()
+ inline bool jj_3R_365()
  {
     if (jj_done) return true;
-    if (jj_3R_75()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_452()) return false;
+    jj_scanpos = xsp;
+    if (jj_scan_token(137)) return true;
     return false;
   }
 
- inline bool jj_3_16()
+ inline bool jj_3R_452()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_540()) return true;
     return false;
   }
 
@@ -5135,14 +5143,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_209()
- {
-    if (jj_done) return true;
-    if (jj_3R_364()) return true;
-    if (jj_3R_365()) return true;
-    return false;
-  }
-
  inline bool jj_3R_82()
  {
     if (jj_done) return true;
@@ -5156,10 +5156,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_585()
+ inline bool jj_3R_209()
  {
     if (jj_done) return true;
-    if (jj_3R_638()) return true;
+    if (jj_3R_364()) return true;
+    if (jj_3R_365()) return true;
     return false;
   }
 
@@ -5178,6 +5179,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_585()
+ {
+    if (jj_done) return true;
+    if (jj_3R_638()) return true;
+    return false;
+  }
+
  inline bool jj_3R_208()
  {
     if (jj_done) return true;
@@ -5249,32 +5257,32 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_478()
+ inline bool jj_3R_178()
  {
     if (jj_done) return true;
-    if (jj_3R_548()) return true;
+    if (jj_3R_73()) return true;
     return false;
   }
 
- inline bool jj_3R_178()
+ inline bool jj_3R_478()
  {
     if (jj_done) return true;
-    if (jj_3R_73()) return true;
+    if (jj_3R_548()) return true;
     return false;
   }
 
- inline bool jj_3R_164()
+ inline bool jj_3R_487()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
-    if (jj_3R_134()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_487()
+ inline bool jj_3R_164()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_133()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
@@ -5304,13 +5312,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_373()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(STRINGLITERAL)) return true;
-    return false;
-  }
-
  inline bool jj_3R_81()
  {
     if (jj_done) return true;
@@ -5326,11 +5327,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_453()
+ inline bool jj_3R_373()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
@@ -5348,25 +5348,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_183()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
-    if (jj_3R_345()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_182()
+ inline bool jj_3R_183()
  {
     if (jj_done) return true;
-    if (jj_3R_344()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_345()) return true;
     return false;
   }
 
- inline bool jj_3R_163()
+ inline bool jj_3R_182()
  {
     if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_3R_344()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -5378,17 +5379,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_163()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_163()) jj_scanpos = xsp;
-    if (jj_3R_134()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_164()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_328()) return true;
     return false;
   }
 
@@ -5412,19 +5406,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_375()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
- inline bool jj_3R_646()
+ inline bool jj_3R_70()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_163()) jj_scanpos = xsp;
+    if (jj_3R_134()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_164()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -5444,6 +5436,22 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_375()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_646()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
  inline bool jj_3R_374()
  {
     if (jj_done) return true;
@@ -5456,6 +5464,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_12()
+ {
+    if (jj_done) return true;
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
  inline bool jj_3R_245()
  {
     if (jj_done) return true;
@@ -5469,10 +5484,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_12()
+ inline bool jj_3R_90()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_194()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_195()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -5483,15 +5503,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_90()
+ inline bool jj_3_11()
  {
     if (jj_done) return true;
-    if (jj_3R_194()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_195()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_70()) return true;
     return false;
   }
 
@@ -5502,10 +5517,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_11()
+ inline bool jj_3R_354()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
@@ -5534,32 +5549,32 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3_10()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_3R_70()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
- inline bool jj_3R_590()
+ inline bool jj_3R_353()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BUS_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3_10()
+ inline bool jj_3R_590()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    if (jj_3R_71()) return true;
+    if (jj_scan_token(BUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_353()
+ inline bool jj_3R_352()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
@@ -5581,13 +5596,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_352()
- {
-    if (jj_done) return true;
-    if (jj_3R_72()) return true;
-    return false;
-  }
-
  inline bool jj_3R_351()
  {
     if (jj_done) return true;
@@ -5626,6 +5634,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_369()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    return false;
+  }
+
  inline bool jj_3R_390()
  {
     if (jj_done) return true;
@@ -5642,13 +5657,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_369()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
  inline bool jj_3_98()
  {
     if (jj_done) return true;
@@ -5656,13 +5664,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_97()
- {
-    if (jj_done) return true;
-    if (jj_3R_131()) return true;
-    return false;
-  }
-
  inline bool jj_3R_632()
  {
     if (jj_done) return true;
@@ -5673,10 +5674,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_541()
+ inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_3R_420()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
@@ -5687,6 +5688,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_541()
+ {
+    if (jj_done) return true;
+    if (jj_3R_420()) return true;
+    return false;
+  }
+
  inline bool jj_3_96()
  {
     if (jj_done) return true;
@@ -5752,24 +5760,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_328()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_416()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_417()) return true;
-    return false;
-  }
-
- inline bool jj_3R_416()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_265()
  {
     if (jj_done) return true;
@@ -5781,17 +5771,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_567()
+ inline bool jj_3R_328()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROR_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_416()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_417()) return true;
     return false;
   }
 
- inline bool jj_3R_566()
+ inline bool jj_3R_416()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROL_T)) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
@@ -5817,6 +5811,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_567()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ROR_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_566()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ROL_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_565()
  {
     if (jj_done) return true;
@@ -5864,22 +5872,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_522()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_402()) jj_scanpos = xsp;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_577()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_522()
+ inline bool jj_3R_318()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_577()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_70()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_402()) jj_scanpos = xsp;
     return false;
   }
 
@@ -5983,28 +5991,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_253()
- {
-    if (jj_done) return true;
-    if (jj_3R_378()) return true;
-    return false;
-  }
-
- inline bool jj_3_84()
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_118()) jj_scanpos = xsp;
-    if (jj_3R_119()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_398()) return true;
     return false;
   }
 
- inline bool jj_3R_311()
+ inline bool jj_3R_253()
  {
     if (jj_done) return true;
-    if (jj_3R_398()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
@@ -6015,17 +6012,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_87()
+ inline bool jj_3_84()
  {
     if (jj_done) return true;
-    if (jj_3R_122()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_118()) jj_scanpos = xsp;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3_86()
+ inline bool jj_3_87()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
@@ -6050,6 +6051,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_86()
+ {
+    if (jj_done) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
  inline bool jj_3R_308()
  {
     if (jj_done) return true;
@@ -6081,6 +6089,27 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_305()
+ {
+    if (jj_done) return true;
+    if (jj_3R_394()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_306()
+ {
+    if (jj_done) return true;
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_304()
+ {
+    if (jj_done) return true;
+    if (jj_3R_393()) return true;
+    return false;
+  }
+
  inline bool jj_3R_117()
  {
     if (jj_done) return true;
@@ -6121,24 +6150,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_305()
- {
-    if (jj_done) return true;
-    if (jj_3R_394()) return true;
-    return false;
-  }
-
- inline bool jj_3R_306()
+ inline bool jj_3R_303()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_392()) return true;
     return false;
   }
 
- inline bool jj_3R_304()
+ inline bool jj_3R_302()
  {
     if (jj_done) return true;
-    if (jj_3R_393()) return true;
+    if (jj_3R_391()) return true;
     return false;
   }
 
@@ -6150,20 +6172,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_303()
- {
-    if (jj_done) return true;
-    if (jj_3R_392()) return true;
-    return false;
-  }
-
- inline bool jj_3R_302()
- {
-    if (jj_done) return true;
-    if (jj_3R_391()) return true;
-    return false;
-  }
-
  inline bool jj_3R_301()
  {
     if (jj_done) return true;
@@ -6178,13 +6186,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_83()
- {
-    if (jj_done) return true;
-    if (jj_3R_117()) return true;
-    return false;
-  }
-
  inline bool jj_3R_299()
  {
     if (jj_done) return true;
@@ -6213,14 +6214,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_268()
+ inline bool jj_3_83()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_83()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_117()) return true;
     return false;
   }
 
@@ -6270,36 +6267,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_440()
+ inline bool jj_3R_268()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_524()) { jj_scanpos = xsp; break; }
+      if (jj_3_83()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_357()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_439()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_440()) return true;
-    return false;
-  }
-
- inline bool jj_3R_439()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_345()
  {
     if (jj_done) return true;
@@ -6320,6 +6298,18 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_440()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_524()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
  inline bool jj_3R_250()
  {
     if (jj_done) return true;
@@ -6329,6 +6319,24 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_357()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_439()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_440()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_439()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ALL_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_276()
  {
     if (jj_done) return true;
@@ -6387,6 +6395,19 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_344()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_428()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_429()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_430()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_337()
  {
     if (jj_done) return true;
@@ -6408,19 +6429,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_344()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_428()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_429()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_430()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_249()
  {
     if (jj_done) return true;
@@ -6540,14 +6548,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_258()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_115()
  {
     if (jj_done) return true;
@@ -6563,6 +6563,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_258()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_319()
  {
     if (jj_done) return true;
@@ -6592,13 +6600,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_506()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(QNEQU_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_230()
  {
     if (jj_done) return true;
@@ -6617,6 +6618,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_506()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(QNEQU_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_505()
  {
     if (jj_done) return true;
@@ -6680,20 +6688,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_497()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(EQU_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_496()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(GT_T)) return true;
-    return false;
-  }
-
  inline bool jj_3_6()
  {
     if (jj_done) return true;
@@ -6713,6 +6707,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_497()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(EQU_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_355()
  {
     if (jj_done) return true;
@@ -6721,6 +6722,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_496()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(GT_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_403()
  {
     if (jj_done) return true;
@@ -6759,16 +6767,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_151()
- {
-    if (jj_done) return true;
-    if (jj_3R_318()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_319()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_169()
  {
     if (jj_done) return true;
@@ -6781,6 +6779,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_151()
+ {
+    if (jj_done) return true;
+    if (jj_3R_318()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_319()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_697()
  {
     if (jj_done) return true;
@@ -6831,6 +6839,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_120()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_257()) jj_scanpos = xsp;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3_80()
  {
     if (jj_done) return true;
@@ -6847,22 +6866,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_120()
+ inline bool jj_3R_86()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_257()) jj_scanpos = xsp;
-    if (jj_3R_196()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_86()
+ inline bool jj_3R_196()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    if (jj_3R_88()) return true;
+    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_83()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_355()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_356()) jj_scanpos = xsp;
     return false;
   }
 
@@ -6873,23 +6894,19 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_191()
+ inline bool jj_3_5()
  {
     if (jj_done) return true;
-    if (jj_3R_115()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_65()) return true;
+    if (jj_scan_token(OF_T)) return true;
     return false;
   }
 
- inline bool jj_3R_196()
+ inline bool jj_3R_191()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ASSERT_T)) return true;
-    if (jj_3R_83()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_355()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_356()) jj_scanpos = xsp;
+    if (jj_3R_115()) return true;
     return false;
   }
 
@@ -6913,12 +6930,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_5()
+ inline bool jj_3R_696()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_65()) return true;
-    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_704()) return true;
     return false;
   }
 
@@ -6931,13 +6946,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_696()
- {
-    if (jj_done) return true;
-    if (jj_3R_704()) return true;
-    return false;
-  }
-
  inline bool jj_3R_237()
  {
     if (jj_done) return true;
@@ -7016,20 +7024,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_198()
+ inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_357()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_244()
+ inline bool jj_3R_198()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_357()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
@@ -7052,6 +7060,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_552()
+ {
+    if (jj_done) return true;
+    if (jj_3R_321()) return true;
+    return false;
+  }
+
  inline bool jj_3R_197()
  {
     if (jj_done) return true;
@@ -7060,10 +7075,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_552()
+ inline bool jj_3R_551()
  {
     if (jj_done) return true;
-    if (jj_3R_321()) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
@@ -7093,20 +7108,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_551()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
- inline bool jj_3R_358()
- {
-    if (jj_done) return true;
-    if (jj_3R_441()) return true;
-    return false;
-  }
-
  inline bool jj_3R_550()
  {
     if (jj_done) return true;
@@ -7127,6 +7128,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_358()
+ {
+    if (jj_done) return true;
+    if (jj_3R_441()) return true;
+    return false;
+  }
+
  inline bool jj_3R_199()
  {
     if (jj_done) return true;
@@ -7152,32 +7160,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_78()
- {
-    if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    return false;
-  }
-
- inline bool jj_3R_532()
+ inline bool jj_3R_483()
  {
     if (jj_done) return true;
-    if (jj_3R_395()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_483()
+ inline bool jj_3_78()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_531()
+ inline bool jj_3R_532()
  {
     if (jj_done) return true;
-    if (jj_3R_393()) return true;
+    if (jj_3R_395()) return true;
     return false;
   }
 
@@ -7197,6 +7198,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_531()
+ {
+    if (jj_done) return true;
+    if (jj_3R_393()) return true;
+    return false;
+  }
+
  inline bool jj_3_77()
  {
     if (jj_done) return true;
@@ -7218,31 +7226,31 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_528()
+ inline bool jj_3R_114()
  {
     if (jj_done) return true;
-    if (jj_3R_389()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_247()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_248()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_527()
+ inline bool jj_3R_528()
  {
     if (jj_done) return true;
-    if (jj_3R_388()) return true;
+    if (jj_3R_389()) return true;
     return false;
   }
 
- inline bool jj_3R_114()
+ inline bool jj_3R_527()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_247()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_248()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_388()) return true;
     return false;
   }
 
@@ -7267,6 +7275,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_3()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_525()
  {
     if (jj_done) return true;
@@ -7274,6 +7290,26 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_133()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_281()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_282()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_283()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_281()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(PLUS_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_441()
  {
     if (jj_done) return true;
@@ -7305,14 +7341,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_3()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_342()
  {
     if (jj_done) return true;
@@ -7322,26 +7350,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_133()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_281()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_282()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_283()) return true;
-    return false;
-  }
-
- inline bool jj_3R_281()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
-    return false;
-  }
-
  inline bool jj_3_2()
  {
     if (jj_done) return true;
@@ -7429,31 +7437,31 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_213()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
-    if (jj_3R_368()) return true;
+    if (jj_3R_169()) return true;
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_213()
  {
     if (jj_done) return true;
-    if (jj_3R_169()) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
- inline bool jj_3_75()
+ inline bool jj_3_1()
  {
     if (jj_done) return true;
-    if (jj_3R_95()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3_1()
+ inline bool jj_3_75()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_95()) return true;
     return false;
   }
 
@@ -7471,6 +7479,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_155()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    return false;
+  }
+
  inline bool jj_3_73()
  {
     if (jj_done) return true;
@@ -7504,13 +7519,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_155()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    return false;
-  }
-
  inline bool jj_3_72()
  {
     if (jj_done) return true;
@@ -7518,13 +7526,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_71()
- {
-    if (jj_done) return true;
-    if (jj_3R_112()) return true;
-    return false;
-  }
-
  inline bool jj_3R_154()
  {
     if (jj_done) return true;
@@ -7532,10 +7533,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_3R_114()) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
@@ -7559,6 +7560,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_475()
+ {
+    if (jj_done) return true;
+    if (jj_3R_114()) return true;
+    return false;
+  }
+
  inline bool jj_3_70()
  {
     if (jj_done) return true;
@@ -7573,25 +7581,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_69()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_scan_token(ACCESS_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3R_473()
+ inline bool jj_3_69()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3R_473()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -7611,38 +7619,31 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_702()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
- inline bool jj_3_67()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
-    if (jj_3R_110()) return true;
+    if (jj_scan_token(BASED_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASED_LITERAL)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_234()
+ inline bool jj_3_67()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
@@ -7666,6 +7667,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_471()
+ {
+    if (jj_done) return true;
+    if (jj_3R_111()) return true;
+    return false;
+  }
+
  inline bool jj_3R_470()
  {
     if (jj_done) return true;
@@ -8514,14 +8522,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_207()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
 
 public: 
   void setErrorHandler(ErrorHandler *eh) {
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 341469f..3b7b396 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -3503,7 +3503,7 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
     if (count == 1)
       parser->outlineParser()->oneLineComment(doc);
     else
-      parser->outlineParser()->handleCommentBlock(image.data(),FALSE); ;
+      parser->outlineParser()->handleCommentBlock(QCString(image),FALSE); ;
     }
          break;
        }
@@ -3521,7 +3521,7 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
    {
      QCString q = filter2008VhdlComment(image.data());
-     parser->outlineParser()->handleCommentBlock(q.data(),TRUE);image.clear();
+     parser->outlineParser()->handleCommentBlock(QCString(q),TRUE);image.clear();
    }
          break;
        }
diff --git a/vhdlparser/vhdl_adj.py b/vhdlparser/vhdl_adj.py
index a431970..388864a 100644
--- a/vhdlparser/vhdl_adj.py
+++ b/vhdlparser/vhdl_adj.py
@@ -18,7 +18,7 @@ def main():
     inputFile = open(sys.argv[1], 'r')
     outputFile = open(sys.argv[2], 'w')
     for line in inputFile:
-        outputFile.write(line.replace("assert(false);","assert(false);return \"\";"))
+        outputFile.write(line.replace("assert(false);","assert(false);return QCString();"))
 
 if __name__ == '__main__':
     main()
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index ed4500a..3ef732e 100755
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -110,7 +110,7 @@ SKIP:
     if (count == 1)
       parser->outlineParser()->oneLineComment(doc);
     else
-      parser->outlineParser()->handleCommentBlock(image.data(),FALSE); ;
+      parser->outlineParser()->handleCommentBlock(QCString(image),FALSE); ;
     }
 
   }
@@ -128,7 +128,7 @@ SKIP :
   {
    {
      QCString q = filter2008VhdlComment(image.data());
-     parser->outlineParser()->handleCommentBlock(q.data(),TRUE);image.clear();
+     parser->outlineParser()->handleCommentBlock(QCString(q),TRUE);image.clear();
    }
   }
   | <MULT_VHDL_2008_COMMENT : "/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">
@@ -337,22 +337,22 @@ TOKEN:
 QCString abstract_literal() :
 {Token *tok;}
 {
-   tok=<DECIMAL_LITERAL> { return tok->image.c_str(); }
- | tok=<INTEGER>         { return tok->image.c_str(); }
- | tok=<BASED_LITERAL>   { return tok->image.c_str(); }
+   tok=<DECIMAL_LITERAL> { return QCString(tok->image); }
+ | tok=<INTEGER>         { return QCString(tok->image); }
+ | tok=<BASED_LITERAL>   { return QCString(tok->image); }
 }
 
 QCString access_type_definition() :
 {Token *tok=0;QCString str,str1;}
 {
-  tok=<ACCESS_T> str1=subtype_indication() { str=tok->image.c_str(); return str+str1; }
+  tok=<ACCESS_T> str1=subtype_indication() { str=tok->image; return str+str1; }
 }
 
 
 QCString actual_designator() :
 {QCString str;Token *t=0;}
 {
-t=<OPEN_T> { return t->image.c_str(); }
+t=<OPEN_T> { return QCString(t->image); }
 |
 LOOKAHEAD(expression())
   str=expression() { return str; }
@@ -392,7 +392,7 @@ QCString adding_operator () :
 
 QCString aggregate() :  {QCString s,s1,s2;}
 {
-  <LPAREN_T> s=element_association() (<COMMA_T> s1=element_association(){s+=","+s1;})* <RPAREN_T> { return "("+s+")";}
+  <LPAREN_T> s=element_association() (<COMMA_T> s1=element_association(){s+=","+s1;})* <RPAREN_T> { return QCString("("+s+")");}
 }
 
 QCString alias_declaration() :  {QCString s,s1,s2;}
@@ -411,7 +411,7 @@ QCString alias_declaration() :  {QCString s,s1,s2;}
 QCString alias_designator()  : {Token *tok=0;QCString s;}
 {
  s=identifier() { return s;}
- | tok=<CHARACTER_LITERAL> { return tok->image.c_str(); }
+ | tok=<CHARACTER_LITERAL> { return QCString(tok->image); }
  | s=operator_symbol() { return s; }
 }
 
@@ -431,7 +431,7 @@ void architecture_body() : {QCString s,s1;}
     m_sharedState->genLabels.resize(0);
     outlineParser()->pushLabel(m_sharedState->genLabels,s1);
     m_sharedState->lastCompound=m_sharedState->current;
-    outlineParser()->addVhdlType(t,outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
+    outlineParser()->addVhdlType(t.data(),outlineParser()->getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
   }
   try
   {
@@ -511,7 +511,7 @@ QCString attribute_declaration() : {QCString s,s1;}
 QCString attribute_designator (): {QCString s;Token *tok=0;}
 {
   s=identifier() { return s;}
-  | tok=<RANGE_T> { return tok->image.c_str(); }
+  | tok=<RANGE_T> { return QCString(tok->image); }
 }
 
 
@@ -532,12 +532,12 @@ QCString attribute_specification():  {QCString s,s1,s2;}
 
 QCString base() :  {Token *tok=0;}
 {
-  tok=<INTEGER> { return tok->image.c_str();}
+  tok=<INTEGER> { return QCString(tok->image);}
 }
 
 QCString base_specifier ():  {Token *tok=0;}
 {
-   tok=<BASIC_IDENTIFIER> { return tok->image.c_str();}
+   tok=<BASIC_IDENTIFIER> { return QCString(tok->image);}
 }
 
 QCString base_unit_declaration() :
@@ -548,17 +548,17 @@ QCString base_unit_declaration() :
 
 QCString based_integer() :  {Token *tok=0;}
 {
-  tok=<BASIC_IDENTIFIER> { return tok->image.c_str();}
+  tok=<BASIC_IDENTIFIER> { return QCString(tok->image);}
 }
 
 QCString based_literal():  {Token *tok=0;}
 {
- tok=<BASED_LITERAL> { return tok->image.c_str();}
+ tok=<BASED_LITERAL> { return QCString(tok->image);}
 }
 
 QCString basic_identifier() :  {Token *tok=0;}
 {
-  tok=<BASIC_IDENTIFIER> { return tok->image.c_str();}
+  tok=<BASIC_IDENTIFIER> { return QCString(tok->image);}
 }
 
 void binding_indication() :  {}
@@ -570,13 +570,13 @@ void binding_indication() :  {}
 
 QCString bit_string_literal ():  {Token *tok=0;}
 {
-  tok=<BIT_STRING_LITERAL> { return tok->image.c_str();}
+  tok=<BIT_STRING_LITERAL> { return QCString(tok->image);}
 }
 
 
 QCString bit_value() :  {Token *tok=0;}
 {
-  tok=<BASIC_IDENTIFIER> { return tok->image.c_str();}
+  tok=<BASIC_IDENTIFIER> { return QCString(tok->image);}
 }
 
 void block_configuration() : {}
@@ -653,7 +653,7 @@ void  case_statement() : {QCString s;}
   <CASE_T> s=expression()
     {
      QCString ca="case "+s;
-     FlowChart::addFlowChart(FlowChart::CASE_NO,0,ca);
+     FlowChart::addFlowChart(FlowChart::CASE_NO,QCString(),ca);
     }
   <IS_T>
         case_statement_alternative()
@@ -661,7 +661,7 @@ void  case_statement() : {QCString s;}
         <END_T> <CASE_T> [ identifier() ] <SEMI_T>
         {
          FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
+         FlowChart::addFlowChart(FlowChart::END_CASE,"end case",QCString());
         }
 }
 
@@ -669,16 +669,16 @@ void case_statement_alternative() :  {QCString s;}
 {
   <WHEN_T> s=choices() <ARROW_T>
    {
-    QCString t="when ";
+    QCString t("when ");
     t+=s+"=> ";
-    FlowChart::addFlowChart(FlowChart::WHEN_NO,s.data(),t);
+    FlowChart::addFlowChart(FlowChart::WHEN_NO,s,t);
     }
   sequence_of_statement(){FlowChart::moveToPrevLevel(); }
 }
 
 QCString character_literal() :  {Token *tok=0;}
 {
-  tok=<CHARACTER_LITERAL>{ return tok->image.c_str();}
+  tok=<CHARACTER_LITERAL>{ return QCString(tok->image);}
 }
 
 QCString choice() : {QCString s;}
@@ -731,8 +731,8 @@ void component_instantiation_statement() :  {QCString s,s1;}
  {
        QCString s3;
        if (s1.contains("|")) {
-         s3=VhdlDocGen::getIndexWord(s1.data(),0);
-         s1=VhdlDocGen::getIndexWord(s1.data(),1);
+         s3=VhdlDocGen::getIndexWord(s1,0);
+         s1=VhdlDocGen::getIndexWord(s1,1);
        }
 
        outlineParser()->addCompInst(s.lower().data(),s1.lower().data(),s3.data(),outlineParser()->getLine());
@@ -914,7 +914,7 @@ void context_item() :  {}
 
 QCString decimal_literal() :  {Token *tok=0;}
 {
- tok=<DECIMAL_LITERAL> { return tok->image.c_str(); }
+ tok=<DECIMAL_LITERAL> { return QCString(tok->image); }
 }
 
 
@@ -944,8 +944,8 @@ QCString designator() : {QCString s;}
 
 QCString direction ():  {Token *tok=0;}
 {
-tok=<TO_T>  { return tok->image.c_str();}
-| tok=<DOWNTO_T> { return tok->image.c_str();}
+tok=<TO_T>  { return QCString(tok->image);}
+| tok=<DOWNTO_T> { return QCString(tok->image);}
 }
 
 void disconnection_specification() : {}
@@ -1002,8 +1002,8 @@ QCString element_declaration() :  {QCString rec_name,s1,s2;}
 QCString entity_aspect() :  {Token *tok=0;QCString s,s1;}
 {
 tok=<ENTITY_T> s=name() [ LOOKAHEAD(1)<LPAREN_T> s1=identifier() <RPAREN_T> {s+="("+s1+")";} ] { return s;}
-| tok=<CONFIGURATION_T> s=name() { return tok->image.c_str()+s;}
-| tok=<OPEN_T> { return tok->image.c_str(); }
+| tok=<CONFIGURATION_T> s=name() { return QCString(tok->image)+s;}
+| tok=<OPEN_T> { return QCString(tok->image); }
 }
 
 QCString entity_class() :  {}
@@ -1156,7 +1156,7 @@ QCString exit_statement() :  {QCString s,s1,s2;Token *t=0;Token *t1=0;}
   m_sharedState->lab.resize(0);
   if(t) s+=":";
   if(t1) s2.prepend(" when ");
-   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2.data(),s1.data());
+   FlowChart::addFlowChart(FlowChart::EXIT_NO,"exit",s2,s1);
 
   return s+s1+s2+";";
 }
@@ -1180,7 +1180,7 @@ QCString logop() : {}
 
 QCString extended_identifier ():  {Token *t;}
 {
- t=<EXTENDED_CHARACTER> { return t->image.c_str(); }
+ t=<EXTENDED_CHARACTER> { return QCString(t->image); }
 }
 
 QCString factor():  {QCString s,s1;}
@@ -1226,7 +1226,7 @@ QCString floating_type_definition() :  {QCString s;}
 QCString formal_designator() : {QCString s;Token *tok=0;}
 {
     s=name()  { return s; }
-    |tok=<INTEGER> { return tok->image.c_str();}
+    |tok=<INTEGER> { return QCString(tok->image);}
 }
 
 
@@ -1344,8 +1344,8 @@ void guarded_signal_specification() : {}
 
 QCString identifier() : {Token *tok=0;}
 {
-  tok=<EXTENDED_CHARACTER>{ return tok->image.c_str(); }
-  |tok=<BASIC_IDENTIFIER> { return tok->image.c_str(); }
+  tok=<EXTENDED_CHARACTER>{ return QCString(tok->image); }
+  |tok=<BASIC_IDENTIFIER> { return QCString(tok->image); }
 }
 
 QCString identifier_list() : {QCString str,str1;}
@@ -1359,25 +1359,25 @@ void if_statement() :  {QCString s,s1;}
     <IF_T> s=condition() <THEN_T>
     {
       s.prepend("if ");
-      FlowChart::addFlowChart(FlowChart::IF_NO,0,s);
+      FlowChart::addFlowChart(FlowChart::IF_NO,QCString(),s);
     }
   sequence_of_statement()
     (
      <ELSIF_T> s1=condition() <THEN_T>
      {
      s1.prepend("elsif ");
-     FlowChart::addFlowChart(FlowChart::ELSIF_NO,0,s1.data());
+     FlowChart::addFlowChart(FlowChart::ELSIF_NO,QCString(),s1);
      }
      sequence_of_statement()
     )*
     [LOOKAHEAD(1) <ELSE_T>
     {
-      FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
+      FlowChart::addFlowChart(FlowChart::ELSE_NO,QCString(),QCString());
     }
   sequence_of_statement() ] <END_T> <IF_T> [ identifier() ] <SEMI_T>
   {
     FlowChart::moveToPrevLevel();
-    FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
+    FlowChart::addFlowChart(FlowChart::ENDIF_NO,QCString(),QCString());
   }
 }
 
@@ -1389,11 +1389,9 @@ QCString incomplete_type_declaration() :  {QCString s;}
   }
 }
 
-QCString index_constraint() :  {QCString s="("; QCString s1,s2;}
+QCString index_constraint() :  {QCString s("("); QCString s1,s2;}
 {
-  //try{
   <LPAREN_T> s2=discrete_range(){s+=s2;}(LOOKAHEAD(1)<COMMA_T> s1=discrete_range(){s+=",";s+=s1;})*  <RPAREN_T> {return s+")";}
-//}catch(...){  outlineParser()->error_skipto(SEMI_T);hasError=false;return "";}
   }
 
 QCString index_specification() : {QCString s;}
@@ -1418,13 +1416,13 @@ QCString instantiation_unit() :  {QCString s,s1,s2;}
 QCString instantiation_list() : {QCString s;Token *tok=0;}
 {
   s=identifier_list() { return s;}
-| tok=<OTHER_T> {return tok->image.c_str();}
-| tok=<ALL_T> {return tok->image.c_str();}
+| tok=<OTHER_T> {return QCString(tok->image);}
+| tok=<ALL_T> {return QCString(tok->image);}
 }
 
 QCString integer() :  {Token *t;}
 {
-  t=<INTEGER> {return t->image.c_str();}
+  t=<INTEGER> {return QCString(t->image);}
 }
 
 QCString integer_type_definition() :  {QCString s;}
@@ -1468,7 +1466,7 @@ QCString interface_file_declaration() : {QCString s,s1;}
   <FILE_T> s=identifier_list() <COLON_T> s1=subtype_indication()
   {
     outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
-    return " file "+s+":"+s1;
+    return QCString(" file "+s+":"+s1);
   }
 }
 
@@ -1486,7 +1484,7 @@ QCString interface_variable_declaration() :  {Token *tok=0;Token *tok1=0;Token *
     s2=subtype_indication()  [ tok1=<BUS_T> ] [ tok2=<VARASSIGN_T> s4=expression() ]
     {
       if(tok)
-        s5=tok->image.c_str();
+        s5=QCString(tok->image);
 
       if(tok1)
         s3=tok1->image.data();
@@ -1520,14 +1518,14 @@ QCString iteration_scheme() :  {QCString s;}
 <WHILE_T> s=condition()
 {
    s.prepend("while ");
-   FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),m_sharedState->lab.data());
+   FlowChart::addFlowChart(FlowChart::WHILE_NO,QCString(),s,m_sharedState->lab);
    m_sharedState->lab="";
   return s;
 }
 | <FOR_T> s=parameter_specification()
 {
     QCString q=m_sharedState->lab+" for "+s;
-    FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),m_sharedState->lab.data());
+    FlowChart::addFlowChart(FlowChart::FOR_NO,QCString(),q,m_sharedState->lab);
     m_sharedState->lab="";
     return q;
 }
@@ -1588,7 +1586,7 @@ QCString loop_statement() :  {QCString s,s1,s2,s3;}
     [ s1=iteration_scheme()  ]
       {
        if(s1.isEmpty())
-        FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
+        FlowChart::addFlowChart(FlowChart::LOOP_NO,QCString(),"infinite");
        }
       <LOOP_T>
         s2=sequence_of_statement()
@@ -1597,7 +1595,7 @@ QCString loop_statement() :  {QCString s,s1,s2,s3;}
          QCString q = s+" loop "+s2+" end loop" +s3;
          QCString endLoop="end loop" + s3;
          FlowChart::moveToPrevLevel();
-         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
+         FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop,QCString());
         return q;
         }
 
@@ -1606,9 +1604,9 @@ QCString loop_statement() :  {QCString s,s1,s2,s3;}
 
 QCString miscellaneous_operator():{Token *t=0;}
 {
-  <DOUBLEMULT_T> {return "**";}
-  | <ABS_T>  {return "abs";}
-  | <NOT_T> {return "not";}
+  <DOUBLEMULT_T> { return "**"; }
+  | <ABS_T>  { return "abs"; }
+  | <NOT_T> { return "not"; }
 }
 
 QCString mode() :  {Token *tok=0;}
@@ -1622,10 +1620,10 @@ tok=<IN_T> { return "in"; }
 
 QCString multiplying_operation() : {Token *tok=0;}
 {
-tok=<MULT_T>      { return tok->image.c_str(); }
-| tok=<SLASH_T>  { return tok->image.c_str(); }
-| tok=<MOD_T>     { return tok->image.c_str(); }
-| tok=<REM_T>     { return tok->image.c_str(); }
+tok=<MULT_T>      { return QCString(tok->image); }
+| tok=<SLASH_T>  { return QCString(tok->image); }
+| tok=<MOD_T>     { return QCString(tok->image); }
+| tok=<REM_T>     { return QCString(tok->image); }
 }
 
 
@@ -1687,7 +1685,7 @@ QCString next_statement() :  {QCString s,s1,s2;Token *t=0;Token *t1=0;}
 [ t1=<WHEN_T> s2=condition() ] <SEMI_T>
 {
   if(t) s+=":";
-   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data());
+   FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2,s1);
     m_sharedState->lab.resize(0);
   if(t1) s2.prepend("when ");
   return s+s1+s2+";";
@@ -1719,7 +1717,7 @@ QCString object_class() :  {}
 
 QCString operator_symbol() :  {Token *tok=0;}
 {
-tok=<STRINGLITERAL> {return tok->image.c_str();}
+tok=<STRINGLITERAL> {return QCString(tok->image);}
 }
 
 void options() :  {}
@@ -1733,7 +1731,7 @@ void package_body() :  {QCString s;}
  {
                         m_sharedState->lastCompound=m_sharedState->current;
                         s.prepend("_");
-                        outlineParser()->addVhdlType(s,outlineParser()->getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
+                        outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
                       }
  package_body_declarative_part()
 
@@ -1782,7 +1780,7 @@ void package_declaration():  {QCString s;}
                           clone->bodyLine=outlineParser()->getLine(PACKAGE_T);
                           clone->protection=Package;
                           m_sharedState->current_root->moveToSubEntryAndKeep(clone);
-                          outlineParser()->addVhdlType(s,outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
+                          outlineParser()->addVhdlType(s.data(),outlineParser()->getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
                           }
     package_header()  
     package_declarative_part()
@@ -1887,7 +1885,7 @@ LOOKAHEAD(name())
 s=name() { return s;}
 |
 LOOKAHEAD(allocator())
-allocator() { return "";}
+allocator() { return QCString();}
 |
 s=aggregate() { return s; }
 }
@@ -1924,7 +1922,7 @@ QCString procedure_call_statement() :  {QCString s,s1;}
 
 QCString process_declarative_item() :  {QCString s;}
 {
-subprogram_declaration() { return "";}
+subprogram_declaration() { return QCString();}
 //| subprogram_body()
 | s=type_declaration() { return s;}
 | s=subtype_declaration() { return s;}
@@ -1962,8 +1960,8 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;Token *tok1=0;}
         s2=process_declarative_part()
              {
               if (s2.data())
-                FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
-                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+                FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2,QCString());
+                FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",QCString());
               }
         <BEGIN_T>
         process_statement_part()
@@ -1980,8 +1978,8 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;Token *tok1=0;}
           m_sharedState->current->endBodyLine=outlineParser()->getLine();
           m_sharedState->currP=0;
           if(tok)
-            s1=tok->image.data();
-          outlineParser()->createFunction(m_sharedState->currName,VhdlDocGen::PROCESS,s1.data());
+            s1=tok->image;
+          outlineParser()->createFunction(m_sharedState->currName.data(),VhdlDocGen::PROCESS,s1.data());
           outlineParser()->createFlow();
           m_sharedState->currName="";
           outlineParser()->newEntry();
@@ -2046,7 +2044,7 @@ QCString relation_operator() :  {}
  |<QG_T> { return "?>";}
  |<QL_T> { return "?<";}
  |<QEQU_T> { return "?=";}
- |<QNEQU_T> {return  "?/="; }
+ |<QNEQU_T> {return "?/="; }
 
 
 }
@@ -2132,22 +2130,22 @@ QCString sequence_of_statement() : {QCString s,s1;}
 QCString sequential_statement() :{QCString s;}
 {
     LOOKAHEAD( [ identifier() ":" ] target() "<=")
-    s=signal_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=signal_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
     |
     LOOKAHEAD(3)
-    s=assertion_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=assertion_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
     |
      LOOKAHEAD(3)
-    s=report_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=report_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
     |
     LOOKAHEAD(3)
-    s=wait_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=wait_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
     |
     LOOKAHEAD(  [ identifier() ":" ] target() ":=" )
-    s=variable_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=variable_assignment_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
     |
     LOOKAHEAD(3)
-    s=procedure_call_statement(){ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s; }
+    s=procedure_call_statement(){ FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s; }
     |
      LOOKAHEAD(3)
     if_statement(){return s;}
@@ -2165,9 +2163,9 @@ QCString sequential_statement() :{QCString s;}
     s=exit_statement(){return s;}
     |
     LOOKAHEAD(3)
-    s=return_statement(){FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;}
+    s=return_statement(){FlowChart::addFlowChart(FlowChart::RETURN_NO,s,QCString());return s;}
     |
-    s=null_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;}
+    s=null_statement(){FlowChart::addFlowChart(FlowChart::TEXT_NO,s,QCString());return s;}
 }
 
 QCString shift_expression() :  {QCString s,s1,s2;}
@@ -2194,10 +2192,10 @@ QCString signal_assignment_statement() : {QCString s,s1,s2,s3;}
 {
 
   LOOKAHEAD(conditional_signal_assignment_wave())
-  conditional_signal_assignment_wave(){ return ""; }
+  conditional_signal_assignment_wave(){ return QCString(); }
 |
   LOOKAHEAD(selected_signal_assignment_wave())
-  selected_signal_assignment_wave() { return ""; }
+  selected_signal_assignment_wave() { return QCString(); }
   |
   [LOOKAHEAD(2) s=identifier() <COLON_T> {s+=":";} ]
 s1=target() <LESSTHAN_T>
@@ -2263,7 +2261,7 @@ QCString slice_name() :  {QCString s,s1;}
 
 QCString string_literal() : {Token *tok=0;}
 {
-tok=<STRINGLITERAL> {return tok->image.c_str();}
+tok=<STRINGLITERAL> {return QCString(tok->image);}
 }
 
  void subprogram_body() : {QCString s;}
@@ -2275,9 +2273,9 @@ tok=<STRINGLITERAL> {return tok->image.c_str();}
    {
       if (s.data())
       {
-        FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,0);
+        FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,QCString());
       }
-      FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
+      FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",QCString());
     }
  // }catch(...){outlineParser()->error_skipto(BEGIN_T);}
 <BEGIN_T>
@@ -2307,9 +2305,9 @@ void subprogram_1() :  {}
 
 QCString subprogram_declarative_item() : {QCString s;}
 {
-subprogram_declaration(){ return "";}
+subprogram_declaration(){ return QCString();}
 |s=type_declaration(){ return s;}
- | subprogram_body(){ return "";}
+ | subprogram_body(){ return QCString();}
 | s=subtype_declaration(){ return s;}
 | s=constant_declaration(){ return s;}
 | s=variable_declaration(){ return s;}
@@ -2442,16 +2440,14 @@ s=full_type_declaration(){ return s;}
 
 QCString type_definition() :  {QCString s;}
 {
-//try{
 s=scalar_type_definition(){ return s;}
 | s=composite_type_definition(){ return s;}
 | s=access_type_definition(){ return s;}
 | s=file_type_definition(){ return s;}
 |
  LOOKAHEAD(2)
- protected_type_body()            { return ""; }
-| protected_type_declaration()     { return ""; }
-//}catch(...){outlineParser()->error_skipto(SEMI_T); return "";}
+ protected_type_body()            { return QCString(); }
+| protected_type_declaration()     { return QCString(); }
 }
 
 QCString type_mark() : {QCString s; }
@@ -2498,7 +2494,7 @@ QCString variable_assignment_statement() :  {QCString s,s1,s2;}
  s1=target() <VARASSIGN_T> s2=expression() <SEMI_T>
  {return s+s1+":="+s2+";";}
  |
- selected_variable_assignment() { return "";  }
+ selected_variable_assignment() { return QCString();  }
 }
 
 QCString variable_declaration() :  {Token *tok=0;Token *t1=0;QCString s,s1,s2;}
@@ -2567,7 +2563,7 @@ QCString protected_type_body() :{ }
           protected_type_body_declarative_part()
 
     //}catch(...){outlineParser()->error_skipto(END_T);}
-    <END_T><PROTECTED_T> <BODY_T>   [identifier()]  {return "";}
+    <END_T><PROTECTED_T> <BODY_T>   [identifier()]  {return QCString();}
 }
 
 void protected_type_body_declarative_item() :    { }
@@ -2603,7 +2599,7 @@ QCString protected_type_declaration() : {  }
         try{
           protected_type_declarative_part()
         }catch(...){outlineParser()->error_skipto(END_T);}
-       <END_T><PROTECTED_T> [ identifier() ] { return "";}
+       <END_T><PROTECTED_T> [ identifier() ] { return QCString();}
  }
 
 
@@ -2754,9 +2750,9 @@ QCString external_name(): {QCString s,s1,s2;}
 
 QCString sig_stat(): {Token *t;}
 {
-  t=<CONSTANT_T>      { return t->image.data(); }
-  | t=<SIGNAL_T>      { return t->image.data(); }
-  | t=<VARIABLE_T>   { return t->image.data(); }
+  t=<CONSTANT_T>      { return QCString(t->image); }
+  | t=<SIGNAL_T>      { return QCString(t->image); }
+  | t=<VARIABLE_T>   { return QCString(t->image); }
 
 }
 
@@ -2929,7 +2925,7 @@ QCString ifunc():{QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;}
      if (a>b) b=a;
      outlineParser()->addVhdlType(m_sharedState->current->name.data(),b,Entry::VARIABLE_SEC,VhdlDocGen::GENERIC,ss.data(),0,Public);
    }
-   m_sharedState->currP=0;return "";
+   m_sharedState->currP=0;return QCString();
  }
 }