[Cpptool-cvs] rfta/include/rfta/refactoring InlineTempRefactoring.h,1.2,1.3 ReduceTempScopeRefactoring.h,1.3,1.4 SplitDeclarationRefactoring.h,1.3,1.4 RefactoringBase.h,1.4,1.5 LineBasedTextDocument.h,1.7,1.8 SplitTempRefactoring.h,1.7,1.8 RenameTempRefactoring.h,1.14,1.15

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

Update of /cvsroot/cpptool/rfta/include/rfta/refactoring
In directory sc8-pr-cvs1:/tmp/cvs-serv10947/include/rfta/refactoring

Modified Files:
	InlineTempRefactoring.h ReduceTempScopeRefactoring.h 
	SplitDeclarationRefactoring.h RefactoringBase.h 
	LineBasedTextDocument.h SplitTempRefactoring.h 
	RenameTempRefactoring.h 
Log Message:
-- integrated preprocessor (replaced all NonSemanticBlanker)

Index: InlineTempRefactoring.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/InlineTempRefactoring.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InlineTempRefactoring.h	6 Apr 2003 16:17:19 -0000	1.2
--- InlineTempRefactoring.h	13 Jan 2004 22:30:44 -0000	1.3
***************
*** 22,26 ****
      * constructs on object and prepares the inlining
      */
!    InlineTempRefactoring(TextDocument &document,int temporaryLocation);
     
     /**
--- 22,28 ----
      * constructs on object and prepares the inlining
      */
!    InlineTempRefactoring(SourcePtr source,
!                          SourceManager& manager,
!                          int temporaryLocation);
     
     /**

Index: ReduceTempScopeRefactoring.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/ReduceTempScopeRefactoring.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReduceTempScopeRefactoring.h	22 Dec 2002 15:47:33 -0000	1.3
--- ReduceTempScopeRefactoring.h	13 Jan 2004 22:30:44 -0000	1.4
***************
*** 7,11 ****
  
  #include <rfta/refactoring/RefactoringBase.h>
! 
  
  namespace Refactoring
--- 7,11 ----
  
  #include <rfta/refactoring/RefactoringBase.h>
! #include <rfta/parser/SourceManager.h>
  
  namespace Refactoring
***************
*** 17,21 ****
  {
  public:
!    ReduceTempScopeRefactoring( TextDocument &document,
                                 int localeVariableLocation );
  
--- 17,22 ----
  {
  public:
!    ReduceTempScopeRefactoring( SourcePtr source,
!                                SourceManager& manager,
                                 int localeVariableLocation );
  

Index: SplitDeclarationRefactoring.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/SplitDeclarationRefactoring.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SplitDeclarationRefactoring.h	19 Dec 2003 20:14:27 -0000	1.3
--- SplitDeclarationRefactoring.h	13 Jan 2004 22:30:44 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  #include <rfta/parser/ASTNode.h>
  #include <rfta/parser/SourceRange.h>
+ #include <rfta/parser/SourceManager.h>
  #include <rfta/refactoring/RefactoringBase.h>
  #include "TransformList.h"
***************
*** 28,32 ****
     /*! Constructs a SplitDeclarationRefactoring object.
      */
!    SplitDeclarationRefactoring( TextDocument &document,
                                  int declarationLocation );
  
--- 29,34 ----
     /*! Constructs a SplitDeclarationRefactoring object.
      */
!    SplitDeclarationRefactoring( SourcePtr source,
!                                 SourceManager& manager,
                                  int declarationLocation );
  
***************
*** 48,51 ****
--- 50,54 ----
     SourceASTNodePtr sourceNode_;
     TransformList transforms_;
+    std::string blankedSource_;
  };
  

Index: RefactoringBase.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/RefactoringBase.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RefactoringBase.h	22 Dec 2002 16:03:50 -0000	1.4
--- RefactoringBase.h	13 Jan 2004 22:30:44 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  #include <rfta/parser/SourceRange.h>
  #include <boost/utility.hpp>
+ #include <boost/shared_ptr.hpp>
  
  
***************
*** 17,20 ****
--- 18,24 ----
  class SourceRange;
  class TextDocument;
+ class Source;
+ class SourceManager;
+ typedef boost::shared_ptr<Source> SourcePtr;
  
  
***************
*** 24,28 ****
     /*! Constructs a RefactoringBase object.
      */
!    RefactoringBase( TextDocument& document );
  
     /// Destructor.
--- 28,32 ----
     /*! Constructs a RefactoringBase object.
      */
!    RefactoringBase( SourcePtr source, SourceManager& manager );
  
     /// Destructor.
***************
*** 31,37 ****
  protected:
    virtual TextDocument& getDocument();
  
  private:
!   TextDocument& baseDocument_;
  };
  
--- 35,44 ----
  protected:
    virtual TextDocument& getDocument();
+   virtual SourcePtr getSource();
+   virtual SourceManager& getSourceManager();
  
  private:
!   SourcePtr       source_;
!   SourceManager&  manager_;
  };
  
***************
*** 40,43 ****
--- 47,61 ----
  // Inlines methods for RefactoringBase:
  // ------------------------------------------
+ inline SourcePtr 
+ RefactoringBase::getSource()
+ {
+    return source_;
+ }
+ 
+ inline SourceManager&
+ RefactoringBase::getSourceManager()
+ {
+    return manager_;
+ }
  
  

Index: LineBasedTextDocument.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/LineBasedTextDocument.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** LineBasedTextDocument.h	16 May 2003 19:54:53 -0000	1.7
--- LineBasedTextDocument.h	13 Jan 2004 22:30:44 -0000	1.8
***************
*** 6,10 ****
  #define RFTA_LINEBASEDTEXTDOCUMENT_H
  
! #include <rfta/refactoring/TextDocument.h>
  #include <boost/utility.hpp>
  //#include <deque>
--- 6,11 ----
  #define RFTA_LINEBASEDTEXTDOCUMENT_H
  
! #include <rfta/refactoring/Config.h>
! #include <rfta/parser/TextDocument.h>
  #include <boost/utility.hpp>
  //#include <deque>

Index: SplitTempRefactoring.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/SplitTempRefactoring.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SplitTempRefactoring.h	19 Dec 2003 20:14:40 -0000	1.7
--- SplitTempRefactoring.h	13 Jan 2004 22:30:44 -0000	1.8
***************
*** 13,16 ****
--- 13,17 ----
  #include <rfta/parser/SourceRange.h>
  #include <rfta/refactoring/RefactoringBase.h>
+ #include <rfta/parser/SourceManager.h>
  
  namespace Refactoring
***************
*** 27,31 ****
     /*! Constructs a SplitTempRefactoring object.
      */
!    SplitTempRefactoring( TextDocument &document,
                           int temporaryLocation );
  
--- 28,33 ----
     /*! Constructs a SplitTempRefactoring object.
      */
!    SplitTempRefactoring( SourcePtr source,
!                          SourceManager& manager,
                           int temporaryLocation );
  

Index: RenameTempRefactoring.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/RenameTempRefactoring.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RenameTempRefactoring.h	20 Dec 2003 08:59:50 -0000	1.14
--- RenameTempRefactoring.h	13 Jan 2004 22:30:44 -0000	1.15
***************
*** 10,13 ****
--- 10,14 ----
  #include <rfta/refactoring/RefactoringBase.h>
  #include <rfta/refactoring/ToolsBox.h>
+ #include <rfta/parser/SourceManager.h>
  #include <rfta/refactoring/TransformList.h>
  
***************
*** 26,30 ****
      * \exception RefactoringError on failure (selection is not a local variable...)
      */
!    RenameTempRefactoring( TextDocument &document,
                            int temporaryLocation );
  
--- 27,32 ----
      * \exception RefactoringError on failure (selection is not a local variable...)
      */
!    RenameTempRefactoring( SourcePtr source,
!                           SourceManager& manager,
                            int temporaryLocation );