[Cpptool-cvs] rfta/src/rfta CodeModelGeneratorTest.cpp,1.4,1.5 CodeWriterInsertTest.cpp,1.7,1.8 CodeWriterTest.cpp,1.32,1.33 CodeWriterTestBase.cpp,1.5,1.6

[<bl...@us...>]

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

Modified Files:
	CodeModelGeneratorTest.cpp CodeWriterInsertTest.cpp 
	CodeWriterTest.cpp CodeWriterTestBase.cpp 
Log Message:
* declarator are stored using smart pointer in declarator expression (more robust)

Index: CodeModelGeneratorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModelGeneratorTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CodeModelGeneratorTest.cpp	24 Mar 2003 07:57:51 -0000	1.4
--- CodeModelGeneratorTest.cpp	6 Apr 2003 15:11:23 -0000	1.5
***************
*** 54,65 ****
     RFTA_ASSERT_EQUAL( 1, declExpression->getDeclaratorCount() );
  
!    const CodeModel::Declarator &declarator = declExpression->getDeclaratorAt(0);
!    RFTA_ASSERT_EQUAL( "", declarator.getType() );
!    RFTA_ASSERT_EQUAL( "", declarator.getTypeSuffix() );
!    RFTA_ASSERT_EQUAL( "x", declarator.getName() );
!    CPPUNIT_ASSERT( declarator.hasInitializer() );
  
     CodeModel::AssignInitializerExpression &initializer = 
!       dynamic_cast<CodeModel::AssignInitializerExpression &>( *declarator.getInitializer() );
     RFTA_ASSERT_EQUAL( "3", initializer.getValue()->getSourceText() );
  }
--- 54,65 ----
     RFTA_ASSERT_EQUAL( 1, declExpression->getDeclaratorCount() );
  
!    CodeModel::DeclaratorPtr declarator = declExpression->getDeclaratorAt(0);
!    RFTA_ASSERT_EQUAL( "", declarator->getType() );
!    RFTA_ASSERT_EQUAL( "", declarator->getTypeSuffix() );
!    RFTA_ASSERT_EQUAL( "x", declarator->getName() );
!    CPPUNIT_ASSERT( declarator->hasInitializer() );
  
     CodeModel::AssignInitializerExpression &initializer = 
!       dynamic_cast<CodeModel::AssignInitializerExpression &>( *(declarator->getInitializer()) );
     RFTA_ASSERT_EQUAL( "3", initializer.getValue()->getSourceText() );
  }

Index: CodeWriterInsertTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterInsertTest.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CodeWriterInsertTest.cpp	24 Mar 2003 07:57:51 -0000	1.7
--- CodeWriterInsertTest.cpp	6 Apr 2003 15:11:23 -0000	1.8
***************
*** 282,286 ****
     CodeModel::DeclaratorExpressionPtr declarators( 
        new CodeModel::DeclaratorExpression( makeTypePart( "int " ) ) );
!    CodeModel::Declarator declarator( "", "var", "[3]" );
     declarators->appendDeclarator( declarator );
     CodeModel::StatementPtr declarationStatement( new CodeModel::DeclarationStatement( declarators ) );
--- 282,286 ----
     CodeModel::DeclaratorExpressionPtr declarators( 
        new CodeModel::DeclaratorExpression( makeTypePart( "int " ) ) );
!    CodeModel::DeclaratorPtr declarator( new CodeModel::Declarator( "", "var", "[3]" ) );
     declarators->appendDeclarator( declarator );
     CodeModel::StatementPtr declarationStatement( new CodeModel::DeclarationStatement( declarators ) );

Index: CodeWriterTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CodeWriterTest.cpp	18 Mar 2003 22:37:48 -0000	1.32
--- CodeWriterTest.cpp	6 Apr 2003 15:11:23 -0000	1.33
***************
*** 127,134 ****
     CodeModel::DeclaratorExpression &declExpression = *declStatement.getDeclaration();
     RFTA_ASSERT_EQUAL( 1, declExpression.getDeclaratorCount() );
!    const CodeModel::Declarator &xDecl = declExpression.getDeclaratorAt(0);
!    CPPUNIT_ASSERT( xDecl.hasInitializer() );
     CodeModel::AssignInitializerExpression &xValueInitializer = 
!       dynamic_cast<CodeModel::AssignInitializerExpression &>( *xDecl.getInitializer() );
     CodeModel::ExpressionPtr xValue = xValueInitializer.getValue();
  
--- 127,134 ----
     CodeModel::DeclaratorExpression &declExpression = *declStatement.getDeclaration();
     RFTA_ASSERT_EQUAL( 1, declExpression.getDeclaratorCount() );
!    CodeModel::DeclaratorPtr xDecl = declExpression.getDeclaratorAt(0);
!    CPPUNIT_ASSERT( xDecl->hasInitializer() );
     CodeModel::AssignInitializerExpression &xValueInitializer = 
!       dynamic_cast<CodeModel::AssignInitializerExpression &>( *(xDecl->getInitializer()) );
     CodeModel::ExpressionPtr xValue = xValueInitializer.getValue();
  

Index: CodeWriterTestBase.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTestBase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CodeWriterTestBase.cpp	5 Apr 2003 18:29:01 -0000	1.5
--- CodeWriterTestBase.cpp	6 Apr 2003 15:11:23 -0000	1.6
***************
*** 16,20 ****
  {
     SourceBasedTestBase::setUp();
!    compound_ = 0;
     document_.reset();
     writer_.reset();
--- 16,20 ----
  {
     SourceBasedTestBase::setUp();
!    compound_.reset();
     document_.reset();
     writer_.reset();
***************
*** 27,31 ****
     writer_.reset();
     document_.reset();
!    compound_ = 0;
     SourceBasedTestBase::tearDown();
  }
--- 27,31 ----
     writer_.reset();
     document_.reset();
!    compound_.reset();
     SourceBasedTestBase::tearDown();
  }