summaryrefslogtreecommitdiffstats
path: root/vhdlparser/vhdlparser.jj
diff options
context:
space:
mode:
Diffstat (limited to 'vhdlparser/vhdlparser.jj')
-rwxr-xr-xvhdlparser/vhdlparser.jj186
1 files changed, 91 insertions, 95 deletions
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();
}
}
generated by cgit v0.12 at 2024-06-26 04:19:01 (GMT)