[Cpptool-cvs] rfta/src/rftaparser UnparsedDeclarationMutatorTest.cpp,1.2,1.3

[<net...@us...>]

Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv29359/src/rftaparser

Modified Files:
	UnparsedDeclarationMutatorTest.cpp 
Log Message:
-- removed old code

Index: UnparsedDeclarationMutatorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/UnparsedDeclarationMutatorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnparsedDeclarationMutatorTest.cpp	28 Apr 2003 02:45:42 -0000	1.2
--- UnparsedDeclarationMutatorTest.cpp	28 Apr 2003 02:52:50 -0000	1.3
***************
*** 53,123 ****
     }
     
-    static void checkDeclaration( const std::string& source,
-                                  const SourceASTNodePtr& sourceNode,                                 
-                                  const std::vector<int> specifierStart,
-                                  const std::vector<int> specifierLen,
-                                  const std::vector<int> declStart,
-                                  const std::vector<int> declLen,
-                                  const CppUnit::SourceLine &sourceLine )
-    {      
-       ASTNodePtr node = sourceNode->getChildAt(0);
-       
-       int specifierCount = __min(specifierStart.size(), specifierLen.size());
-       int declaratorCount = __min(declStart.size()    , declLen.size());
- 
-       // check AST:
-       checkASTNodeHas          (     node,
-                                      ASTNodeTypes::declaration,
-                                      0,
-                                      source.length(),
-                                      sourceLine,
-                                      "ASTNodeTypes::declaration" 
-                                );
- 
-       if (specifierCount>0)
-          checkASTNodePropertyHas(    node,
-                                      ASTNodeProperties::declarationSpecifiersProperty,
-                                      ASTNodeTypes::declarationSpecifierList,
-                                      specifierStart[0],
-                                      specifierLen[specifierCount-1]+specifierStart[specifierCount-1]-specifierStart[0],
-                                      sourceLine,
-                                      "ASTNodeProperties::declarationSpecifiersProperty"
-                                );
- 
-       ASTNodePtr specifierList = node->getProperty(ASTNodeProperties::declarationSpecifiersProperty);
-    
-       // check number of specifiers parsed:
-       CppUnit::assertEquals( specifierList->getChildCount(), specifierCount, sourceLine, 
-                                 boost::io::str(boost::format("Bad number of specifiers:\n Actual %1%\n Expected %2%.") 
-                                 % specifierList->getChildCount() 
-                                 % specifierCount ) );
-       int idx;
- 
-       for (idx=0; idx<specifierCount; idx++)
-       {
-          
-          ASTNodePtr specifierNode = specifierList->getChildAt(idx);
-       
-          CppUnit::assertEquals( specifierStart[idx], specifierNode->getStartIndex(), sourceLine, 
-                                 boost::io::str(boost::format("Specifier %1%: bad node start index.") % idx) );
-          CppUnit::assertEquals( specifierLen[idx]  , specifierNode->getLength(), sourceLine, 
-                                 boost::io::str(boost::format("Specifier %1%: bad node length.") % idx) );
-       }
-       // check declarators
-       CppUnit::assertEquals( node->getChildCount() , declaratorCount , sourceLine,
-                                  "Wrong number of declarators." );
- 
-       for (idx=0; idx<declaratorCount; idx++)
-       {
-          ASTNodePtr declNode = node->getChildAt(idx);
-          
-          CppUnit::assertEquals( declStart[idx], declNode->getStartIndex(), sourceLine, 
-                                 boost::io::str(boost::format("Declarator %1%: bad node start index.") % idx) );
-          CppUnit::assertEquals( declLen[idx]  , declNode->getLength(), sourceLine, 
-                                 boost::io::str(boost::format("Declarator %1%: bad node length.") % idx) );
-       }
-       
-    }
-    
     static void checkDeclaration( const Testing::KeyedString& source,
                                   const SourceASTNodePtr& sourceNode,                                 
--- 53,56 ----
***************
*** 192,200 ****
  #define RFTA_ASSERT_DECLARATION_MUTATOR_PASS( source ) \
     Refactoring::Testing::checkDeclarationMutatorPass( source, CPPUNIT_SOURCELINE() )
- 
- #define RFTA_ASSERT_DECLARATION_OLD( source,sourceAST,specStart,specLen,declaratorStart,declaratorLen )\
-    Refactoring::Testing::checkDeclaration(                         \
-                       source, sourceAST, specStart, specLen,       \
-                       declaratorStart, declaratorLen, CPPUNIT_SOURCELINE() )
  
  #define RFTA_ASSERT_DECLARATION( source,sourceAST )\
--- 125,128 ----