[Cpptool-cvs] rfta/src/rfta CodeRewriter.cpp,1.43,1.44

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

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

Modified Files:
	CodeRewriter.cpp 
Log Message:
* changed std::isspace() to a local isSpace() function.

Index: CodeRewriter.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeRewriter.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** CodeRewriter.cpp	24 Apr 2003 16:28:30 -0000	1.43
--- CodeRewriter.cpp	25 Apr 2003 07:49:15 -0000	1.44
***************
*** 10,14 ****
  #include <rfta/refactoring/CodeModelExpressions.h>
  #include <rfta/refactoring/CodeModelStatements.h>
! #include <cctype>
  namespace Refactoring { namespace CodeModel {
  
--- 10,15 ----
  #include <rfta/refactoring/CodeModelExpressions.h>
  #include <rfta/refactoring/CodeModelStatements.h>
! 
! 
  namespace Refactoring { namespace CodeModel {
  
***************
*** 725,756 ****
  }
  
  void
  CodeRewriter::deleteTextIfNecessary( const Change& change )
  {
!   if ( change.wasRemoved()  ||  change.wasReplaced() )
!     {
        replaceText( change.oldRange_, "");
-     }
  }
  
  bool 
! CodeRewriter::needsToInsertComma( const Change& change, int index, 
! 				  bool firstWasAdded)
  {
!   return (index > 0 && change.wasAdded()) || (index == 1 && firstWasAdded);
  }
  
  bool 
  CodeRewriter::needsToInsertSpace( const DeclaratorExpressionPtr& expression )
  {
!   DeclaratorPtr declarator = expression->getDeclaratorAt(0);
!   if (declarator->hasType() &&
!       declarator->getType()->getTypeText().size() > 0)
!     return false;
!   std::string type =expression->getPrimaryType()->getTypeText();
!   char lastCharacter = type[type.length()-1];
!   return ! std::isspace( lastCharacter );
  
- };
  } // namespace CodeModel
  } // namespace Refactoring
--- 726,762 ----
  }
  
+ 
  void
  CodeRewriter::deleteTextIfNecessary( const Change& change )
  {
!    if ( change.wasRemoved()  ||  change.wasReplaced() )
        replaceText( change.oldRange_, "");
  }
  
+ 
  bool 
! CodeRewriter::needsToInsertComma( const Change& change, 
!                                   int index, 
!                                   bool firstWasAdded)
  {
!    return (index > 0 && change.wasAdded()) || (index == 1 && firstWasAdded);
  }
  
+ 
  bool 
  CodeRewriter::needsToInsertSpace( const DeclaratorExpressionPtr& expression )
  {
!    DeclaratorPtr declarator = expression->getDeclaratorAt(0);
!    if ( declarator->hasType()  &&
!         declarator->getType()->getTypeText().size() > 0 )
!       return false;
! 
!    std::string type = expression->getPrimaryType()->getTypeText();
!    char lastCharacter = type[type.length()-1];
! 
!    return !isspace( lastCharacter );
!    
! }
  
  } // namespace CodeModel
  } // namespace Refactoring