diff options
Diffstat (limited to 'languages/ada')
-rw-r--r-- | languages/ada/AdaParser.cpp | 22 | ||||
-rw-r--r-- | languages/ada/AdaParser.hpp | 4 | ||||
-rw-r--r-- | languages/ada/AdaStoreWalker.cpp | 8 | ||||
-rw-r--r-- | languages/ada/AdaStoreWalker.hpp | 2 | ||||
-rw-r--r-- | languages/ada/AdaTreeParserSuper.cpp | 8 | ||||
-rw-r--r-- | languages/ada/AdaTreeParserSuper.hpp | 2 | ||||
-rw-r--r-- | languages/ada/ada.g | 12 | ||||
-rw-r--r-- | languages/ada/ada.store.g | 2 | ||||
-rw-r--r-- | languages/ada/ada.tree.g | 6 | ||||
-rw-r--r-- | languages/ada/addclassdlg.ui | 4 | ||||
-rw-r--r-- | languages/ada/configproblemreporter.ui | 4 |
11 files changed, 37 insertions, 37 deletions
diff --git a/languages/ada/AdaParser.cpp b/languages/ada/AdaParser.cpp index 3656446e..bea6de16 100644 --- a/languages/ada/AdaParser.cpp +++ b/languages/ada/AdaParser.cpp @@ -1954,10 +1954,10 @@ void AdaParser::value_s() { returnAST = value_s_AST; } -void AdaParser::tqparenth_values() { +void AdaParser::parenth_values() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST tqparenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST parenth_values_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); match(LPAREN); value(); @@ -1981,8 +1981,8 @@ void AdaParser::tqparenth_values() { _loop46:; } // ( ... )* match(RPAREN); - tqparenth_values_AST = RefAdaAST(currentAST.root); - returnAST = tqparenth_values_AST; + parenth_values_AST = RefAdaAST(currentAST.root); + returnAST = parenth_values_AST; } void AdaParser::value() { @@ -2869,10 +2869,10 @@ RefAdaAST AdaParser::is_operator() { return d; } -void AdaParser::tqparenthesized_primary() { +void AdaParser::parenthesized_primary() { returnAST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; - RefAdaAST tqparenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); + RefAdaAST parenthesized_primary_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); ANTLR_USE_NAMESPACE(antlr)RefToken pp = ANTLR_USE_NAMESPACE(antlr)nullToken; RefAdaAST pp_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); @@ -2913,8 +2913,8 @@ void AdaParser::tqparenthesized_primary() { Set(pp_AST, PARENTHESIZED_PRIMARY); #line 2915 "AdaParser.cpp" } - tqparenthesized_primary_AST = RefAdaAST(currentAST.root); - returnAST = tqparenthesized_primary_AST; + parenthesized_primary_AST = RefAdaAST(currentAST.root); + returnAST = parenthesized_primary_AST; } void AdaParser::extension_opt() { @@ -5643,7 +5643,7 @@ void AdaParser::enumeration_aggregate() { ANTLR_USE_NAMESPACE(antlr)ASTPair currentAST; RefAdaAST enumeration_aggregate_AST = RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST); - tqparenth_values(); + parenth_values(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -11401,7 +11401,7 @@ void AdaParser::primary() { } case LPAREN: { - tqparenthesized_primary(); + parenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } @@ -11623,7 +11623,7 @@ void AdaParser::name_or_qualified() { switch ( LA(1)) { case LPAREN: { - tqparenthesized_primary(); + parenthesized_primary(); if (inputState->guessing==0) { astFactory->addASTChild(currentAST, ANTLR_USE_NAMESPACE(antlr)RefAST(returnAST)); } diff --git a/languages/ada/AdaParser.hpp b/languages/ada/AdaParser.hpp index cf9fec9b..0074c820 100644 --- a/languages/ada/AdaParser.hpp +++ b/languages/ada/AdaParser.hpp @@ -97,7 +97,7 @@ public: public: void function_tail(); public: void generic_inst(); public: void value_s(); - public: void tqparenth_values(); + public: void parenth_values(); public: void value(); public: void ranged_expr_s(); public: void ranged_expr(); @@ -115,7 +115,7 @@ public: public: void name(); public: RefAdaAST definable_operator_symbol(); public: RefAdaAST is_operator(); - public: void tqparenthesized_primary(); + public: void parenthesized_primary(); public: void extension_opt(); public: void separate_or_abstract( RefAdaAST t diff --git a/languages/ada/AdaStoreWalker.cpp b/languages/ada/AdaStoreWalker.cpp index 1561277f..a15692b6 100644 --- a/languages/ada/AdaStoreWalker.cpp +++ b/languages/ada/AdaStoreWalker.cpp @@ -3223,8 +3223,8 @@ void AdaStoreWalker::name(RefAdaAST _t) { _retTree = _t; } -void AdaStoreWalker::tqparenthesized_primary(RefAdaAST _t) { - RefAdaAST tqparenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; +void AdaStoreWalker::parenthesized_primary(RefAdaAST _t) { + RefAdaAST parenthesized_primary_AST_in = (_t == RefAdaAST(ASTNULL)) ? RefAdaAST(ANTLR_USE_NAMESPACE(antlr)nullAST) : _t; try { // for error handling RefAdaAST __t129 = _t; @@ -8809,7 +8809,7 @@ void AdaStoreWalker::primary(RefAdaAST _t) { } case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } @@ -8960,7 +8960,7 @@ void AdaStoreWalker::name_or_qualified(RefAdaAST _t) { switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } diff --git a/languages/ada/AdaStoreWalker.hpp b/languages/ada/AdaStoreWalker.hpp index bf661ea2..c18f5dcd 100644 --- a/languages/ada/AdaStoreWalker.hpp +++ b/languages/ada/AdaStoreWalker.hpp @@ -185,7 +185,7 @@ public: public: void defining_identifier_list(RefAdaAST _t); public: void init_opt(RefAdaAST _t); public: void name(RefAdaAST _t); - public: void tqparenthesized_primary(RefAdaAST _t); + public: void parenthesized_primary(RefAdaAST _t); public: void extension_opt(RefAdaAST _t); public: void task_type_or_single_decl(RefAdaAST _t); public: void prot_type_or_single_decl(RefAdaAST _t); diff --git a/languages/ada/AdaTreeParserSuper.cpp b/languages/ada/AdaTreeParserSuper.cpp index f6c122b5..76722b3e 100644 --- a/languages/ada/AdaTreeParserSuper.cpp +++ b/languages/ada/AdaTreeParserSuper.cpp @@ -2404,8 +2404,8 @@ void AdaTreeParserSuper::definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)Ref _retTree = _t; } -void AdaTreeParserSuper::tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { - ANTLR_USE_NAMESPACE(antlr)RefAST tqparenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; +void AdaTreeParserSuper::parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { + ANTLR_USE_NAMESPACE(antlr)RefAST parenthesized_primary_AST_in = (_t == ANTLR_USE_NAMESPACE(antlr)RefAST(ASTNULL)) ? ANTLR_USE_NAMESPACE(antlr)nullAST : _t; try { // for error handling ANTLR_USE_NAMESPACE(antlr)RefAST __t101 = _t; @@ -8397,7 +8397,7 @@ void AdaTreeParserSuper::primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t) { } case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } @@ -8548,7 +8548,7 @@ void AdaTreeParserSuper::name_or_qualified(ANTLR_USE_NAMESPACE(antlr)RefAST _t) switch ( _t->getType()) { case PARENTHESIZED_PRIMARY: { - tqparenthesized_primary(_t); + parenthesized_primary(_t); _t = _retTree; break; } diff --git a/languages/ada/AdaTreeParserSuper.hpp b/languages/ada/AdaTreeParserSuper.hpp index 01833993..a4d164f0 100644 --- a/languages/ada/AdaTreeParserSuper.hpp +++ b/languages/ada/AdaTreeParserSuper.hpp @@ -67,7 +67,7 @@ public: public: void init_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void name(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void definable_operator_symbol(ANTLR_USE_NAMESPACE(antlr)RefAST _t); - public: void tqparenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); + public: void parenthesized_primary(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void extension_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void spec_decl_part(ANTLR_USE_NAMESPACE(antlr)RefAST _t); public: void basic_declarative_items_opt(ANTLR_USE_NAMESPACE(antlr)RefAST _t); diff --git a/languages/ada/ada.g b/languages/ada/ada.g index 876255f5..8c073e23 100644 --- a/languages/ada/ada.g +++ b/languages/ada/ada.g @@ -179,7 +179,7 @@ generic_inst : NEW! compound_name ( LPAREN! value_s RPAREN! )? { pop_def_id(); } ; -tqparenth_values : LPAREN! value ( COMMA! value )* RPAREN! +parenth_values : LPAREN! value ( COMMA! value )* RPAREN! ; value : ( OTHERS^ RIGHT_SHAFT! expression @@ -287,7 +287,7 @@ definable_operator_symbol returns [RefAdaAST d] op:CHAR_STRING { #op->setType(OPERATOR_SYMBOL); d=#op; } ; -tqparenthesized_primary : pp:LPAREN^ +parenthesized_primary : pp:LPAREN^ ( NuLL RECORD! | value_s extension_opt ) @@ -851,7 +851,7 @@ abstract_tagged_limited_opt local_enum_name : IDENTIFIER // to be refined: do a symbol table lookup ; -enumeration_aggregate : tqparenth_values +enumeration_aggregate : parenth_values ; aliased_constant_opt : ( ALIASED )? ( CONSTANT )? @@ -1267,7 +1267,7 @@ accept_stmt : a:ACCEPT^ def_id[false] entry_index_opt formal_part_opt ; entry_index_opt : ( (LPAREN expression RPAREN) => LPAREN! expression RPAREN! - // Looks alot like tqparenthesized_expr_opt, but it's not. + // Looks alot like parenthesized_expr_opt, but it's not. // We need the syn pred for the usage context in accept_stmt. // The formal_part_opt that follows the entry_index_opt there // creates ambiguity (due to the opening LPAREN.) @@ -1463,7 +1463,7 @@ factor : ( NOT^ primary ; primary : ( name_or_qualified - | tqparenthesized_primary + | parenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -1485,7 +1485,7 @@ name_or_qualified { RefAdaAST dummy; } ) | p:LPAREN^ value_s RPAREN! { Set(#p, INDEXED_COMPONENT); } - | TIC^ ( tqparenthesized_primary | attribute_id ) + | TIC^ ( parenthesized_primary | attribute_id ) )* ; diff --git a/languages/ada/ada.store.g b/languages/ada/ada.store.g index a9a6fbde..dbca7312 100644 --- a/languages/ada/ada.store.g +++ b/languages/ada/ada.store.g @@ -582,7 +582,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( tqparenthesized_primary + ( parenthesized_primary | attribute_id ) ) diff --git a/languages/ada/ada.tree.g b/languages/ada/ada.tree.g index 6f343f97..df167dcd 100644 --- a/languages/ada/ada.tree.g +++ b/languages/ada/ada.tree.g @@ -189,7 +189,7 @@ name : IDENTIFIER definable_operator_symbol : OPERATOR_SYMBOL ; -tqparenthesized_primary +parenthesized_primary : #(PARENTHESIZED_PRIMARY ( NuLL | value_s extension_opt ) ) ; @@ -901,7 +901,7 @@ factor : #(NOT primary) primary : ( name_or_qualified - | tqparenthesized_primary + | parenthesized_primary | allocator | NuLL | NUMERIC_LIT @@ -926,7 +926,7 @@ name_or_qualified ) | #(INDEXED_COMPONENT name_or_qualified value_s) | #(TIC name_or_qualified - ( tqparenthesized_primary + ( parenthesized_primary | attribute_id ) ) diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 80f466be..046b06ab 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -429,6 +429,6 @@ <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index 86bb221d..32ca9e54 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -84,6 +84,6 @@ <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> |