cpptool-cvs Mailing List for CPPRefactory (Page 5)

Status: Pre-Alpha

Brought to you by: blep, jejudd, svenreichard

cpptool-cvs — Mailing list for CVS commit messages.

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (37)
2003	_Jan (15)	_Feb (26)	_Mar (97)	_Apr (224)	_May (226)	_Jun	_Jul (3)	_Aug (22)	_Sep (48)	_Oct	_Nov	_Dec (38)
2004	_Jan (28)	_Feb	_Mar (1)	_Apr	_May	_Jun (37)	_Jul	_Aug (73)	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 3 4 5 6 7 .. 35 > >> (Page 5 of 35)

[Cpptool-cvs] rfta/src rfta.sln,1.1,1.2

From: Baptiste L. <bl...@us...> - 2004-06-13 14:18:01

Update of /cvsroot/cpptool/rfta/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3762/src

Modified Files:
	rfta.sln 
Log Message:
* updated & removed cppunit dependencies in release build.

Index: rfta.sln
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rfta.sln	14 May 2003 19:44:11 -0000	1.1
--- rfta.sln	13 Jun 2004 14:17:46 -0000	1.2
***************
*** 41,44 ****
--- 41,50 ----
  		{3FB51A64-B118-4B24-BB68-56E94C2341DF}.1 = {4A2F26AB-1D9B-4746-A855-157FA7A37537}
  		{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.0 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
+ 		{10EDA388-9FAF-4920-8E31-83879630241C}.0 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
+ 		{10EDA388-9FAF-4920-8E31-83879630241C}.1 = {3FB51A64-B118-4B24-BB68-56E94C2341DF}
+ 		{9D6B64ED-9717-4CD4-9937-3395B0311E90}.0 = {6FEC82A8-D508-4BDA-8005-77F70DB3709C}
+ 		{9D6B64ED-9717-4CD4-9937-3395B0311E90}.1 = {10EDA388-9FAF-4920-8E31-83879630241C}
+ 		{9D6B64ED-9717-4CD4-9937-3395B0311E90}.2 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
+ 		{9D6B64ED-9717-4CD4-9937-3395B0311E90}.3 = {2EA464D8-AA14-4CED-B21A-3B84B892B33E}
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution

[Cpptool-cvs] rfta/distrib install.txt,NONE,1.1

From: Baptiste L. <bl...@us...> - 2004-06-13 14:03:25

Update of /cvsroot/cpptool/rfta/distrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22846

Added Files:
	install.txt 
Log Message:
* install instructions for distributed binaries package.

--- NEW FILE: install.txt ---
Refactoring Assistant
http://cpptool.sourceforge.net

* Installation of Visual Studio 6 add-ins:
  - copy *.ext & *.dll files to VS6 add-ins directory 
    (for me: C:\wut\prg\vc6\Common\MSDev98\AddIns )
  - Run VS 6, and Go in Tools/Customize/Add-ins menu. 
    If you obtain an error when selecting the Add-ins tab,
    select Browse... and choose rftavc6addin.dll, that
    should fix it.
  - Make sure the add-ins is checked in the add-ins list.
  - Click ok, and a new toolbar should appear.

* Installation of Visual Studio 7.x add-ins (binary):
  - unpack the files & run register.bat. This will register
    the location of the add-ins in Visual Studio 2002 & 2003.
  - run unregister.bat to unregister the add-ins from Visual Studio.

* Installation of Visual Studio 7.x add-ins (setup):
  - unpack & run the msi setup installer.

[Cpptool-cvs] rfta/distrib - New directory

From: Baptiste L. <bl...@us...> - 2004-06-13 14:01:25

Update of /cvsroot/cpptool/rfta/distrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21573/distrib

Log Message:
Directory /cvsroot/cpptool/rfta/distrib added to the repository
--> Using per-directory sticky date `2003.08.25.22.00.00'

[Cpptool-cvs] rfta/src/rfta rfta.vcproj,1.2,1.3

From: Baptiste L. <bl...@us...> - 2004-06-13 12:28:54

Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv319/src/rfta

Modified Files:
	rfta.vcproj 
Log Message:
* removed CodeModels.cpp

Index: rfta.vcproj
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rfta.vcproj	29 May 2003 10:01:09 -0000	1.2
--- rfta.vcproj	13 Jun 2004 12:28:46 -0000	1.3
***************
*** 314,323 ****
  			</File>
  			<File
- 				RelativePath=".\CodeModel.cpp">
- 			</File>
- 			<File
- 				RelativePath="..\..\include\rfta\refactoring\CodeModel.h">
- 			</File>
- 			<File
  				RelativePath="..\..\doc\CodeModel.txt">
  			</File>
--- 314,317 ----

[Cpptool-cvs] rfta/src/rftaparser rftaparser.vcproj,1.2,1.3

From: Baptiste L. <bl...@us...> - 2004-06-13 12:16:40

Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20736

Modified Files:
	rftaparser.vcproj 
Log Message:
* removed UnitTests.cpp (unix stuff)

Index: rftaparser.vcproj
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rftaparser.vcproj	29 May 2003 10:01:10 -0000	1.2
--- rftaparser.vcproj	13 Jun 2004 12:16:27 -0000	1.3
***************
*** 1111,1117 ****
  			RelativePath="..\..\include\rfta\parser\ParserTools.h">
  		</File>
- 		<File
- 			RelativePath="UnitTests.cpp">
- 		</File>
  	</Files>
  	<Globals>
--- 1111,1114 ----

[Cpptool-cvs] rfta/deplib/boostcvs/libs/filesystem/doc convenience.htm,1.2,1.3 do-list.htm,1.3,1.4 exception.htm,1.3,1.4 index.htm,1.3,1.4

From: Baptiste L. <bl...@us...> - 2004-06-13 11:57:04

Update of /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3989/libs/filesystem/doc

Modified Files:
	convenience.htm do-list.htm exception.htm index.htm 
Log Message:
* added boost 1.30.2 headers & sources

Index: exception.htm
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/doc/exception.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exception.htm	10 May 2003 15:17:32 -0000	1.3
--- exception.htm	13 Jun 2004 11:56:54 -0000	1.4
***************
*** 26,31 ****
  
  <p>The design evolved based on user requests to ease portability and 
! internationalization. See the Boost <a href="../../../more/error_handling.html">
! Error and Exception Handling</a> guidelines.</p>
  
  <h2><a name="Synopsis">Synopsis</a></h2>
--- 26,30 ----
  
  <p>The design evolved based on user requests to ease portability and 
! internationalization.</p>
  
  <h2><a name="Synopsis">Synopsis</a></h2>
***************
*** 55,59 ****
      };
  
!     class filesystem_error : public std::exception
      {
      public:
--- 54,58 ----
      };
  
!     class filesystem_error : public std::runtime_error
      {
      public:
***************
*** 74,79 ****
        ~filesystem_error() throw();
  
-       virtual const char * what() const throw();
- 
        <i>sys_err</i> <a href="#native_error">native_error</a>() const;
        error_code <a href="#error">error</a>() const;
--- 73,76 ----
***************
*** 118,129 ****
    <p><b>Effects:</b> Constructs a <i>filesystem_error</i> object.</p>
  </blockquote>
- <h3><a name="what">what</a></h3>
- <blockquote>
- <p><code>virtual const char * what() const throw();</code></p>
- <p><b>Returns:</b> A string identifying the error, including who(), path1(), 
- path2(), and related messages. If an error occurs in the preparation of the 
- string, particularly in low-memory situations, an implementation is permitted to 
- return a simpler static string.</p>
- </blockquote>
  <h3><a name="native_error">native_error</a></h3>
  <blockquote>
--- 115,118 ----
***************
*** 145,151 ****
    <pre>const std::string &amp; who() const;</pre>
  
! <p><b>Returns:</b> The <code>who</code> argument to the constructor. An 
! implementation is permitted to return an empty string if an exception, for 
! example,&nbsp; std::bad_alloc,&nbsp; occurs during processing.</p>
  </blockquote>
  
--- 134,138 ----
    <pre>const std::string &amp; who() const;</pre>
  
! <p><b>Returns:</b> The <code>who</code> argument to the constructor.</p>
  </blockquote>
  
***************
*** 155,161 ****
  
  <p><b>Returns:</b> The <code>path1</code> argument to the constructor, if any, 
! otherwise <code>path()</code>. An implementation is permitted to return an empty 
! path if an exception, for example, std::bad_alloc,&nbsp; occurs during 
! processing.</p>
  </blockquote>
  
--- 142,146 ----
  
  <p><b>Returns:</b> The <code>path1</code> argument to the constructor, if any, 
! otherwise <code>path()</code>.</p>
  </blockquote>
  
***************
*** 165,171 ****
  
  <p><b>Returns:</b> The <code>path2</code> argument to the constructor, if any, 
! otherwise <code>path()</code>. An implementation is permitted to return an empty 
! path if an exception, for example, std::bad_alloc,&nbsp; occurs during 
! processing.</p>
  </blockquote>
  
--- 150,154 ----
  
  <p><b>Returns:</b> The <code>path2</code> argument to the constructor, if any, 
! otherwise <code>path()</code>.</p>
  </blockquote>
  
***************
*** 177,181 ****
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->23 March, 2003<!--webbot bot="Timestamp" endspan i-checksum="28836" --></p>
  
  </body>
--- 160,164 ----
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->02 January, 2003<!--webbot bot="Timestamp" endspan i-checksum="38568" --></p>
  
  </body>

Index: do-list.htm
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/doc/do-list.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** do-list.htm	10 May 2003 15:17:32 -0000	1.3
--- do-list.htm	13 Jun 2004 11:56:54 -0000	1.4
***************
*** 10,13 ****
--- 10,18 ----
    and complete(). Also, path_test cases at line 410 need review, correction.<br>
  &nbsp;</li>
+   <li>Replace filesystem_error impl with shared_ptr. (Dave Abrahams).<br>
+ &nbsp;</li>
+   <li>Consider changing who() 
+   interface (and ctors to const char *).<br>
+ &nbsp;</li>
    <li>Add a path::swap member function guaranteed not to throw. (Geurt Vos).<br>
  &nbsp;</li>
***************
*** 39,41 ****
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->23 March, 2003<!--webbot bot="Timestamp" endspan i-checksum="28836" --></p>
\ No newline at end of file
--- 44,46 ----
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->17 March, 2003<!--webbot bot="Timestamp" endspan i-checksum="28843" --></p>
\ No newline at end of file

Index: index.htm
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/doc/index.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.htm	10 May 2003 15:17:32 -0000	1.3
--- index.htm	13 Jun 2004 11:56:54 -0000	1.4
***************
*** 428,437 ****
   
  <p>A lengthy discussion on the C++ committee's library reflector illuminated the &quot;illusion 
! of portability&quot; problem, particularly in postings by PJ Plauger and Pete Becker.</p>
  
  <hr>
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->08 April, 2003<!--webbot bot="Timestamp" endspan i-checksum="29884" --></p>
  
  </body>
--- 428,437 ----
   
  <p>A lengthy discussion on the C++ committee's library reflector illuminated the &quot;illusion 
! of portability&quot; problem, particularly in postings by JP Plauger and Pete Becker.</p>
  
  <hr>
  <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->16 March, 2003<!--webbot bot="Timestamp" endspan i-checksum="28841" --></p>
  
  </body>

Index: convenience.htm
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/doc/convenience.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** convenience.htm	10 May 2003 15:17:32 -0000	1.2
--- convenience.htm	13 Jun 2004 11:56:54 -0000	1.3
***************
*** 25,32 ****
  <dl class="index">
  <dt><a href="#create_directories">create_directories</a>
! <dt><a href="#extension">extension</a>
! <dt><a href="#basename">basename</a>
! <dt><a href="#change_extension">change_extension</a>
! </dl>
  
  <h2 id="create_directoies">create_directories</h2>
--- 25,29 ----
  <dl class="index">
  <dt><a href="#create_directories">create_directories</a>
! </ol>
  
  <h2 id="create_directoies">create_directories</h2>
***************
*** 45,117 ****
  </blockquote>
  
- <h2 id="extension">extension</h2>
- 
- <blockquote>
- 
- <p><code>std::string extension( const path &amp; ph );</code></p>
- 
- <p><b>Returns:</b> if <code>ph.leaf()</code> contains a dot ('.'),
- returns the substring of <code>ph.leaf()</code> starting from the last dot and
- ending at the string's end. Otherwise, returns empty string.
- <p><b>Rationale:</b> <ul>
- <li>The dot is included in the return value so that it's
- possible to tell if extension is empty or absent.
- <li>It was noted that this defintion of extension is probably not sufficient
- when using <a href="http://tinyurl.com/9tih">Alternate Data Streams</a> &mdash;
- a filesystem feature specific to NTFS. However, semantic in this case was not
- clear, and the current one is quite usefull still.
- </ul>
- <p><b>Acknowlegements:</b> Carl Daniel and Pavel Vozenilek noticed and
- discussed the ADS issue.
- 
- <p>Contributed by Vladimir Prus.</p>
- 
- </blockquote>
- 
- <h2 id="basename">basename</h2>
- 
- <blockquote>
- 
- <p><code>std::string basename( const path &amp; ph );</code></p>
- 
- <p><b>Returns:</b> if <code>ph.leaf()</code> contains a dot ('.'),
- returns the substring of <code>ph.leaf()</code> starting from beginning and
- ending at the last dot (the dot is not included). Otherwise, returns 
- <code>ph.leaf()</code>
- 
- </p>
- 
- <p>Contributed by Vladimir Prus.</p>
- 
- </blockquote>
- 
- <h2 id="change_extension">change_extension</h2>
- 
- <blockquote>
- 
- <p><code>path basename( const path &amp; ph, const std::string &amp; new_extension );</code></p>
- 
- <p><b>Postcondition:</b> <code>basename(return_value) == basename(ph)
- &amp;&amp; extension(return_value) == new_extension</code>
- <p><b>Note:</b> It follows from the semantic of <code>extension</code> that 
- <code>new_extension</code> should include dot to achieve reasonable results.
- </p>
- <p><b>Rationale:</b> Previously, this functions had
- <code>!ph.leaf().empty()</code> as precondition. It's not clear if it was
- right or wrong. Changing extension of an empty path looks pointless. On the
- other hand, the value of precondition was questionable: one would better place such
- checks at the points where paths are entered by the user. Current decision
- is to drop the precondition.</p>
- 
- <p>Contributed by Vladimir Prus.</p>
- 
- </blockquote>
- 
- 
- 
  <hr>
! <p>© Copyright Vladimir Prus, 2003</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->5 May, 2003<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
  <p>&nbsp;</p>
  
--- 42,49 ----
  </blockquote>
  
  <hr>
! <p>© Copyright Beman Dawes, 2002</p>
  <p>Revised
! <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->23 December, 2002<!--webbot bot="Timestamp" endspan i-checksum="38510" --></p>
  <p>&nbsp;</p>

[Cpptool-cvs] rfta/deplib/boostcvs/boost/filesystem convenience.hpp,1.2,1.3 exception.hpp,1.3,1.4 fstream.hpp,1.3,1.4

From: Baptiste L. <bl...@us...> - 2004-06-13 11:57:04

Update of /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3989/boost/filesystem

Modified Files:
	convenience.hpp exception.hpp fstream.hpp 
Log Message:
* added boost 1.30.2 headers & sources

Index: exception.hpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/exception.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exception.hpp	10 May 2003 15:17:32 -0000	1.3
--- exception.hpp	13 Jun 2004 11:56:53 -0000	1.4
***************
*** 24,29 ****
  
  #include <string>
! #include <exception>
! #include <boost/shared_ptr.hpp>
  
  //----------------------------------------------------------------------------// 
--- 24,28 ----
  
  #include <string>
! #include <stdexcept>
  
  //----------------------------------------------------------------------------// 
***************
*** 60,64 ****
  
  
!     class filesystem_error : public std::exception
      {
      public:
--- 59,63 ----
  
  
!     class filesystem_error : public std::runtime_error
      {
      public:
***************
*** 86,91 ****
        ~filesystem_error() throw();
  
-       virtual const char * what() const throw();
- 
        int             native_error() const { return m_sys_err; }
        // Note: a value of 0 implies a library (rather than system) error
--- 85,88 ----
***************
*** 96,103 ****
  
      private:
!       class             m_imp;
!       shared_ptr<m_imp> m_imp_ptr;
!       int               m_sys_err;
!       error_code        m_err;
      };
  
--- 93,101 ----
  
      private:
!       int             m_sys_err;
!       error_code      m_err;
!       std::string     m_who;
!       path            m_path1;
!       path            m_path2;
      };
  

Index: convenience.hpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/convenience.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** convenience.hpp	10 May 2003 15:17:32 -0000	1.2
--- convenience.hpp	13 Jun 2004 11:56:53 -0000	1.3
***************
*** 32,41 ****
      void create_directories(const path& ph);
  
-     std::string extension(const path& ph);
- 
-     std::string basename(const path& ph);
- 
-     path change_extension(const path& ph, const std::string& new_extension);
- 
    } // namespace filesystem
  } // namespace boost
--- 32,35 ----

Index: fstream.hpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/boost/filesystem/fstream.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fstream.hpp	10 May 2003 15:17:32 -0000	1.3
--- fstream.hpp	13 Jun 2004 11:56:53 -0000	1.4
***************
*** 14,18 ****
  
  #include <boost/filesystem/path.hpp>
- #include <boost/detail/workaround.hpp>
  
  #include <iosfwd>
--- 14,17 ----
***************
*** 28,32 ****
      public:
        virtual ~basic_filebuf() {}
! #if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
        std::basic_filebuf<charT,traits> * open( const path & file_ph,
          std::ios_base::openmode mode )
--- 27,32 ----
      public:
        virtual ~basic_filebuf() {}
! 
! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this
        std::basic_filebuf<charT,traits> * open( const path & file_ph,
          std::ios_base::openmode mode )
***************
*** 48,57 ****
      public:
        basic_ifstream() {}
- #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 )
        explicit basic_ifstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in )
          : std::basic_ifstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
! #  if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in )
--- 48,57 ----
      public:
        basic_ifstream() {}
        explicit basic_ifstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in )
          : std::basic_ifstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
!       virtual ~basic_ifstream() {}
! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in )
***************
*** 60,85 ****
            file_ph.native_file_string().c_str(), mode );
        }
- #  endif
- #else // workaround for VC++ 7.1 bug id VSWhidbey 38416
-       explicit basic_ifstream( const path & file_ph )
-         : std::basic_ifstream<charT,traits>(
-         file_ph.native_file_string().c_str(), std::ios_base::in ) {}
-       basic_ifstream( const path & file_ph,
-         std::ios_base::openmode mode )
-         : std::basic_ifstream<charT,traits>(
-         file_ph.native_file_string().c_str(), mode ) {}
-       void open( const path & file_ph )
-       {
-         std::basic_ifstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(), std::ios_base::in );
-       }
-       void open( const path & file_ph,
-         std::ios_base::openmode mode )
-       {
-         std::basic_ifstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(), mode );
-       }
  #endif
-       virtual ~basic_ifstream() {}
      };
  
--- 60,64 ----
***************
*** 94,103 ****
      public:
        basic_ofstream() {}
- #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 )
        explicit basic_ofstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::out )
          : std::basic_ofstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
! #  if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::out )
--- 73,82 ----
      public:
        basic_ofstream() {}
        explicit basic_ofstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::out )
          : std::basic_ofstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
!       virtual ~basic_ofstream() {}
! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::out )
***************
*** 106,131 ****
            file_ph.native_file_string().c_str(), mode );
        }
- #  endif
- #else // workaround for VC++ 7.1 bug id VSWhidbey 38416
-       explicit basic_ofstream( const path & file_ph )
-         : std::basic_ofstream<charT,traits>(
-         file_ph.native_file_string().c_str(), std::ios_base::out ) {}
-       basic_ofstream( const path & file_ph,
-         std::ios_base::openmode mode )
-         : std::basic_ofstream<charT,traits>(
-         file_ph.native_file_string().c_str(), mode ) {}
-       void open( const path & file_ph )
-       {
-         std::basic_ofstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(), std::ios_base::out );
-       }
-       void open( const path & file_ph,
-         std::ios_base::openmode mode )
-       {
-         std::basic_ofstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(), mode );
-       }
  #endif
-       virtual ~basic_ofstream() {}
      };
  
--- 85,89 ----
***************
*** 140,149 ****
      public:
        basic_fstream() {}
- #if !BOOST_WORKAROUND( BOOST_MSVC, == 1310 )
        explicit basic_fstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out )
          : std::basic_fstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
! #  if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out )
--- 98,107 ----
      public:
        basic_fstream() {}
        explicit basic_fstream( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out )
          : std::basic_fstream<charT,traits>(
          file_ph.native_file_string().c_str(), mode ) {}
!       virtual ~basic_fstream() {}
! #if !defined(BOOST_MSVC) || BOOST_MSVC > 1200 // VC++ 6.0 can't handle this
        void open( const path & file_ph,
          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out )
***************
*** 152,179 ****
            file_ph.native_file_string().c_str(), mode );
        }
- #  endif
- #else // workaround for VC++ 7.1 bug id VSWhidbey 38416
-       explicit basic_fstream( const path & file_ph )
-         : std::basic_fstream<charT,traits>(
-         file_ph.native_file_string().c_str(),
-         std::ios_base::in|std::ios_base::out ) {}
-       basic_fstream( const path & file_ph,
-         std::ios_base::openmode mode )
-         : std::basic_fstream<charT,traits>(
-         file_ph.native_file_string().c_str(), mode ) {}
-       void open( const path & file_ph )
-       {
-         std::basic_fstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(),
-           std::ios_base::in|std::ios_base::out );
-       }
-       void open( const path & file_ph,
-         std::ios_base::openmode mode )
-       {
-         std::basic_fstream<charT,traits>::open(
-           file_ph.native_file_string().c_str(), mode );
-       }
  #endif
-       virtual ~basic_fstream() {}
      };
   
--- 110,114 ----

[Cpptool-cvs] rfta/deplib/boostcvs/libs/filesystem/src convenience.cpp,1.2,1.3 exception.cpp,1.3,1.4

From: Baptiste L. <bl...@us...> - 2004-06-13 11:57:04

Update of /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3989/libs/filesystem/src

Modified Files:
	convenience.cpp exception.cpp 
Log Message:
* added boost 1.30.2 headers & sources

Index: convenience.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/src/convenience.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** convenience.cpp	10 May 2003 15:17:32 -0000	1.2
--- convenience.cpp	13 Jun 2004 11:56:54 -0000	1.3
***************
*** 29,57 ****
       }
  
-     std::string extension(const path& ph)
-     {
-       std::string leaf = ph.leaf();
- 
-       std::string::size_type n = leaf.rfind('.');
-       if (n != std::string::npos)
-         return leaf.substr(n);
-       else
-         return std::string();
-     }
- 
-     std::string basename(const path& ph)
-     {
-       std::string leaf = ph.leaf();
- 
-       std::string::size_type n = leaf.rfind('.');
-       return leaf.substr(0, n);
-     }
- 
-     path change_extension(const path& ph, const std::string& new_extension)
-     {
-       return ph.branch_path() / (basename(ph) + new_extension);
-     }
- 
- 
    } // namespace filesystem
  } // namespace boost
--- 29,32 ----

Index: exception.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/src/exception.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exception.cpp	10 May 2003 15:17:32 -0000	1.3
--- exception.cpp	13 Jun 2004 11:56:54 -0000	1.4
***************
*** 180,186 ****
    }
  
-   const fs::path empty_path;
-   const std::string empty_string;
-   const char * no_context_msg = "filesystem_error";
  } // unnamed namespace
  
--- 180,183 ----
***************
*** 189,204 ****
    namespace filesystem
    {
- //  filesystem_error m_imp class  --------------------------------------------//
- //  see www.boost.org/more/error_handling.html for implemenation rationale
- 
-     class filesystem_error::m_imp
-     {
-     public:
-       std::string     m_who;
-       path            m_path1;
-       path            m_path2;
-       std::string     m_what;
-     };
- 
  
  //  filesystem_error implementation  -----------------------------------------//
--- 186,189 ----
***************
*** 207,220 ****
        const std::string & who,
        const std::string & message )
!       : m_sys_err(0), m_err(other_error)
!     {
!       try
!       {
!         m_imp_ptr.reset( new m_imp );
!         m_imp_ptr->m_who = who;
!         m_imp_ptr->m_what = other_error_prep( who, message );
!       }
!       catch (...) { m_imp_ptr.reset(); }
!     }
   
      filesystem_error::filesystem_error(
--- 192,199 ----
        const std::string & who,
        const std::string & message )
!       : std::runtime_error(
!           other_error_prep( who, message ).c_str() ),
!         m_sys_err(0), m_err(other_error), m_who(who)
!     {}
   
      filesystem_error::filesystem_error(
***************
*** 222,236 ****
        const path & path1,
        const std::string & message )
!       : m_sys_err(0), m_err(other_error)
!     {
!       try
!       {
!         m_imp_ptr.reset( new m_imp );
!         m_imp_ptr->m_who = who;
!         m_imp_ptr->m_what = other_error_prep( who, path1, message );
!         m_imp_ptr->m_path1 = path1;
!       }
!       catch (...) { m_imp_ptr.reset(); }
!     }
   
      filesystem_error::filesystem_error(
--- 201,208 ----
        const path & path1,
        const std::string & message )
!       : std::runtime_error(
!           other_error_prep( who, path1, message ).c_str() ),
!         m_sys_err(0), m_err(other_error), m_who(who), m_path1(path1)
!     {}
   
      filesystem_error::filesystem_error(
***************
*** 238,252 ****
        const path & path1,
        int sys_err_code )
!       : m_sys_err(sys_err_code), m_err(lookup_error(sys_err_code))
!     {
!       try
!       {
!         m_imp_ptr.reset( new m_imp );
!         m_imp_ptr->m_who = who;
!         m_imp_ptr->m_what = system_error_prep( who, path1, sys_err_code );
!         m_imp_ptr->m_path1 = path1;
!       }
!       catch (...) { m_imp_ptr.reset(); }
!     }
  
      filesystem_error::filesystem_error(
--- 210,218 ----
        const path & path1,
        int sys_err_code )
!       : std::runtime_error(
!           system_error_prep( who, path1, sys_err_code ).c_str() ),
!         m_sys_err(sys_err_code), m_err(lookup_error(sys_err_code)),
!         m_who(who), m_path1(path1)
!     {}
  
      filesystem_error::filesystem_error(
***************
*** 255,270 ****
        const path & path2,
        int sys_err_code )
!       : m_sys_err(sys_err_code), m_err(lookup_error(sys_err_code))
!     {
!       try
!       {
!         m_imp_ptr.reset( new m_imp );
!         m_imp_ptr->m_who = who;
!         m_imp_ptr->m_what = system_error_prep( who, path1, path2, sys_err_code );
!         m_imp_ptr->m_path1 = path1;
!         m_imp_ptr->m_path2 = path2;
!       }
!       catch (...) { m_imp_ptr.reset(); }
!     }
  
      filesystem_error::~filesystem_error() throw()
--- 221,229 ----
        const path & path2,
        int sys_err_code )
!       : std::runtime_error(
!           system_error_prep( who, path1, path2, sys_err_code ).c_str() ),
!         m_sys_err(sys_err_code), m_err(lookup_error(sys_err_code)),
!         m_who(who), m_path1(path1), m_path2(path2)
!     {}
  
      filesystem_error::~filesystem_error() throw()
***************
*** 272,296 ****
      }
  
-     const std::string & filesystem_error::who() const
-     {
-       return m_imp_ptr.get() == 0 ? empty_string : m_imp_ptr->m_who;
-     }
- 
-     const path & filesystem_error::path1() const
-     {
-       return m_imp_ptr.get() == 0 ? empty_path : m_imp_ptr->m_path1;
-     }
- 
-     const path & filesystem_error::path2() const
-     {
-       return m_imp_ptr.get() == 0 ? empty_path : m_imp_ptr->m_path2;
-     }
- 
-     const char * filesystem_error::what() const throw()
-     {
-       return m_imp_ptr.get() == 0 ? empty_string.c_str()
-                                   : m_imp_ptr->m_what.c_str();
-     }
- 
      namespace detail
      {
--- 231,234 ----

[Cpptool-cvs] rfta/deplib/boostcvs/libs/filesystem/test convenience_test.cpp,1.2,1.3

From: Baptiste L. <bl...@us...> - 2004-06-13 11:57:03

Update of /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3989/libs/filesystem/test

Modified Files:
	convenience_test.cpp 
Log Message:
* added boost 1.30.2 headers & sources

Index: convenience_test.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/deplib/boostcvs/libs/filesystem/test/convenience_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** convenience_test.cpp	10 May 2003 15:17:32 -0000	1.2
--- convenience_test.cpp	13 Jun 2004 11:56:54 -0000	1.3
***************
*** 36,67 ****
    BOOST_TEST( fs::is_directory( "xx/ww" ) );
    BOOST_TEST( fs::is_directory( "xx/ww/zz" ) );
-   
- // extension() tests ----------------------------------------------------------//
- 
-   BOOST_TEST( fs::extension("a/b") == "" );
-   BOOST_TEST( fs::extension("a/b.txt") == ".txt" );
-   BOOST_TEST( fs::extension("a/b.") == "." );
-   BOOST_TEST( fs::extension("a.b.c") == ".c" );
-   BOOST_TEST( fs::extension("a.b.c.") == "." );
-   BOOST_TEST( fs::extension("") == "" );
-   BOOST_TEST( fs::extension("a/") == "" );
-   
- // basename() tests ----------------------------------------------------------//
- 
-   BOOST_TEST( fs::basename("b") == "b" );
-   BOOST_TEST( fs::basename("a/b.txt") == "b" );
-   BOOST_TEST( fs::basename("a/b.") == "b" ); 
-   BOOST_TEST( fs::basename("a.b.c") == "a.b" );
-   BOOST_TEST( fs::basename("a.b.c.") == "a.b.c" );
-   BOOST_TEST( fs::basename("") == "" );
-   
- // change_extension tests ---------------------------------------------------//
- 
-   BOOST_TEST( fs::change_extension("a.txt", ".tex").string() == "a.tex" );
-   BOOST_TEST( fs::change_extension("a.", ".tex").string() == "a.tex" );
-   BOOST_TEST( fs::change_extension("a", ".txt").string() == "a.txt" );
-   BOOST_TEST( fs::change_extension("a.b.txt", ".tex").string() == "a.b.tex" );  
-   // see the rationale in html docs for explanation why this works
-   BOOST_TEST( fs::change_extension("", ".png").string() == ".png" );
  
    return 0;
--- 36,39 ----

[Cpptool-cvs] CppParser README.txt,1.1.1.1,1.2

From: Baptiste L. <bl...@us...> - 2004-06-09 18:10:30

Update of /cvsroot/cpptool/CppParser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3977

Modified Files:
	README.txt 
Log Message:
* added instruction about the dependencies

Index: README.txt
===================================================================
RCS file: /cvsroot/cpptool/CppParser/README.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README.txt	8 Jun 2004 20:23:10 -0000	1.1.1.1
--- README.txt	9 Jun 2004 18:10:21 -0000	1.2
***************
*** 16,18 ****
--- 16,33 ----
  When advanced enough, it will be merged back into the rfta project (IDE plug-ins won't change much).
  
+ To build, you need to get the precompiled dependencies from sourceforge download page (Build Dependencies package).
+ You will need WinRAR 3.1 to unpack it. Unpack it over you're CppParser directory. The final structure should be something like
+ this:
+ 
+ example/...
+ include/boost
+ include/cpput
+ libs/booost/...
+ src/...
+ 
+ To build the new approach, open the sln or dsw workspace found in example/parser depending on the version of VC++ you are using.
+ 
+ Be sure to use the DEBUG configuration. There is still a few crash in the release configuration that I haven't been able
+ to figure out (any help is welcome on this, Purify has proven useless for this issue).
+ 
  Baptiste Lepilleur <gai...@fr...>

[Cpptool-cvs] rfta AUTHORS,1.3,1.4

From: <bl...@us...> - 2004-03-03 20:02:42

Update of /cvsroot/cpptool/rfta
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32623

Modified Files:
	AUTHORS 
Log Message:
* dummy update to test syncmail

Index: AUTHORS
===================================================================
RCS file: /cvsroot/cpptool/rfta/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AUTHORS	25 May 2003 07:49:59 -0000	1.3
--- AUTHORS	3 Mar 2004 19:42:01 -0000	1.4
***************
*** 1 ****
! Baptiste Lepilleur <gai...@fr...> http://gaiacrtn.free.fr/Sven Reichard <rei...@ma...> (Linux port)Andre Baresel
\ No newline at end of file
--- 1,3 ----
! Baptiste Lepilleur <gai...@fr...> http://gaiacrtn.free.fr/
! Sven Reichard <rei...@ma...> (Linux port)
! Andre Baresel

[Cpptool-cvs] rfta/src/rftaparser rftaparser.dsp,1.59,1.60

From: <net...@us...> - 2004-01-13 22:42:24

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

Modified Files:
	rftaparser.dsp 
Log Message:
-- unused file removed

Index: rftaparser.dsp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.dsp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** rftaparser.dsp	13 Jan 2004 22:28:47 -0000	1.59
--- rftaparser.dsp	13 Jan 2004 22:42:21 -0000	1.60
***************
*** 1615,1622 ****
  
  # End Source File
- # Begin Source File
- 
- SOURCE=.\TextDocumentMock.h
- # End Source File
  # End Group
  # Begin Group "Docs"
--- 1615,1618 ----

[Cpptool-cvs] rfta/include/rfta/refactoring TransformList.h,1.1,1.2

From: <net...@us...> - 2004-01-13 22:39:38

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

Modified Files:
	TransformList.h 
Log Message:
preprocessor implementation

Index: TransformList.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/TransformList.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransformList.h	20 Dec 2003 08:59:50 -0000	1.1
--- TransformList.h	13 Jan 2004 22:39:35 -0000	1.2
***************
*** 18,21 ****
--- 18,23 ----
  class Transform;
  class TextDocument;
+ class Source;
+ typedef boost::shared_ptr<Source> SourcePtr;
  
  
***************
*** 45,49 ****
--- 47,55 ----
     void apply( TextDocument &document );
  
+    void apply( SourcePtr pSource );
+ 
  private:
+    void sortListByStartIndex();
+ 
     /// Prevents the use of the copy constructor.
     TransformList( const TransformList &other );
***************
*** 54,59 ****
     struct SortPredicate;
  
-    void sortListByStartIndex();
- 
  private:
     typedef boost::shared_ptr<Transform> TransformPtr;
--- 60,63 ----
***************
*** 67,71 ****
  // ----------------------------------
  
- 
  } // namespace Refactoring
  
--- 71,74 ----

[Cpptool-cvs] rfta/src/rfta PreProcessTransform.cpp,1.1,NONE PreProcessTransform.h,1.1,NONE

From: <net...@us...> - 2004-01-13 22:37:41

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

Removed Files:
	PreProcessTransform.cpp PreProcessTransform.h 
Log Message:
-- old preprocessing implementation

--- PreProcessTransform.cpp DELETED ---

--- PreProcessTransform.h DELETED ---

[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

From: <net...@us...> - 2004-01-13 22:30:48

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 );

[Cpptool-cvs] rfta/include/rfta/parser ASTNodeForward.h,1.2,1.3 CPPParser.h,1.3,1.4 SourceASTNode.h,1.9,1.10

From: <net...@us...> - 2004-01-13 22:30:48

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

Modified Files:
	ASTNodeForward.h CPPParser.h SourceASTNode.h 
Log Message:
-- integrated preprocessor (replaced all NonSemanticBlanker)

Index: ASTNodeForward.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/ASTNodeForward.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ASTNodeForward.h	22 Dec 2002 16:03:50 -0000	1.2
--- ASTNodeForward.h	13 Jan 2004 22:30:44 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  class ASTNodeVisitor;
  class SourceASTNode;
+ class Source;
  
  typedef boost::shared_ptr<ASTNode> ASTNodePtr;
***************
*** 25,28 ****
--- 26,31 ----
  typedef boost::shared_ptr<SourceASTNode> SourceASTNodePtr;
  typedef boost::weak_ptr<SourceASTNode> SourceASTNodeWeakPtr;
+ typedef boost::weak_ptr<Source> SourceWeakPtr;
+ typedef boost::shared_ptr<Source> SourcePtr;
  
  } // namespace Refactoring

Index: CPPParser.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/CPPParser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CPPParser.h	29 Apr 2003 22:00:50 -0000	1.3
--- CPPParser.h	13 Jan 2004 22:30:44 -0000	1.4
***************
*** 28,31 ****
--- 28,34 ----
     void parseAll();
  
+    int getPreProcessedPosition(int ofs);
+    SourceRange getPreProcessedRange(SourceRange orignal);
+ 
  private:
     ASTNodePtr findFunctionImplementationAt( int position, 
***************
*** 34,37 ****
--- 37,41 ----
  private:
     SourceASTNodePtr sourceNode_;
+    SourcePtr sourceDoc_;
  };
  

Index: SourceASTNode.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/SourceASTNode.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SourceASTNode.h	4 May 2003 07:34:06 -0000	1.9
--- SourceASTNode.h	13 Jan 2004 22:30:44 -0000	1.10
***************
*** 24,28 ****
      */
     static SourceASTNodePtr create( const std::string &blankedSource,
!                                    const std::string &realSource );
     
     /// Destructor.
--- 24,29 ----
      */
     static SourceASTNodePtr create( const std::string &blankedSource,
!                                    const std::string &realSource,
!                                    const SourcePtr sourceDoc );
     
     /// Destructor.
***************
*** 41,52 ****
     Xtl::CStringView getOriginalSource() const;
  
  
  protected:
     /*! Constructs a SourceASTNode object.
-     * \exception std::invalid_argument if blankedSource & realSource lengths are
-     *            not equal.
      */
     SourceASTNode( const std::string &blankedSource,
!                   const std::string &realSource );
     
  private:
--- 42,54 ----
     Xtl::CStringView getOriginalSource() const;
  
+    SourcePtr getSource() const;
+ 
  
  protected:
     /*! Constructs a SourceASTNode object.
      */
     SourceASTNode( const std::string &blankedSource,
!                   const std::string &realSource,
!                   const SourcePtr sourceDoc );
     
  private:
***************
*** 54,57 ****
--- 56,60 ----
     const std::string realSource_;
     const char *blankedSourceStart_;
+    const SourcePtr sourceDoc_;  // Source Container
  };

[Cpptool-cvs] rfta/include/rfta/parser PreProcessor.h,1.1,1.2

From: <net...@us...> - 2004-01-13 22:30:09

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

Modified Files:
	PreProcessor.h 
Log Message:
preprocessor implementation

Index: PreProcessor.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/parser/PreProcessor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PreProcessor.h	16 Dec 2003 13:46:59 -0000	1.1
--- PreProcessor.h	13 Jan 2004 22:30:05 -0000	1.2
***************
*** 10,14 ****
  
  #include <rfta/parser/Config.h>
! #include "MacroReplaceListener.h"
  
  namespace Refactoring
--- 10,15 ----
  
  #include <rfta/parser/Config.h>
! #include "PreProcessorContext.h"
! #include <set>
  
  namespace Refactoring
***************
*** 16,21 ****
     class RFTAPARSER_API PreProcessor
     {
!    public:
!       PreProcessor( const std::string &textToPreProcess);
        
        /**
--- 17,22 ----
     class RFTAPARSER_API PreProcessor
     {
!    public:      
!       PreProcessor( const SourcePtr source, PreProcessorContext& context );
        
        /**
***************
*** 23,29 ****
         *         whenever a replacement takes place the listener will be called.
         */
!       std::string process(MacroReplaceListener& listener);
     private:
!      std::string            toPreProcess_;
     };
  }
--- 24,83 ----
         *         whenever a replacement takes place the listener will be called.
         */
!       std::string process();
! 
!       enum OptionType {
!          skipIncludes
!       };
! 
!       /**
!        * set pre processor options
!        */ 
!       void setOption(OptionType);
! 
!       bool isOptionSet(OptionType);
!    
     private:
!       PreProcessorContext    context_;
! 
!       std::string            toPreProcess_;
!       SourcePtr              source_;
! 
!       typedef std::set<OptionType> OptionSet;
!       OptionSet                    options_;
! 
!       static bool isEol( char c );
!       const char *deleteUntilEol( const char *current );
!       const char *deleteCComment( const char *current );
!       const char *blanksNewLine( const char *current );
!       const char *blanksString( const char *current,
!                                 char endOfStringChar );
!       const char *blanksPreprocessorDirective( const char *current );
!       void blanksStringsAndPreprocessorDirectives( );
! 
!       const char *parseDirective( const char *first,const char *last );
! 
!       bool checkIfDef(const char * start, const char * end);
!       const char * skipUntilElseEndIf(const char * start);
!       
!       const char *textStart_;
!       const char *textEnd_;
!       
!       std::string             blanked_;
!       bool newLine_;
!       const char* current_;
!       int  offset_diff;
! 
!       // hide copy constructor
!       PreProcessor(const PreProcessor&);
! 
!       void addSpaceReplacement(const int start, const int len);
!       void addTextDeletion(const int start, const int len);
!       void addTextReplacement(const int start, const int len, std::string text);
! 
!       const char * handleDefine(const char *first, const char *last );
!       const char * handleInclude(const char *first, const char *last );
! 
!       static bool checkNoneWhiteSpace(const std::string& text);
! 
     };
  }

[Cpptool-cvs] rfta/include/rfta/parser PlainTextDocument.h,NONE,1.1 TextDocument.h,NONE,1.1

From: <net...@us...> - 2004-01-13 22:29:55

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

Added Files:
	PlainTextDocument.h TextDocument.h 
Log Message:
-- moved closer to preprocessor

--- NEW FILE: PlainTextDocument.h ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2002, Baptiste Lepilleur.
// Created: 2002/10/31
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_PLAINTEXTDOCUMENT_H
#define RFTA_PLAINTEXTDOCUMENT_H

#include <rfta/parser/Config.h>
#include <rfta/parser/SourceRange.h>
#include <rfta/parser/TextDocument.h>
#include <boost/utility.hpp>


namespace Refactoring
{


/// Plain TextDocument, backed up by a simple string.
class RFTAPARSER_API PlainTextDocument : public TextDocument
                                 , public boost::noncopyable
{
public:
   PlainTextDocument();

   PlainTextDocument( const std::string &content );

   /// Destructor.
   virtual ~PlainTextDocument();

   /*! Gets the text of the document.
   * \return Text of the document. EOL are in the original text format.
   * \warning Discard current selection.
   */
   const std::string getAllText() const;

   std::string getTextRange( const Refactoring::SourceRange &range );

   void replaceTextRange( const Refactoring::SourceRange &range,
                          const std::string &text );

private:
   std::string content_;
};



// Inlines methods for PlainTextDocument:
// --------------------------------------


} // namespace Refactoring



#endif  // RFTA_PLAINTEXTDOCUMENT_H

--- NEW FILE: TextDocument.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file Rfta/TextDocument.h for class TextDocument
// (c)Copyright 2002, Baptiste Lepilleur.
// Created: 2001/10/14
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_TEXTDOCUMENT_H_INCLUDED
#define RFTA_TEXTDOCUMENT_H_INCLUDED

#include <rfta/parser/Config.h>
#include <rfta/parser/SourceRange.h>
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <string>

namespace Refactoring
{

class TextDocument;
typedef boost::shared_ptr<TextDocument> TextDocumentPtr;

/*! \brief This class represents an abstract text document.
 */
class RFTAPARSER_API TextDocument: public boost::enable_shared_from_this<TextDocument>
{
public:

   /// Destructor.
   virtual ~TextDocument() { /* to make sure correct destructor will be called */ }

   /*! Gets the text of the document.
    * \return Text of the document. EOL are in the original text format.
    * \warning Discard current selection.
    */
   virtual const std::string getAllText() const =0;

   /*! Gets the text of the specified text range.
    * \param range Range of text to return.
    * \return Text of the specified text range.
    */
   virtual std::string getTextRange( const Refactoring::SourceRange &range ) = 0;

   /*! Replaces the text of a given text range with the specified text.
    * \param range Range of text to replace. Length may be null is text 
    *              is being inserted.
    * \param text Text that replace the specified range. May be empty if 
    *             the text range is being deleted.
    */
   virtual void replaceTextRange( const Refactoring::SourceRange &range,
                                  const std::string &text ) = 0;

private:
};



// Inlines methods for AbstractTextDocument:
// -----------------------------------------

} // namespace Refactoring


#endif  // RFTA_TEXTDOCUMENT_H_INCLUDED

[Cpptool-cvs] rfta/include/rfta/parser FileSourceManager.h,NONE,1.1 PositionTranslator.h,NONE,1.1 PreProcessorContext.h,NONE,1.1 Source.h,NONE,1.1 SourceManager.h,NONE,1.1

From: <net...@us...> - 2004-01-13 22:29:31

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

Added Files:
	FileSourceManager.h PositionTranslator.h PreProcessorContext.h 
	Source.h SourceManager.h 
Log Message:
preprocessor implementation

--- NEW FILE: FileSourceManager.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file FileSourceManager.h for class FileSourceManager
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/12/28
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_FILESOURCEMANAGER_H
#define RFTA_FILESOURCEMANAGER_H

#include <rfta/parser/Config.h>
#include <boost/shared_ptr.hpp>
#include <rfta/parser/SourceManager.h>
#include <boost/filesystem/path.hpp>
#include <vector>

namespace Refactoring
{

/** 
 * FileSourceManager.
 *   A SourceManager implementation doing direct file system access.
 *   This is only useful for console application based refactoring.
 */

class FileSourceManager: public SourceManager
{
public:
   /*! Constructs a FileSourceManager object.
    */
   FileSourceManager() { }

   /// Destructor.
   virtual ~FileSourceManager() { }

   /**
    * create an source object for the given name.
    */
   virtual SourcePtr open(std::string sourceName);

   void setRoot(const boost::filesystem::path& sourcePath);

   /**
    * set an additional include path.
    */
   void setInclude(std::string includeDir);

private:
   typedef std::vector<boost::filesystem::path> PathList;
   boost::filesystem::path    sourcePath_;
   PathList                   includeDirList_;
};


// Inlines methods for FileSourceManager:
// ----------------------------------

inline void 
FileSourceManager::setRoot(const boost::filesystem::path& sourcePath)
{
   sourcePath_ = sourcePath;
}

inline void
FileSourceManager::setInclude(std::string includeDir)
{
   includeDirList_.push_back(boost::filesystem::path( includeDir ,boost::filesystem::native ));
}


} // namespace Refactoring



#endif  // RFTA_FILESOURCEMANAGER_H

--- NEW FILE: PositionTranslator.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file PositionTranslator.h for class PositionTranslator
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/12/31
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_POSITIONTRANSLATOR_H
#define RFTA_POSITIONTRANSLATOR_H

#include <rfta/parser/Config.h>
#include <boost/shared_ptr.hpp>
#include <map>
#include <rfta/parser/SourceRange.h>

namespace Refactoring
{

class PositionTranslator;
typedef boost::shared_ptr<PositionTranslator> PositionTranslatorPtr;

/// PositionTranslator.
class RFTAPARSER_API PositionTranslator
{
public:
   /*! Constructs a PositionTranslator object.
    */
   PositionTranslator();

   void addReplacement(const SourceRange& range, int replacementLen);

   /**
    * translates the position of preprocessed source code into 
    * the original range.
    */
   SourceRange translate(const SourceRange& range) const;

   /**
    * translates the position of original source code into 
    * the range in preprocessed.
    */
   SourceRange reverseTranslate(const SourceRange& range) const;
   
private:
   struct Transposition { 
      SourceRange    origin_;
      int            offsetDifference_;
      SourceRange    preprocessed_;
   };

   typedef std::map<int, Transposition> TranslationMap;

   TranslationMap translationMap_;

   TranslationMap::const_iterator getLower(int index) const;
   TranslationMap::const_iterator getUpper(int index) const;

   void changeFollowingTranslation(TranslationMap::iterator first, int moveBy);
};



// Inlines methods for PositionTranslator:
// ----------------------------------
inline
PositionTranslator::PositionTranslator()
{
}

} // namespace Refactoring



#endif  // RFTA_POSITIONTRANSLATOR_H

--- NEW FILE: PreProcessorContext.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file PreProcessorContextContext.h for class PreProcessorContext
// (c)Copyright 2003, Andre Baresel
// Created: 2003/12/27
// //////////////////////////////////////////////////////////////////////////
#include <string>
#include <stack>

#ifndef REFACTORING_PREPROCESSORCONTEXT_H_INCLUDED
#define REFACTORING_PREPROCESSORCONTEXT_H_INCLUDED

#include <rfta/parser/Config.h>
#include "SourceManager.h"

namespace Refactoring
{
   class RFTAPARSER_API PreProcessorContext
   {
   public:
      PreProcessorContext(SourceManager& manager);

      SourceManager& getSourceManager() const;

      /**
       * set 'source' as active source and store
       * the former source-ptr.
       */
      void enterSource(SourcePtr source);

      /**
       * leave current source and return to parent.
       * (restore former source-ptr)
       */
      void leaveSource();

      /**
       * test for identifier in macro list.
       */
      bool isMacroIdentifier( std::string identifier );
      
      /**
       * returns the replacement text for macro identifier
       * @throw PreProcessorError if macro identifier is not defined.
       */
      std::string getMacroReplacement( std::string macroident );

      /**
       * inserts a none parameterized macro replacement entry
       */
      void addMacro(std::string ident, std::string replacement);

   private:
      typedef std::map< std::string , std::string > MacroDefMap;
      /// storage for directives
      /// 1. include information
      /// 2. macro definitions
      MacroDefMap    macroDef_;
      
      SourceManager&       sourceManager_;
      SourcePtr            source_;

      typedef std::stack<SourcePtr> SourceStack;
      SourceStack sources_;
   };

   // INLINE CODE:
   inline 
      PreProcessorContext::PreProcessorContext(SourceManager& manager)
      :sourceManager_(manager)      
   {
   }

   inline SourceManager& 
      PreProcessorContext::getSourceManager() const
   {
      return sourceManager_;
   }
}

#endif // REFACTORING_PREPROCESSORCONTEXT_H_INCLUDED

--- NEW FILE: Source.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file Source.h for class Source
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/12/21
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_SOURCE_H
#define RFTA_SOURCE_H

#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <rfta/parser/TextDocument.h>
#include <deque>
#include "SourceRange.h"
#include <rfta/parser/PositionTranslator.h>

namespace Refactoring
{

class Source;
typedef boost::shared_ptr<Source> SourcePtr;
typedef boost::weak_ptr<Source> SourceWeakPtr;

/// Source.
class RFTAPARSER_API Source
{
public:
   /*! Constructs a Source object.
    */
   Source(TextDocumentPtr document);

   /*! Constructs a Source object.
    */
   Source(TextDocumentPtr document, std::string identifier);

   /**
    * store range of an include
    *
    * @param range   source range within original source text
    */
   void registerInclude(const SourceRange& range, int includeLength, const SourcePtr include);

   /**
    * store range of a text replacement (e.g. Macro)
    *
    * @param range   source range within original source text
    */
   void registerReplacement(const SourceRange& range, int replacementLen);

   /**
    * returns the range in preprocessed source
    */
   SourceRange getRangePreProcessed(const SourceRange& range);

   /**
    * returns the range in original source
    */
   SourceRange getRangeOrigin(const SourceRange& range) const;

   /**
    * returns the original source text.
    */
   std::string getOriginalText() const;

   /**
    * returns the source that holds the range.
    * (does care about includes and forwards the request)
    *
    * @param range   source range within preprocessed source text
    */
   Source& getSourceOrigin(const SourceRange& range);

   /**
    * return the source text of the range in original file.
    * (does translate the position and uses the original source)
    * (does care about includes and forwards the request)
    *
    * @param range   source range within preprocessed source text
    */
   std::string getOriginalText(const SourceRange& range);

   /**
    * @param index position in preprocessed source text.
    *
    * @return line number
    */
   int getLineNumberOf(int index) const;

   std::string getIdentifier() const;

   TextDocumentPtr getTextDocument();

   /// Destructor.
   virtual ~Source();

private:
  struct IncludeEntry {
    SourceRange range_;
    SourceRange preprocessedRange_;
    SourcePtr   include_;
  };
  typedef std::deque<IncludeEntry> IncludeList;
  
  IncludeList includeList_;

  TextDocumentPtr document_;

  std::string identifier_;

  PositionTranslator translator_;

  IncludeList::const_iterator getSourceOriginInternal(const SourceRange& range) const;
};



// Inlines methods for Source:
// ----------------------------------

inline std::string 
Source::getOriginalText() const
{
   return document_->getAllText();
}

inline TextDocumentPtr
Source::getTextDocument()
{
   return document_;
}

inline std::string 
Source::getIdentifier() const
{
   return identifier_;
}


} // namespace Refactoring



#endif  // RFTA_SOURCE_H

--- NEW FILE: SourceManager.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file SourceManager.h for class SourceManager
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/12/21
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_SOURCEMANAGER_H
#define RFTA_SOURCEMANAGER_H

#include <boost/shared_ptr.hpp>
#include <rfta/parser/Config.h>
#include <rfta/parser/TextDocument.h>

namespace Refactoring
{

class Source;
typedef boost::shared_ptr<Source> SourcePtr;

/// SourceManager.
class RFTAPARSER_API SourceManager
{
public:
   /*! Constructs a SourceManager object.
    */
   SourceManager() { }

   /// Destructor.
   virtual ~SourceManager() { }

   /**
    * create an source object for the given name.
    */
   virtual SourcePtr open(std::string sourceName) = 0;
};

class NullSourceManager: public SourceManager
{
public:
   SourcePtr open(std::string sourceName);
};



// Inlines methods for SourceManager:
// ----------------------------------

inline SourcePtr 
NullSourceManager::open(std::string sourceName)
{
   return SourcePtr();
}


} // namespace Refactoring



#endif  // RFTA_SOURCEMANAGER_H

[Cpptool-cvs] rfta/include/rfta/test SourceManagerMock.h,NONE,1.1

From: <net...@us...> - 2004-01-13 22:29:31

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

Added Files:
	SourceManagerMock.h 
Log Message:
preprocessor implementation

--- NEW FILE: SourceManagerMock.h ---
// //////////////////////////////////////////////////////////////////////////
// Header file SourceManagerMock.h for class SourceManagerMock
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/12/27
// //////////////////////////////////////////////////////////////////////////

#ifndef RFTA_SOURCEMANAGERMOCK_H
#define RFTA_SOURCEMANAGERMOCK_H

#include <rfta/parser/SourceManager.h>

namespace Refactoring
{

   namespace Testing
   {
      class SourceManagerMock: public SourceManager
      {
      public:
         /**
          * create an source object for the given name.
          */
         SourcePtr open(std::string sourceName);

         void setSource(std::string sourceName, SourcePtr pSource);

      private:
         std::map<std::string,SourcePtr> sourceMap_;
      };
   }
}


#endif // RFTA_SOURCEMANAGERMOCK_H

[Cpptool-cvs] rfta/src/rftaparser rftaparser.dsp,1.58,1.59