Update of /cvsroot/cpptool/rfta/src/rftaparser In directory sc8-pr-cvs1:/tmp/cvs-serv22456/src/rftaparser Modified Files: ForStatementParserTest.cpp ParserTesting.h UnparsedDeclarationListMutatorTest.cpp UnparsedDeclarationMutatorTest.cpp Log Message: * changed RFTA_ASSERT_NODE_HAS to support variable argument count and source range. Index: ForStatementParserTest.cpp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/ForStatementParserTest.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ForStatementParserTest.cpp 25 Apr 2003 08:19:31 -0000 1.3 --- ForStatementParserTest.cpp 3 May 2003 20:40:06 -0000 1.4 *************** *** 144,148 **** ASTNodeTypes::forStatement, startIndex, ! endIndex-startIndex ); RFTA_ASSERT_NODE_PROPERTY_HAS( forAST, --- 144,149 ---- ASTNodeTypes::forStatement, startIndex, ! endIndex-startIndex, ! "for-statement node" ); RFTA_ASSERT_NODE_PROPERTY_HAS( forAST, Index: ParserTesting.h =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/ParserTesting.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ParserTesting.h 1 May 2003 18:53:20 -0000 1.5 --- ParserTesting.h 3 May 2003 20:40:06 -0000 1.6 *************** *** 17,41 **** }; ! struct NodeTypeAsserter : public Asserter<NodeTypeAsserter> { ! void operator()( const ASTNodePtr &node, ! const ASTNodeType &expectedType, ! const std::string &whichNode = "node" ) { ! failIf( !node, "invalid node: " + whichNode ); checkEquals( expectedType.getName(), node->getType().getName(), whichNode + ": bad node type." ); } - }; ! struct NodeAsserter : public Asserter<NodeAsserter> ! { ! void operator()( const ASTNodePtr &node, ! const ASTNodeType &type, ! int index, ! int length, ! const std::string &whichNode = "node" ) { ! NodeTypeAsserter().chain( *this )( node, type, whichNode ); checkEquals( type.getName(), node->getType().getName(), --- 17,38 ---- }; ! struct NodeAsserter : public Asserter<NodeAsserter> { ! void checkNodeType( const ASTNodePtr &node, ! const ASTNodeType &expectedType, ! const std::string &whichNode = "node" ) { ! failIf( !node, "invalid node (NULL): " + whichNode ); checkEquals( expectedType.getName(), node->getType().getName(), whichNode + ": bad node type." ); } ! void checkNode( const ASTNodePtr &node, ! const ASTNodeType &type, ! int index, ! int length, ! const std::string &whichNode = "node" ) { ! checkNodeType( node, type, whichNode ); checkEquals( type.getName(), node->getType().getName(), *************** *** 46,59 **** whichNode + ": bad node length." ); } - }; ! struct NodePropertyAsserter : public Asserter<NodePropertyAsserter> ! { ! void operator()( const ASTNodePtr &node, ! const ASTNodeProperty &property, ! const ASTNodeType &type, ! int index, ! int length, ! const std::string &whichNode ) { std::string what = whichNode + ", property=" + property.getName(); --- 43,63 ---- whichNode + ": bad node length." ); } ! ! void checkNode( const ASTNodePtr &node, ! const ASTNodeType &type, ! const SourceRange &range, ! const std::string &whichNode = "node" ) ! { ! checkNode( node, type, range.getStartIndex(), range.getLength(), whichNode ); ! } ! ! ! void checkNodeProperty( const ASTNodePtr &node, ! const ASTNodeProperty &property, ! const ASTNodeType &type, ! int index, ! int length, ! const std::string &whichNode = "node" ) { std::string what = whichNode + ", property=" + property.getName(); *************** *** 61,65 **** fail( what + ": does not exist" ); ! NodeAsserter().chain(*this)( node->getProperty( property ), type, index, length, what ); } }; --- 65,79 ---- fail( what + ": does not exist" ); ! checkNode( node->getProperty( property ), type, index, length, what ); ! } ! ! ! void checkNodeProperty( const ASTNodePtr &node, ! const ASTNodeProperty &property, ! const ASTNodeType &type, ! const SourceRange &range, ! const std::string &whichNode = "node" ) ! { ! checkNodeProperty( node, property, type, range.getStartIndex(), range.getLength(), whichNode ); } }; *************** *** 258,271 **** } ! #define RFTA_ASSERT_NODE_TYPE( node, expectedType ) \ ! RFTA_CUSTOM_ASSERT( ::Refactoring::Testing::NodeTypeAsserter )( node, expectedType, #node ) ! #define RFTA_ASSERT_NODE_HAS( node, type, index, length ) \ ! RFTA_CUSTOM_ASSERT( Refactoring::Testing::NodeAsserter )( node, type, index, length, #node ) ! #define RFTA_ASSERT_NODE_PROPERTY_HAS( node, property, type, index, length ) \ ! RFTA_CUSTOM_ASSERT( Refactoring::Testing::NodePropertyAsserter )( \ ! node, property, type, index, length, \ ! #node ) #define RFTA_ASSERT_PARSER_FAIL( ParserType, source ) \ --- 272,283 ---- } ! #define RFTA_ASSERT_NODE_TYPE \ ! RFTA_CUSTOM_ASSERT( ::Refactoring::Testing::NodeAsserter ).checkNodeType ! #define RFTA_ASSERT_NODE_HAS \ ! RFTA_CUSTOM_ASSERT( Refactoring::Testing::NodeAsserter ).checkNode ! #define RFTA_ASSERT_NODE_PROPERTY_HAS \ ! RFTA_CUSTOM_ASSERT( Refactoring::Testing::NodeAsserter ).checkNodeProperty #define RFTA_ASSERT_PARSER_FAIL( ParserType, source ) \ Index: UnparsedDeclarationListMutatorTest.cpp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/UnparsedDeclarationListMutatorTest.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UnparsedDeclarationListMutatorTest.cpp 1 May 2003 21:13:29 -0000 1.4 --- UnparsedDeclarationListMutatorTest.cpp 3 May 2003 20:40:06 -0000 1.5 *************** *** 145,149 **** // check parsing results: // check post condition: ! RFTA_ASSERT_NODE_TYPE( classBody, ASTNodeTypes::declarationList ); RFTA_ASSERT_EQUAL( 3, classBody->getChildCount() ); RFTA_ASSERT_NODE_HAS( classBody->getChildAt(0), --- 145,149 ---- // check parsing results: // check post condition: ! RFTA_ASSERT_NODE_TYPE( classBody, ASTNodeTypes::declarationList, "class" ); RFTA_ASSERT_EQUAL( 3, classBody->getChildCount() ); RFTA_ASSERT_NODE_HAS( classBody->getChildAt(0), Index: UnparsedDeclarationMutatorTest.cpp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/UnparsedDeclarationMutatorTest.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** UnparsedDeclarationMutatorTest.cpp 3 May 2003 18:06:37 -0000 1.10 --- UnparsedDeclarationMutatorTest.cpp 3 May 2003 20:40:06 -0000 1.11 *************** *** 179,188 **** ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(1), ASTNodeTypes::simpleTypeSpecifier); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(2), ASTNodeTypes::simpleTypeSpecifier); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator ); } --- 179,188 ---- ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(1), ASTNodeTypes::simpleTypeSpecifier, "specifier-1"); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(2), ASTNodeTypes::simpleTypeSpecifier, "specifier-2"); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 202,209 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator ); } --- 202,209 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 227,231 **** ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ASTNodePtr specifier = specifierList->getChildAt(1); ! RFTA_ASSERT_NODE_TYPE( specifier, ASTNodeTypes::classSpecifier ); // CHECK CLASS BODY PROPERTY !! --- 227,231 ---- ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ASTNodePtr specifier = specifierList->getChildAt(1); ! RFTA_ASSERT_NODE_TYPE( specifier, ASTNodeTypes::classSpecifier, "class-specifier" ); // CHECK CLASS BODY PROPERTY !! *************** *** 238,242 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator ); } --- 238,242 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 255,259 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::classSpecifier ); } --- 255,259 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::classSpecifier, "class-specifier" ); } *************** *** 266,270 **** ASTNodePtr classNode = sourceNode->getChildAt(0); ! RFTA_ASSERT_NODE_TYPE( classNode, ASTNodeTypes::declaration ); } --- 266,270 ---- ASTNodePtr classNode = sourceNode->getChildAt(0); ! RFTA_ASSERT_NODE_TYPE( classNode, ASTNodeTypes::declaration, "class" ); } *************** *** 284,288 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::enumSpecifier ); } --- 284,288 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::enumSpecifier, "enum-specifier" ); } *************** *** 303,307 **** ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ASTNodePtr enumSpecifier = specifierList->getChildAt(0); - RFTA_ASSERT_NODE_TYPE( enumSpecifier, ASTNodeTypes::enumSpecifier ); RFTA_ASSERT_NODE_HAS( enumSpecifier, ASTNodeTypes::enumSpecifier, source.getKeyedIndex(SPECIFIER,0), --- 303,306 ---- *************** *** 325,332 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 324,331 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 346,353 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 345,352 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 368,375 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 367,374 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 390,397 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 389,396 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 412,419 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 411,418 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 447,454 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 446,453 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 468,475 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::elaboratedTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 467,474 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::elaboratedTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 489,493 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::elaboratedTypeSpecifier ); } --- 488,492 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::elaboratedTypeSpecifier, "specifier-0" ); } *************** *** 507,514 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::classSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 506,513 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::classSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 528,535 **** // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 527,534 ---- // check specifier types: ASTNodePtr specifierList = node->getProperty( ASTNodeProperties::declarationSpecifiersProperty ); ! RFTA_ASSERT_NODE_TYPE( specifierList->getChildAt(0), ASTNodeTypes::simpleTypeSpecifier, "specifier-0" ); // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 547,551 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 546,550 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 564,568 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 563,567 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 581,585 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 580,584 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 598,602 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 597,601 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator" ); } *************** *** 616,620 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 615,619 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 633,637 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 632,636 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 651,655 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 650,654 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 670,674 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 669,673 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 688,692 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 687,691 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 705,709 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 704,708 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 723,727 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 722,726 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 741,745 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 740,744 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 761,765 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 760,764 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 780,784 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 779,783 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 798,802 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 797,801 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } *************** *** 816,820 **** // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator); } --- 815,819 ---- // check declarator types: ! RFTA_ASSERT_NODE_TYPE( node->getChildAt(0), ASTNodeTypes::unparsedDeclarator, "declarator"); } |