[Cpptool-cvs] rfta/src/rfta CodeModelElement.cpp,1.11,1.12 CodeModelGeneratorTest.cpp,1.9,1.10 CodeWriterTestBase.cpp,1.8,1.9 rfta.dsp,1.48,1.49 SplitDeclarationRefactoring.cpp,1.2,1.3

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

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

Modified Files:
	CodeModelElement.cpp CodeModelGeneratorTest.cpp 
	CodeWriterTestBase.cpp rfta.dsp 
	SplitDeclarationRefactoring.cpp 
Log Message:
* renamed CodeModel.[ch] to CodeModelGenerator.[ch]
* introduced a level of indirection between the code model and ast node, there allowing for alternative parser implementation.

Index: CodeModelElement.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModelElement.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CodeModelElement.cpp	21 Apr 2003 03:08:54 -0000	1.11
--- CodeModelElement.cpp	26 May 2003 21:12:33 -0000	1.12
***************
*** 26,30 ****
  Element::isFromSource() const
  {
!    return node_;
  }
  
--- 26,30 ----
  Element::isFromSource() const
  {
!    return astSource_;
  }
  
***************
*** 33,38 ****
  Element::getSourceText() const
  {
!    if ( node_ )
!       return node_->getOriginalText();
     return std::string();
  }
--- 33,38 ----
  Element::getSourceText() const
  {
!    if ( astSource_ )
!       return astSource_->getSourceText();
     return std::string();
  }
***************
*** 42,47 ****
  Element::getSourceRange() const
  {
!    if ( node_ )
!       return node_->getRange();
     return SourceRange();
  }
--- 42,47 ----
  Element::getSourceRange() const
  {
!    if ( astSource_ )
!       return astSource_->getSourceRange();
     return SourceRange();
  }
***************
*** 49,55 ****
  
  void 
! Element::setSource( const ASTNodePtr &node )
  {
!    node_ = node;
     setElementIsFromSource();
  }
--- 49,55 ----
  
  void 
! Element::setSource( const ElementASTSourcePtr &node )
  {
!    astSource_ = node;
     setElementIsFromSource();
  }

Index: CodeModelGeneratorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModelGeneratorTest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CodeModelGeneratorTest.cpp	15 May 2003 16:29:13 -0000	1.9
--- CodeModelGeneratorTest.cpp	26 May 2003 21:12:33 -0000	1.10
***************
*** 6,10 ****
  #include "stdafx.h"
  #include "CodeModelGeneratorTest.h"
! #include <rfta/refactoring/CodeModel.h>
  #include <rfta/refactoring/CodeModelStatements.h>
  #include <rfta/refactoring/CodeModelExpressions.h>
--- 6,10 ----
  #include "stdafx.h"
  #include "CodeModelGeneratorTest.h"
! #include <rfta/refactoring/CodeModelGenerator.h>
  #include <rfta/refactoring/CodeModelStatements.h>
  #include <rfta/refactoring/CodeModelExpressions.h>

Index: CodeWriterTestBase.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTestBase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CodeWriterTestBase.cpp	15 May 2003 16:29:13 -0000	1.8
--- CodeWriterTestBase.cpp	26 May 2003 21:12:33 -0000	1.9
***************
*** 6,10 ****
  #include "stdafx.h"
  #include "CodeWriterTestBase.h"
! #include <rfta/refactoring/CodeModel.h>
  #include <rfta/Parser/StatementsParser.h>
  
--- 6,10 ----
  #include "stdafx.h"
  #include "CodeWriterTestBase.h"
! #include <rfta/refactoring/CodeModelGenerator.h>
  #include <rfta/Parser/StatementsParser.h>
  

Index: rfta.dsp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.dsp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** rfta.dsp	16 May 2003 08:30:33 -0000	1.48
--- rfta.dsp	26 May 2003 21:12:33 -0000	1.49
***************
*** 56,61 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Release/rfta_mdr.ext" /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib"
  # Begin Special Build Tool
! TargetDir=\Projects\Cpptool\rfta\build\rfta\Release
! TargetPath=\Projects\Cpptool\rfta\build\rfta\Release\rfta_mdr.ext
  TargetName=rfta_mdr
  SOURCE="$(InputPath)"
--- 56,61 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Release/rfta_mdr.ext" /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib"
  # Begin Special Build Tool
! TargetDir=\prg\vc\Rfta\build\rfta\Release
! TargetPath=\prg\vc\Rfta\build\rfta\Release\rfta_mdr.ext
  TargetName=rfta_mdr
  SOURCE="$(InputPath)"
***************
*** 90,95 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Debug\rfta_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib"
  # Begin Special Build Tool
! TargetDir=\Projects\Cpptool\rfta\build\rfta\Debug
! TargetPath=\Projects\Cpptool\rfta\build\rfta\Debug\rfta_mdd.ext
  TargetName=rfta_mdd
  SOURCE="$(InputPath)"
--- 90,95 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Debug\rfta_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib"
  # Begin Special Build Tool
! TargetDir=\prg\vc\Rfta\build\rfta\Debug
! TargetPath=\prg\vc\Rfta\build\rfta\Debug\rfta_mdd.ext
  TargetName=rfta_mdd
  SOURCE="$(InputPath)"
***************
*** 331,342 ****
  # Begin Source File
  
- SOURCE=.\CodeModel.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\include\rfta\refactoring\CodeModel.h
- # End Source File
- # Begin Source File
- 
  SOURCE=..\..\doc\CodeModel.txt
  # End Source File
--- 331,334 ----
***************
*** 360,363 ****
--- 352,363 ----
  
  SOURCE=..\..\include\rfta\refactoring\CodeModelForward.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\CodeModelGenerator.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\include\rfta\refactoring\CodeModelGenerator.h
  # End Source File
  # Begin Source File

Index: SplitDeclarationRefactoring.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/SplitDeclarationRefactoring.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SplitDeclarationRefactoring.cpp	22 Apr 2003 19:23:27 -0000	1.2
--- SplitDeclarationRefactoring.cpp	26 May 2003 21:12:33 -0000	1.3
***************
*** 21,25 ****
  #include <rfta/refactoring/RefactoringError.h>
  #include <rfta/refactoring/TextDocument.h>
! #include <rfta/refactoring/CodeModel.h>
  #include <rfta/refactoring/CodeModelStatements.h>
  #include <rfta/refactoring/CodeModelForward.h>
--- 21,25 ----
  #include <rfta/refactoring/RefactoringError.h>
  #include <rfta/refactoring/TextDocument.h>
! #include <rfta/refactoring/CodeModelGenerator.h>
  #include <rfta/refactoring/CodeModelStatements.h>
  #include <rfta/refactoring/CodeModelForward.h>