[Cpptool-cvs] rfta/src/rfta CodeRewriter.cpp,1.15,1.16 CodeWriterTest.cpp,1.16,1.17 CodeWriterTest.h,1.13,1.14

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

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

Modified Files:
	CodeRewriter.cpp CodeWriterTest.cpp CodeWriterTest.h 
Log Message:
* added support for inserting expression statement.

Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CodeRewriter.cpp	16 Mar 2003 06:59:06 -0000	1.15
--- CodeRewriter.cpp	16 Mar 2003 07:14:31 -0000	1.16
***************
*** 227,230 ****
--- 227,233 ----
  CodeRewriter::visit( ExpressionStatement &statement )
  {
+    beginInsertNewStatement();
+    statement.getExpression()->accept( *this );
+    endInsertNewStatement();
  }
  

Index: CodeWriterTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CodeWriterTest.cpp	16 Mar 2003 06:59:06 -0000	1.16
--- CodeWriterTest.cpp	16 Mar 2003 07:14:31 -0000	1.17
***************
*** 512,514 ****
--- 512,536 ----
  
  
+ void 
+ CodeWriterTest::testInsertExpressionStatement()
+ {
+    source_ = "{\n"
+              "}";
+    
+    generateCompound();
+ 
+    RFTA_ASSERT_EQUAL( 0, compound_->getStatementCount() );
+ 
+    CodeModel::StatementPtr expressionStatement( 
+       new CodeModel::ExpressionStatement( makeExpression( "call( 1234 )" ) ) );
+    compound_->appendStatement( expressionStatement );
+ 
+    rewriteSource();
+ 
+    std::string expectedSource = "{\n"
+                                 "  call( 1234 );\n"
+                                 "}";
+    RFTA_ASSERT_EQUAL( expectedSource, document_->getAllText() );
+ }
+ 
  } // namespace Refactoring

Index: CodeWriterTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTest.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CodeWriterTest.h	16 Mar 2003 06:59:07 -0000	1.13
--- CodeWriterTest.h	16 Mar 2003 07:14:31 -0000	1.14
***************
*** 38,41 ****
--- 38,42 ----
     CPPUNIT_TEST( testInsertIfThenStatement );
     CPPUNIT_TEST( testInsertIfThenElseStatement );
+    CPPUNIT_TEST( testInsertExpressionStatement );
     CPPUNIT_TEST_SUITE_END();
  
***************
*** 68,71 ****
--- 69,73 ----
     void testInsertIfThenStatement();
     void testInsertIfThenElseStatement();
+    void testInsertExpressionStatement();
  
  private: