[Cpptool-cvs] rfta/src/rfta CodeRewriter.cpp,1.12,1.13 CodeRewriter.h,1.7,1.8

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

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

Modified Files:
	CodeRewriter.cpp CodeRewriter.h 
Log Message:
* refactored a bit

Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CodeRewriter.cpp	15 Mar 2003 21:51:43 -0000	1.12
--- CodeRewriter.cpp	15 Mar 2003 22:05:23 -0000	1.13
***************
*** 85,92 ****
  
  void 
  CodeRewriter::visit( BreakStatement &statement )
  {
     if ( isInserting() )
!       insertText( "\n" + indentManager_.getIndentSpacer() + "break;" );
  }
  
--- 85,117 ----
  
  void 
+ CodeRewriter::beginInsertNewStatement()
+ {
+    insertText( "\n" + indentManager_.getIndentSpacer() ); 
+ }
+ 
+ 
+ void 
+ CodeRewriter::endInsertNewStatement()
+ {
+    insertText( ";" );
+ }
+ 
+ 
+ void 
+ CodeRewriter::endInsertNewLabelStatement()
+ {
+    insertText( ":" );
+ }
+ 
+ 
+ void 
  CodeRewriter::visit( BreakStatement &statement )
  {
     if ( isInserting() )
!    {
!       beginInsertNewStatement();
!       insertText( "break" );
!       endInsertNewStatement();
!    }
  }
  
***************
*** 97,103 ****
     if ( isInserting() )
     {
!       insertText( "\n" + indentManager_.getIndentSpacer() + "case " );
        statement.getConditionValue()->accept( *this );
!       insertText( ":" );
     }
  }
--- 122,129 ----
     if ( isInserting() )
     {
!       beginInsertNewStatement();
!       insertText( "case " );
        statement.getConditionValue()->accept( *this );
!       endInsertNewLabelStatement();
     }
  }
***************
*** 158,162 ****
  {
     if ( isInserting() )
!       insertText( "\n" + indentManager_.getIndentSpacer() + "continue;" );
  }
  
--- 184,192 ----
  {
     if ( isInserting() )
!    {
!       beginInsertNewStatement();
!       insertText( "continue" );
!       endInsertNewStatement();
!    }
  }
  
***************
*** 166,170 ****
  {
     if ( isInserting() )
!       insertText( "\n" + indentManager_.getIndentSpacer() + "default:" );
  }
  
--- 196,204 ----
  {
     if ( isInserting() )
!    {
!       beginInsertNewStatement();
!       insertText( "default" );
!       endInsertNewLabelStatement();
!    }
  }
  
***************
*** 179,187 ****
  CodeRewriter::visit( DoStatement &statement )
  {
!    insertText( "\n" + indentManager_.getIndentSpacer() + "do" );
     statement.getIteratedStatement()->accept( *this );
!    insertText( "\n" + indentManager_.getIndentSpacer() + "while ( " );
     statement.getCondition()->accept( *this );
!    insertText( " );" );
  }
  
--- 213,224 ----
  CodeRewriter::visit( DoStatement &statement )
  {
!    beginInsertNewStatement();
!    insertText( "do" );
     statement.getIteratedStatement()->accept( *this );
!    beginInsertNewStatement();
!    insertText( "while ( " );
     statement.getCondition()->accept( *this );
!    insertText( " )" );
!    endInsertNewStatement();
  }
  
***************
*** 208,212 ****
  CodeRewriter::visit( GotoStatement &statement )
  {
!    insertText( "\n" + indentManager_.getIndentSpacer() + "goto " + statement.getLabelName() + ";" );
  }
  
--- 245,251 ----
  CodeRewriter::visit( GotoStatement &statement )
  {
!    beginInsertNewStatement();
!    insertText( "goto " + statement.getLabelName() );
!    endInsertNewStatement();
  }
  
***************
*** 239,243 ****
  {
     if ( isInserting() )
!       insertText( "\n" + indentManager_.getIndentSpacer() + ";" );
  }
  
--- 278,285 ----
  {
     if ( isInserting() )
!    {
!       beginInsertNewStatement();
!       endInsertNewStatement();
!    }
  }
  
***************
*** 265,269 ****
     else if ( isInserting() )
     {
!       insertText( "\n" + indentManager_.getIndentSpacer() + "return" );
        if ( statement.hasValue() )
        {
--- 307,312 ----
     else if ( isInserting() )
     {
!       beginInsertNewStatement();
!       insertText( "return" );
        if ( statement.hasValue() )
        {
***************
*** 271,275 ****
           statement.getValue()->accept( *this );
        }
!       insertText( ";" );
     }
  }
--- 314,318 ----
           statement.getValue()->accept( *this );
        }
!       endInsertNewStatement();
     }
  }
***************
*** 285,289 ****
  CodeRewriter::visit( SwitchStatement &statement )
  {
!    insertText( "\n" + indentManager_.getIndentSpacer() + "switch ( " );
     statement.getCondition()->accept( *this );
     insertText( " )" );
--- 328,333 ----
  CodeRewriter::visit( SwitchStatement &statement )
  {
!    beginInsertNewStatement();
!    insertText( "switch ( " );
     statement.getCondition()->accept( *this );
     insertText( " )" );
***************
*** 295,299 ****
  CodeRewriter::visit( WhileStatement &statement )
  {
!    insertText( "\n" + indentManager_.getIndentSpacer() + "while ( " );
     statement.getCondition()->accept( *this );
     insertText( " )" );
--- 339,344 ----
  CodeRewriter::visit( WhileStatement &statement )
  {
!    beginInsertNewStatement();
!    insertText( "while ( " );
     statement.getCondition()->accept( *this );
     insertText( " )" );

Index: CodeRewriter.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CodeRewriter.h	15 Mar 2003 21:29:43 -0000	1.7
--- CodeRewriter.h	15 Mar 2003 22:05:23 -0000	1.8
***************
*** 107,110 ****
--- 107,114 ----
     bool isUpdating() const;
  
+    void beginInsertNewStatement();
+    void endInsertNewStatement();
+    void endInsertNewLabelStatement();
+ 
  private:
     IndentLevelManager indentManager_;