Menu
▾
▴
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
|
|
From: <net...@us...> - 2003-05-16 08:30:37
|
Update of /cvsroot/cpptool/rfta/src/rftaparser In directory sc8-pr-cvs1:/tmp/cvs-serv26093/src/rftaparser Modified Files: rftaparser.dsp Log Message: -- deactivated tests in release version Index: rftaparser.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.dsp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** rftaparser.dsp 12 May 2003 19:31:35 -0000 1.55 --- rftaparser.dsp 16 May 2003 08:30:33 -0000 1.56 *************** *** 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 /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" # Begin Special Build Tool ! TargetDir=\prg\vc\Rfta\build\rftaparser\Release ! TargetPath=\prg\vc\Rfta\build\rftaparser\Release\rftaparser_mdr.ext TargetName=rftaparser_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 /nologo /dll /debug /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" # Begin Special Build Tool ! TargetDir=\Projects\Cpptool\rfta\build\rftaparser\Release ! TargetPath=\Projects\Cpptool\rfta\build\rftaparser\Release\rftaparser_mdr.ext TargetName=rftaparser_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\rftaparser\Debug/rftaparser_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" # Begin Special Build Tool ! TargetDir=\prg\vc\Rfta\build\rftaparser\Debug ! TargetPath=\prg\vc\Rfta\build\rftaparser\Debug\rftaparser_mdd.ext TargetName=rftaparser_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\rftaparser\Debug/rftaparser_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" # Begin Special Build Tool ! TargetDir=\Projects\Cpptool\rfta\build\rftaparser\Debug ! TargetPath=\Projects\Cpptool\rfta\build\rftaparser\Debug\rftaparser_mdd.ext TargetName=rftaparser_mdd SOURCE="$(InputPath)" *************** *** 762,769 **** --- 762,787 ---- SOURCE=.\DeclarationDetailsParserTest.cpp + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\DeclarationDetailsParserTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File |
|
From: <net...@us...> - 2003-05-16 08:29:21
|
Update of /cvsroot/cpptool/rfta/src/eclipseplugin/PluginCode
In directory sc8-pr-cvs1:/tmp/cvs-serv25626/src/eclipseplugin/PluginCode
Modified Files:
plugin.xml
Log Message:
-- corrected textual description
Index: plugin.xml
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/eclipseplugin/PluginCode/plugin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.xml 15 Feb 2003 13:34:22 -0000 1.1
--- plugin.xml 16 May 2003 08:29:18 -0000 1.2
***************
*** 2,8 ****
<plugin
id="org.eclipse.cpprefactoring"
! name="Helloworld Plug-in"
! version="0.0.0"
! provider-name="My"
class="org.eclipse.cpprefactoring.RefactorPluginMain">
--- 2,8 ----
<plugin
id="org.eclipse.cpprefactoring"
! name="Cpp-Refactoring-Plugin"
! version="0.1.0"
! provider-name="cpprefactoring.sourceforge.net"
class="org.eclipse.cpprefactoring.RefactorPluginMain">
|
|
From: <net...@us...> - 2003-05-16 08:27:49
|
Update of /cvsroot/cpptool/rfta/src/eclipseplugin/PluginCode In directory sc8-pr-cvs1:/tmp/cvs-serv25059/src/eclipseplugin/PluginCode Modified Files: PlugIn-HowTos.txt Log Message: -- updated developer infos Index: PlugIn-HowTos.txt =================================================================== RCS file: /cvsroot/cpptool/rfta/src/eclipseplugin/PluginCode/PlugIn-HowTos.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlugIn-HowTos.txt 15 Feb 2003 13:35:13 -0000 1.1 --- PlugIn-HowTos.txt 16 May 2003 08:27:45 -0000 1.2 *************** *** 27,41 **** How to Debug ? ! Unfortunatly native code is a little bit critical since, the ! cpp code is running as DLL loaded by the JAVA-VM. If the ! DLL crashes, the complete JAVA-VM will be destroyed. ! For this reason "DebugBreak" does also not work at the moment. ! (It seems for me that java.exe has called some win-api function ! to redirect this exception handling. Can we change this for ! debugging ?) ! At the moment we need a very restrictive catching of all ! exceptions in C++. A not catched exception means destroying ! a running exclipse workbench (which is worse of cause). We can throw Java-Exception using the JNI-Interface, so that --- 27,37 ---- How to Debug ? ! DebugBreak does now work. Using this function it's possible to ! stop the execution of that plugin code within any dll-loaded by ! the java-vm. choose cancel to start the vc6 debugger. ! We need a very restrictive catching of all exceptions in C++. ! A not catched exception does destroy the complete exclipse ! workbench, which is worse of cause. We can throw Java-Exception using the JNI-Interface, so that *************** *** 44,51 **** Maybe we introduce a specialized exception class later on. ! By the way: The Plugin and the DLL are loaded when the user ! activates a refactoring action the first time. ! What to do to run the debug mode showing a console: - load the eclipse-plugin project into the workbench (call this debugging workbench) - don't activate the plugin in this workbench ! --- 40,48 ---- Maybe we introduce a specialized exception class later on. ! By the way, the Plugin and the connected DLLs are loaded when ! the user activates a refactoring action the first time. ! What to do to run the plugin in eclipse debug mode ! showing a console: - load the eclipse-plugin project into the workbench (call this debugging workbench) - don't activate the plugin in this workbench ! |
|
From: <net...@us...> - 2003-05-16 08:27:29
|
Update of /cvsroot/cpptool/rfta/src/eclipseplugin In directory sc8-pr-cvs1:/tmp/cvs-serv24922/src/eclipseplugin Added Files: Readme.txt Log Message: -- a brief description of the PlugIn for a binary distribution. --- NEW FILE: Readme.txt --- org.eclipse.cpprefactoring version 0.1.0 GENERAL: Org.eclipse.cpprefactoring is a Eclipse plugin for using the cpp-refactoring library within the eclipse IDE. It allows to execute refactoring operations. INSTALLATION: - Get the C/C++ Developer Plugin for Eclipse (CDT), install it. - Unzip org.eclipse.cpprefactoring_xx.zip into "plugins" subdirectory of the directory where you installed Eclipse. - Restart or start Eclipse. - switch to C/C++ perspective - enable "CppRefactoring" by selecting "Window" -> "Customize Perspective" -> "Other" -> "Cpp Refactoring Actions" As soon as you did this a menu "CppRefactoring" and a tool bar containing refactoring operations should appear. Within a C/Cpp source you can also right click and select a refactoring operation in the popup menu. CONFIGURATION: A configuration is not yet possible/needed. KNOWN ISSUES AND LIMITATIONS: - Only the refactoring operation "Rename Local Temporary" is supported at the moment. The code for the other operations is not yet written. - Some java programming is needed for a better user interface. |
|
From: <net...@us...> - 2003-05-16 08:26:56
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin In directory sc8-pr-cvs1:/tmp/cvs-serv24774/src/rftavc6addin Added Files: cpprefactoring-vc6-addin.txt Log Message: -- a brief description of the AddIn for a binary distribution. --- NEW FILE: cpprefactoring-vc6-addin.txt --- Cpprefactoring-VC6-addin version 0.1.0 GENERAL: Cpprefactoring-VC6-addin is a Microsoft Visual Studio addin for using the cpp-refactoring library within the C/C++ IDE. It allows to execute refactoring operations. INSTALLATION: - Unzip Cpprefactoring-VC6-plugin into "AddIns" subdirectory of the directory where you installed Visual Studio. ( %%Visual-Studio%% \Common\MSDev98\AddIns ) - Start Visual Studio As soon as you did this a toolbar containing refactoring operations should appear. CONFIGURATION: A configuration is not yet possible/needed. KNOWN ISSUES AND LIMITATIONS: - The three implemented refactoring operations can only be activated by the tool bar at the moment. - undo mechanism is not single step, because all replacements done by the refactoring libraries are recorded as seperate actions by the IDE. |
|
From: <bl...@us...> - 2003-05-15 20:04:20
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv22106/src/rftavc7addin
Modified Files:
TextDocumentHelper.cpp TextDocumentHelper.h
TextSelectionHelper.cpp TextSelectionHelper.h
Log Message:
* removed dead code
Index: TextDocumentHelper.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/TextDocumentHelper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextDocumentHelper.cpp 14 May 2003 18:55:50 -0000 1.1
--- TextDocumentHelper.cpp 15 May 2003 19:29:33 -0000 1.2
***************
*** 36,48 ****
- void
- TextDocumentHelper::discardingClose()
- {
- CComPtr<EnvDTE::Document> document;
- _document->get_Parent( &document );
- document->Close( EnvDTE::vsSaveChangesNo );
- }
-
-
int
TextDocumentHelper::getTabSize() const
--- 36,39 ----
***************
*** 52,72 ****
return tabSize;
}
- /*
-
- bool
- TextDocumentHelper::redo() const
- {
- VARIANT_BOOL success;
- _document->Redo( &success );
- return success != 0;
- }
-
-
- bool
- TextDocumentHelper::undo() const
- {
- VARIANT_BOOL success;
- _document->Undo( &success );
- return success != 0;
- }
- */
\ No newline at end of file
--- 43,44 ----
Index: TextDocumentHelper.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/TextDocumentHelper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextDocumentHelper.h 14 May 2003 18:55:50 -0000 1.1
--- TextDocumentHelper.h 15 May 2003 19:29:33 -0000 1.2
***************
*** 26,39 ****
TextSelectionHelper selection() const;
- // EditPointHelper createEditPoint() const;
-
- void discardingClose();
-
int getTabSize() const;
- /*
- bool undo() const;
- bool redo() const;
- */
private:
CComPtr<EnvDTE::TextDocument> _document;
--- 26,31 ----
Index: TextSelectionHelper.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/TextSelectionHelper.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextSelectionHelper.cpp 14 May 2003 18:55:50 -0000 1.1
--- TextSelectionHelper.cpp 15 May 2003 19:29:33 -0000 1.2
***************
*** 28,142 ****
int
- TextSelectionHelper::currentColumn()
- {
- long column;
- _selection->get_CurrentColumn( &column );
- return column;
- }
-
-
- int
- TextSelectionHelper::currentLine()
- {
- long line;
- _selection->get_CurrentLine( &line );
- return line;
- }
-
-
- int
- TextSelectionHelper::selectionTopLine()
- {
- long beginLine;
- _selection->get_TopLine( &beginLine );
- return beginLine;
- }
-
-
- int
- TextSelectionHelper::selectionBottomLine()
- {
- long endLine;
- _selection->get_BottomLine( &endLine );
- return endLine;
- }
-
-
- CString
- TextSelectionHelper::text()
- {
- CComBSTR text;
- _selection->get_Text( &text );
-
- CString toNormalize( text );
- return toNormalize;
- /*
- CString normalized;
- for ( int index = 0; index < toNormalize.GetLength(); ++index )
- {
- if ( toNormalize.GetAt( index ) != '\r' )
- normalized += toNormalize.GetAt( index );
- }
- return normalized;
- */
- }
-
-
- void
- TextSelectionHelper::setText( const CString &newText )
- {
- /*
- CString normalizedText;
- for ( int index =0; index < newText.GetLength(); ++index )
- {
- if ( newText.GetAt( index ) == '\n' )
- normalizedText += '\r';
- normalizedText += newText.GetAt( index );
- }
-
- CComBSTR unicodeText( normalizedText );
- */
- CComBSTR unicodeText( newText );
- // if ( newText.GetLength() > 0 )
- // _selection->Delete( CComVariant(1) );
- _selection->put_Text( unicodeText );
- }
-
-
- void
- TextSelectionHelper::selectAll()
- {
- _selection->SelectAll();
- }
-
-
- void
- TextSelectionHelper::cancelSelection()
- {
- _selection->Cancel();
- }
-
- /*
- void
- TextSelectionHelper::goToLine( int lineNumber,
- bool selectLine )
- {
- _selection->GoToLine( lineNumber, selectLine ? CComVariant(1) :
- CComVariant(0) );
- }
-
-
- void
- TextSelectionHelper::moveTo( int lineNumber,
- int columnNumber,
- bool extendSelection )
- {
- _selection->MoveTo( lineNumber,
- columnNumber,
- CComVariant(extendSelection ? dsExtend : dsMove) );
- }
- */
-
- int
TextSelectionHelper::selectionStartCharOffset()
{
--- 28,31 ----
***************
*** 153,179 ****
TextSelectionHelper::selectionEndCharOffset()
{
- /*
- {
- CComPtr<EnvDTE::VirtualPoint> point;
- CComPtr<EnvDTE::VirtualPoint> point1;
- CComPtr<EnvDTE::VirtualPoint> point2;
- CComPtr<EnvDTE::VirtualPoint> point3;
- long bottom;
- long active;
- long anchor;
- long top;
- _selection->get_BottomPoint( &point );
- point->get_AbsoluteCharOffset( &bottom );
-
- _selection->get_ActivePoint( &point1 );
- point1->get_AbsoluteCharOffset( &active );
-
- _selection->get_AnchorPoint( &point2 );
- point2->get_AbsoluteCharOffset( &anchor );
-
- _selection->get_TopPoint( &point3 );
- point3->get_AbsoluteCharOffset( &top );
- }
- */
CComPtr<EnvDTE::VirtualPoint> point;
_selection->get_BottomPoint( &point );
--- 42,45 ----
Index: TextSelectionHelper.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/TextSelectionHelper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextSelectionHelper.h 14 May 2003 18:55:50 -0000 1.1
--- TextSelectionHelper.h 15 May 2003 19:29:33 -0000 1.2
***************
*** 20,52 ****
bool isValid();
- // End of selection column
- int currentColumn();
-
- // End of selection line
- int currentLine();
-
- // Start of selection line.
- int selectionTopLine();
-
- // End of selection line.
- int selectionBottomLine();
-
- /*! Returns selected text.
- * Returns selected text as contains in the file. \r\n for EOL of
- * DOS file, \n for EOL of Unix file, and \r for EOL of Mac file.
- */
- CString text();
- void setText( const CString &text );
-
- void selectAll();
- void cancelSelection();
- /*
- void goToLine( int lineNumber,
- bool selectLine = true );
-
- void moveTo( int lineNumber,
- int columnNumber,
- bool extendSelection =false );
- */
/// zero based index
int selectionStartCharOffset();
--- 20,23 ----
|
|
From: <bl...@us...> - 2003-05-15 19:47:53
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin In directory sc8-pr-cvs1:/tmp/cvs-serv4604/src/rftavc7addin Modified Files: AddIn.rgs Log Message: * updated registry so that it should install correctly under VS 7.1 Index: AddIn.rgs =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/AddIn.rgs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AddIn.rgs 11 May 2003 22:09:58 -0000 1.3 --- AddIn.rgs 15 May 2003 19:47:50 -0000 1.4 *************** *** 43,47 **** Copyright (c) 2002-2003 by Baptiste Lepilleur, Sven Richard, Andre Baresel and others http://cpptool.sourceforge.net' ! val AboutBoxIcon = b 0000010002002020100000000000E8020000260000001010100000000000280100000E0300002800000020000000400000000100040000000000800200000000000000000000000000000000000000000000000080000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF000000000000000000000000000000000000000000000FFFFFFFFF00000000000000000000000FF44444FF00000000000000000000000FFFFFFFFF000000000000000000FFFF0FF44444FF000000000000000000FF440FFFFFFFFF000000000000000000FFFF0FF44444FF00000000000000FFF0FF440FFFFFFFFF0FFFFFFFFFF000FF40FFFF0FF444FFFF0FFFFFFFFFF000FFF0FF440FFFFFF0000FFFFFFFFFF000FF40FFFF0FF444F0708FF88FFFFFF000FFF0FF440FFFFFF00FFFFFFFFFFFF000FF40FFFF00000000FFFFFFFFFFFFF000FFF0FF444F07088888888FFFFFFFF000FF40FFFFFF00FFFFFFFFFFFFFFFFF000FFF00000000FFFFFFFFFFFFFFFFFF000FF444F0708888888FFF8888FFFFFF000FFFFFF00FFFFFFFFFFFFFFFFFFFFF0000000000FFFFFFFFFF2222F2222FFF000000FFF8888888FF882AAA2AAA2FFF000000FFFFFFFFFFFFFF2AAA2AAA2FFF000000FFFFFFFFFFFF222AAA2AAA222F000000FFF88888888F2AAAAAAAAAAA2F000000FFFFFFFFFFFF2AAAAAAAAAAA2F000000FFFFFFFFFFFFF22AAA2AAA22FF000000FFFFFFFFFFFFF22AAA2AAA22FF0000000000000000002AAAAAAAAAAA200000004444444444442AAAAAAAAAAA24000000444444444444222AAA2AAA2224000000000000000000002AAA2AAA2000000000000000000000002AAA2AAA2000000000000000000000002222022220000FFC007FFFFC007FFFFC007FFF80007FFF80007FFF80007FF80000000800000008000000080000000800000008000000080000000800000008000000080000000800000008000000080000000F0000000F0000000F0000000F0000000F0000000F0000000F0000000F0000000F0000000F0000000F0000000FFFFE00FFFFFE10F2800000010000000200000000100040000000000C00000000000000000000000000000000000000000000000000080000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0000000000000000000000000FFFFFF0000000000F4444F0000000FF0FFFFFF0000000F40F4444F0000FF0FF0FFFFFF0000F40F40F44F000000FF0FF0FFFF000000F40F400000000000FF0FFFF00FFFFF00F400000FBBFBBFF0FFFF00FBBBBBBBF0000000FFBBFBBFF0000000FBBBBBBBF0000000FFBBFBBFF00000000FFFFFFF0FC030000FC030000E0030000E003000000030000000300000003000000070000000F0000003F0000009300000101000003930000FF010000FF930000FFFF0000 val CommandLineSafe = d 0 val CommandPreload = d 1 --- 43,65 ---- Copyright (c) 2002-2003 by Baptiste Lepilleur, Sven Richard, Andre Baresel and others http://cpptool.sourceforge.net' ! val CommandLineSafe = d 0 ! val CommandPreload = d 1 ! val Description = s 'C++ Refactoring Assistant to help automatizing refactoring.' ! val LoadBehavior = d 1 ! val SatelliteDllName = s 'rftavc7addinui.dll' ! val SatelliteDllPath = s '%MODULE_PATH%\resources' ! } ! } ! } ! NoRemove 7.1 ! { ! NoRemove Addins ! { ! ForceRemove 'RFTA' ! { ! val FriendlyName = s 'C++ Refactoring Assistant' ! val AboutBoxDetails = s 'C++ Refactoring Assistant (RFTA) ! Copyright (c) 2002-2003 by Baptiste Lepilleur, Sven Richard, Andre Baresel and others ! http://cpptool.sourceforge.net' val CommandLineSafe = d 0 val CommandPreload = d 1 |
|
From: <bl...@us...> - 2003-05-15 19:41:01
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin In directory sc8-pr-cvs1:/tmp/cvs-serv31313/src/rftavc7addin Added Files: unregister.bat Log Message: * added an unregister.bat script. --- NEW FILE: unregister.bat --- regsvr32 /u rftavc7addin.dll |
|
From: <bl...@us...> - 2003-05-15 19:41:01
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin/rftavc7addinSetup
In directory sc8-pr-cvs1:/tmp/cvs-serv31313/src/rftavc7addin/rftavc7addinSetup
Modified Files:
rftavc7addinSetup.vdproj
Log Message:
* added an unregister.bat script.
Index: rftavc7addinSetup.vdproj
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/rftavc7addinSetup/rftavc7addinSetup.vdproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rftavc7addinSetup.vdproj 14 May 2003 18:55:50 -0000 1.4
--- rftavc7addinSetup.vdproj 15 May 2003 19:40:57 -0000 1.5
***************
*** 64,67 ****
--- 64,73 ----
"Entry"
{
+ "MsmKey" = "8:_BE0905392342433C95A2536A98E6CAA6"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:C:\\PRG\\VC\\RFTAVC7\\SRC\\RFTAVC7ADDIN\\UNREGISTER.BAT"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_C2143E30E84ADF1BB8900CF8CFFE6AAD"
"OwnerKey" = "8:_4F39125FE37B4E7C99CA50E1AEACEF2C"
***************
*** 146,150 ****
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_53BF111FA2689E52EB955007FAC50B84"
{
! "Signature" = "8:2000000080dd2a10d295c1018cb0fcd5e919c30180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCP70D.dll"
"TargetName" = "8:MSVCP70D.dll"
--- 152,156 ----
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_53BF111FA2689E52EB955007FAC50B84"
{
! "Signature" = "8:2000000080dd2a10d295c101069a290e161bc30180dd2a10d295c1010000000000400b0000000000000000006d0073007600630070003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCP70D.dll"
"TargetName" = "8:MSVCP70D.dll"
***************
*** 167,171 ****
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_592247AE469E8CA7008DFAD9B4ECD204"
{
! "Signature" = "8:200000003ea8c41e8019c3016aea16d6e919c30192e1e6058019c3010000000000e01b00000000000000000072006600740061007000610072007300650072005f006d00640064002e00650078007400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005200460054004100500041007e0031002e0045005800540000000000"
"SourcePath" = "8:rftaparser_mdd.ext"
"TargetName" = "8:rftaparser_mdd.ext"
--- 173,177 ----
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_592247AE469E8CA7008DFAD9B4ECD204"
{
! "Signature" = "8:200000003ea8c41e8019c3010022520e161bc301a4e6f576ab1ac3010000000000e01b00000000000000000072006600740061007000610072007300650072005f006d00640064002e00650078007400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005200460054004100500041007e0031002e0045005800540000000000"
"SourcePath" = "8:rftaparser_mdd.ext"
"TargetName" = "8:rftaparser_mdd.ext"
***************
*** 186,192 ****
"IsolateTo" = "8:"
}
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_C2143E30E84ADF1BB8900CF8CFFE6AAD"
{
! "Signature" = "8:2000000080aca7acdf95c101ae76e2d5e919c30180aca7acdf95c1010000000000801d0000000000000000006d00660063003700300064002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MFC70D.DLL"
"TargetName" = "8:MFC70D.DLL"
--- 192,218 ----
"IsolateTo" = "8:"
}
+ "{54DA9790-1474-11D3-8E00-00C04F6837D0}:_BE0905392342433C95A2536A98E6CAA6"
+ {
+ "SourcePath" = "8:..\\unregister.bat"
+ "TargetName" = "8:unregister.bat"
+ "Tag" = "8:"
+ "Folder" = "8:_35EBC673C4CC45569A935CF2127C29EF"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_C2143E30E84ADF1BB8900CF8CFFE6AAD"
{
! "Signature" = "8:2000000080aca7acdf95c101aee5b4b2151bc30180aca7acdf95c1010000000000801d0000000000000000006d00660063003700300064002e0064006c006c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MFC70D.DLL"
"TargetName" = "8:MFC70D.DLL"
***************
*** 229,233 ****
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_D83A07287F2BE87C8D8C57AA65C80DE9"
{
! "Signature" = "8:20000000803a49fed195c1017e89f5d5e919c301803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCR70D.dll"
"TargetName" = "8:MSVCR70D.dll"
--- 255,259 ----
"{54DA9790-1474-11D3-8E00-00C04F6837D0}:_D83A07287F2BE87C8D8C57AA65C80DE9"
{
! "Signature" = "8:20000000803a49fed195c10162aab9b2151bc301803a49fed195c101000000000030080000000000000000006d0073007600630072003700300064002e0064006c006c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"SourcePath" = "8:MSVCR70D.dll"
"TargetName" = "8:MSVCR70D.dll"
***************
*** 746,750 ****
"ProductName" = "8:rftavc7addinSetup"
"ProductCode" = "8:{4F84D796-FDF0-4423-B052-CCB7B4FB29BF}"
! "PackageCode" = "8:{31F05564-7EBC-4A20-83F7-70317DCAA03A}"
"UpgradeCode" = "8:{ACC5C73B-1C78-4058-A615-D0F5260F376B}"
"RestartWWWService" = "11:FALSE"
--- 772,776 ----
"ProductName" = "8:rftavc7addinSetup"
"ProductCode" = "8:{4F84D796-FDF0-4423-B052-CCB7B4FB29BF}"
! "PackageCode" = "8:{04632043-A4D8-4625-8E5F-B71766BD9AE2}"
"UpgradeCode" = "8:{ACC5C73B-1C78-4058-A615-D0F5260F376B}"
"RestartWWWService" = "11:FALSE"
|
|
From: <bl...@us...> - 2003-05-15 19:14:53
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv10890/src/rftavc7addin
Modified Files:
AddIn.rc
Log Message:
* reordered item orders
Index: AddIn.rc
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/AddIn.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddIn.rc 14 May 2003 18:55:50 -0000 1.2
--- AddIn.rc 15 May 2003 19:14:49 -0000 1.3
***************
*** 27,39 ****
//
! IDD_SPLIT_LOCAL_VAR DIALOG 0, 0, 215, 50
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Split Temporary: Enter name of new variable"
! FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "OK",IDOK,36,29,50,14
- PUSHBUTTON "Cancel",IDCANCEL,127,29,50,14
LTEXT "New name:",IDC_STATIC,7,10,37,8
EDITTEXT IDC_NEW_NAME,46,8,162,12,ES_AUTOHSCROLL
END
--- 27,39 ----
//
! IDD_SPLIT_LOCAL_VAR DIALOGEX 0, 0, 215, 50
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Split Temporary: Enter name of new variable"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
LTEXT "New name:",IDC_STATIC,7,10,37,8
EDITTEXT IDC_NEW_NAME,46,8,162,12,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",IDOK,36,29,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,127,29,50,14
END
***************
*** 96,106 ****
//
! IDD_INLINE_LOCAL_VARIABLE DIALOG 0, 0, 315, 53
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
! FONT 8, "MS Sans Serif"
BEGIN
- DEFPUSHBUTTON "OK",IDOK,258,5,50,14
- PUSHBUTTON "Cancel",IDCANCEL,258,24,50,14
LTEXT "Variable that will be inlined:",IDC_STATIC,7,5,86,8
LTEXT "Static",IDC_OLD_NAME,96,5,145,8
--- 96,104 ----
//
! IDD_INLINE_LOCAL_VARIABLE DIALOGEX 0, 0, 315, 53
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
LTEXT "Variable that will be inlined:",IDC_STATIC,7,5,86,8
LTEXT "Static",IDC_OLD_NAME,96,5,145,8
***************
*** 108,111 ****
--- 106,111 ----
"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,16,
133,10
+ DEFPUSHBUTTON "OK",IDOK,258,5,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,258,24,50,14
END
|
|
From: <bl...@us...> - 2003-05-15 19:14:15
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv10451/src/rftavc7addin
Modified Files:
Connect.cpp rftavc7addin.vcproj
Log Message:
* added support for inline locale variable and split temporary refactoring.
Index: Connect.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/Connect.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Connect.cpp 15 May 2003 07:31:43 -0000 1.6
--- Connect.cpp 15 May 2003 19:14:12 -0000 1.7
***************
*** 4,7 ****
--- 4,9 ----
#include "Connect.h"
#include "RenameLocaleVariableDialog.h"
+ #include "RftaInlineLocalVarDialog.h"
+ #include "SplitLocaleVariableDialog.h"
#include "TextSelectionHelper.h"
#include "CommandGroup.h"
***************
*** 128,132 ****
L"Split the selected locale variable declaration",
IDB_SPLITLOCALEVARIABLE );
!
CComPtr<EnvDTE::Command> cmdReduce =
addCommand( *pCommands,
--- 130,134 ----
L"Split the selected locale variable declaration",
IDB_SPLITLOCALEVARIABLE );
! /* // not supported yet
CComPtr<EnvDTE::Command> cmdReduce =
addCommand( *pCommands,
***************
*** 135,139 ****
L"Reduce the scope of the selected local variable",
IDB_REDUCELOCALEVARIABLESCOPE );
!
CComPtr<Office::CommandBar> pToolBar = ensureToolBarExist( *pCommands,
L"C++ Refactoring Assistant",
--- 137,141 ----
L"Reduce the scope of the selected local variable",
IDB_REDUCELOCALEVARIABLESCOPE );
! */
CComPtr<Office::CommandBar> pToolBar = ensureToolBarExist( *pCommands,
L"C++ Refactoring Assistant",
***************
*** 148,184 ****
associateCommand( cmdInline, pToolBar, pMenuBar, index++ );
associateCommand( cmdSplit, pToolBar, pMenuBar, index++ );
! associateCommand( cmdReduce, pToolBar, pMenuBar, index++ );
! /* // The stuff below register the command in a menu named "Tool". We might want to do that too.
!
! CComPtr<Office::_CommandBars> pCommandBars;
! CComPtr<Office::CommandBarControl> pCommandBarControl;
! CComPtr<Office::CommandBar> pMenuBarCommandBar;
!
! // When run, the Add-in wizard prepared the registry for the Add-in.
! // At a later time, the Add-in or its commands may become unavailable for reasons such as:
! // 1) You moved this project to a computer other than which is was originally created on.
! // 2) You chose 'Yes' when presented with a message asking if you wish to remove the Add-in.
! // 3) You add new commands or modify commands already defined.
! // You will need to re-register the Add-in by building the rftavc7addinSetup project,
! // right-clicking the project in the Solution Explorer, and then choosing install.
! // Alternatively, you could execute the ReCreateCommands.reg file the Add-in Wizard generated in
! // the project directory, or run 'devenv /setup' from a command prompt.
! IfFailGoCheck(m_pDTE->get_Commands(&pCommands), pCommands);
! if(SUCCEEDED(pCommands->AddNamedCommand(m_pAddInInstance,
! CComBSTR("RFTARenameLocaleVariable"),
! CComBSTR("RFTARenameLocaleVariable"),
! CComBSTR("Rename the selected locale variable"),
! VARIANT_TRUE,
! 59,
! NULL,
! EnvDTE::vsCommandStatusSupported+EnvDTE::vsCommandStatusEnabled,
! &pCreatedCommand)) && (pCreatedCommand))
! {
! //Add a button to the tools menu bar.
! IfFailGoCheck(m_pDTE->get_CommandBars(&pCommandBars), pCommandBars);
! IfFailGoCheck(pCommandBars->get_Item(CComVariant(L"Tools"), &pMenuBarCommandBar), pMenuBarCommandBar);
! IfFailGoCheck(pCreatedCommand->AddControl(pMenuBarCommandBar, 1, &pCommandBarControl), pCommandBarControl);
! }
! */
return S_OK;
}
--- 150,154 ----
associateCommand( cmdInline, pToolBar, pMenuBar, index++ );
associateCommand( cmdSplit, pToolBar, pMenuBar, index++ );
! // associateCommand( cmdReduce, pToolBar, pMenuBar, index++ );
return S_OK;
}
***************
*** 400,433 ****
AfxMessageBox( message );
- CString msg;
- msg.Format( "Selected range: %s\nSelected Text: %s\nAll Text: %s",
- selectedRange.toString().c_str(),
- document.getTextRange( selectedRange ).c_str(),
- document.getAllText().c_str() );
- AfxMessageBox( msg );
}
-
-
- /*
- CString msg;
- msg.Format( "Selected range: %s\nSelected Text: %s\nAll Text: %s",
- selectedRange.toString().c_str(),
- document.getTextRange( selectedRange ).c_str(),
- document.getAllText().c_str() );
- AfxMessageBox( msg );
-
- Refactoring::SourceRange range( 2, 5 );
- document.replaceTextRange( range, "ABCDE" );
-
- */
- /*
- RenameLocaleVariableDialog dialog;
- dialog.oldName_ = "OldVariableName";
- dialog.newName_ = "NewVariableName";
-
- if ( dialog.DoModal() == IDOK )
- dialog.newName_;
- */
-
}
--- 370,374 ----
***************
*** 436,440 ****
const Refactoring::SourceRange &selectedRange )
{
! AfxMessageBox( "Selected range: " + CString(selectedRange.toString().c_str() ) );
}
--- 377,407 ----
const Refactoring::SourceRange &selectedRange )
{
! try
! {
! Refactoring::InlineTempRefactoring refactoring( document,
! selectedRange.getStartIndex() );
!
! bool addBraces = refactoring.areBracesSuggested();
! RftaInlineLocalVarDialog dialog;
! dialog.m_VariableName = refactoring.getVariableName().c_str();
! dialog.m_AddBraces = addBraces;
!
! if ( dialog.DoModal() == IDOK )
! {
! CString undoName;
! undoName.Format( "Inline locale variable '%s'",
! (LPCTSTR)refactoring.getVariableName().c_str() );
! CommandGroup commands( undoName, m_pDTE );
! refactoring.apply( dialog.m_AddBraces == TRUE );
! commands.validate();
! }
! }
! catch ( Refactoring::RefactoringError &e )
! {
! CString message( "An error occurred during refactoring:\n" );
! message += e.what();
!
! AfxMessageBox( message );
! }
}
***************
*** 443,448 ****
const Refactoring::SourceRange &selectedRange )
{
! AfxMessageBox( "Selected range: " + CString(selectedRange.toString().c_str() ) );
}
void
--- 410,438 ----
const Refactoring::SourceRange &selectedRange )
{
! try
! {
! Refactoring::SplitTempRefactoring refactoring( document,
! selectedRange.getStartIndex() );
!
! SplitLocaleVariableDialog dialog;
! if ( dialog.DoModal() == IDOK )
! {
! CString undoName;
! undoName.Format( "Split locale variable declaration to '%s'",
! LPCTSTR(dialog.m_NewVariableName) );
! CommandGroup commands( undoName, m_pDTE );
! refactoring.apply( LPCTSTR(dialog.m_NewVariableName) );
! commands.validate();
! }
! }
! catch ( Refactoring::RefactoringError &e )
! {
! CString message( "An error occurred during refactoring:\n" );
! message += e.what();
!
! AfxMessageBox( message );
! }
}
+
void
Index: rftavc7addin.vcproj
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/rftavc7addin.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rftavc7addin.vcproj 15 May 2003 07:31:43 -0000 1.3
--- rftavc7addin.vcproj 15 May 2003 19:14:12 -0000 1.4
***************
*** 160,169 ****
</File>
<File
- RelativePath="Connect.cpp">
- </File>
- <File
- RelativePath="Connect.h">
- </File>
- <File
RelativePath="Resource.h">
</File>
--- 160,163 ----
***************
*** 188,210 ****
</Filter>
<Filter
! Name="Refactoring"
Filter="">
<File
! RelativePath="RenameLocaleVariableDialog.cpp">
</File>
<File
! RelativePath="RenameLocaleVariableDialog.h">
</File>
<File
! RelativePath="RftaInlineLocalVarDialog.cpp">
</File>
<File
! RelativePath="RftaInlineLocalVarDialog.h">
</File>
<File
! RelativePath="SplitLocaleVariableDialog.cpp">
</File>
<File
! RelativePath="SplitLocaleVariableDialog.h">
</File>
</Filter>
--- 182,210 ----
</Filter>
<Filter
! Name="Helpers"
Filter="">
<File
! RelativePath="CommandGroup.cpp">
</File>
<File
! RelativePath="CommandGroup.h">
</File>
<File
! RelativePath="TextDocumentHelper.cpp">
</File>
<File
! RelativePath="TextDocumentHelper.h">
</File>
<File
! RelativePath="TextSelectionHelper.cpp">
</File>
<File
! RelativePath="TextSelectionHelper.h">
! </File>
! <File
! RelativePath="VC7TextDocument.cpp">
! </File>
! <File
! RelativePath="VC7TextDocument.h">
</File>
</Filter>
***************
*** 231,258 ****
</File>
</Filter>
! <File
! RelativePath="CommandGroup.cpp">
! </File>
! <File
! RelativePath="CommandGroup.h">
! </File>
! <File
! RelativePath="TextDocumentHelper.cpp">
! </File>
! <File
! RelativePath="TextDocumentHelper.h">
! </File>
! <File
! RelativePath="TextSelectionHelper.cpp">
! </File>
! <File
! RelativePath="TextSelectionHelper.h">
! </File>
! <File
! RelativePath="VC7TextDocument.cpp">
! </File>
! <File
! RelativePath="VC7TextDocument.h">
! </File>
</Files>
<Globals>
--- 231,266 ----
</File>
</Filter>
! <Filter
! Name="GUI"
! Filter="">
! <File
! RelativePath="RenameLocaleVariableDialog.cpp">
! </File>
! <File
! RelativePath="RenameLocaleVariableDialog.h">
! </File>
! <File
! RelativePath="RftaInlineLocalVarDialog.cpp">
! </File>
! <File
! RelativePath="RftaInlineLocalVarDialog.h">
! </File>
! <File
! RelativePath="SplitLocaleVariableDialog.cpp">
! </File>
! <File
! RelativePath="SplitLocaleVariableDialog.h">
! </File>
! </Filter>
! <Filter
! Name="Commands"
! Filter="">
! <File
! RelativePath="Connect.cpp">
! </File>
! <File
! RelativePath="Connect.h">
! </File>
! </Filter>
</Files>
<Globals>
|
|
From: <net...@us...> - 2003-05-15 16:29:56
|
Update of /cvsroot/cpptool/rfta/src/rfta In directory sc8-pr-cvs1:/tmp/cvs-serv18106/src/rfta Modified Files: rfta.dsp Log Message: -- class to support identifier resolve within name scope and class scope Index: rfta.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.dsp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** rfta.dsp 3 May 2003 17:38:45 -0000 1.46 --- rfta.dsp 15 May 2003 16:29:53 -0000 1.47 *************** *** 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)" --- 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)" *************** *** 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)" --- 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)" *************** *** 171,174 **** --- 171,182 ---- # Begin Source File + SOURCE=.\IdentifierScope.cpp + # End Source File + # Begin Source File + + SOURCE=.\IdentifierScope.h + # End Source File + # Begin Source File + SOURCE=.\IdentifierVisitor.cpp # End Source File *************** *** 599,602 **** --- 607,618 ---- !ENDIF + # End Source File + # Begin Source File + + SOURCE=.\IdentifierScopeTest.cpp + # End Source File + # Begin Source File + + SOURCE=.\IdentifierScopeTest.h # End Source File # Begin Source File |
|
From: <net...@us...> - 2003-05-15 16:29:16
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv17550/src/rfta
Modified Files:
VariableDeclVisitorTest.cpp VariableDeclCollectorTest.cpp
ToolsBoxTest.cpp SourceBasedTestBase.h SourceBasedTestBase.cpp
IdentifierVisitorTest.cpp IdentifierResolverTest.cpp
IdentifierResolverContextTest.cpp CodeWriterTestBase.cpp
CodeModelGeneratorTest.cpp
Log Message:
-- modified SourceBasedTestBase to support different Parsers
Index: VariableDeclVisitorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/VariableDeclVisitorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VariableDeclVisitorTest.cpp 27 Oct 2002 19:04:32 -0000 1.2
--- VariableDeclVisitorTest.cpp 15 May 2003 16:29:12 -0000 1.3
***************
*** 7,11 ****
#include "VariableDeclVisitorTest.h"
#include <rfta/parser/ASTNodes.h>
!
namespace Refactoring
--- 7,11 ----
#include "VariableDeclVisitorTest.h"
#include <rfta/parser/ASTNodes.h>
! #include <rfta/Parser/StatementsParser.h>
namespace Refactoring
***************
*** 43,47 ****
VariableDeclVisitorTest::visitAndVerifyExpectations()
{
! parse();
visitNode( sourceNode_ );
verify();
--- 43,47 ----
VariableDeclVisitorTest::visitAndVerifyExpectations()
{
! parse((StatementsParser*)0);
visitNode( sourceNode_ );
verify();
Index: VariableDeclCollectorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/VariableDeclCollectorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VariableDeclCollectorTest.cpp 22 Dec 2002 16:03:53 -0000 1.2
--- VariableDeclCollectorTest.cpp 15 May 2003 16:29:12 -0000 1.3
***************
*** 6,10 ****
#include "stdafx.h"
#include "VariableDeclCollectorTest.h"
!
namespace Refactoring
--- 6,10 ----
#include "stdafx.h"
#include "VariableDeclCollectorTest.h"
! #include <rfta/Parser/StatementsParser.h>
namespace Refactoring
***************
*** 73,77 ****
int zIndex = source_.length();
source_ += "z; } }";
! parse();
CPPUNIT_ASSERT( collector_->collect( sourceNode_ ) );
--- 73,77 ----
int zIndex = source_.length();
source_ += "z; } }";
! parse((StatementsParser*)0);
CPPUNIT_ASSERT( collector_->collect( sourceNode_ ) );
Index: ToolsBoxTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/ToolsBoxTest.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ToolsBoxTest.cpp 27 Apr 2003 22:02:03 -0000 1.15
--- ToolsBoxTest.cpp 15 May 2003 16:29:12 -0000 1.16
***************
*** 11,14 ****
--- 11,15 ----
#include <rfta/parser/ASTNodes.h>
#include <rfta/parser/ParserTools.h>
+ #include <rfta/Parser/StatementsParser.h>
***************
*** 99,103 ****
source_ += "xyz = 123; }";
! parse();
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
--- 100,104 ----
source_ += "xyz = 123; }";
! parse((StatementsParser*)0);
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
***************
*** 114,118 ****
source_ += "yz = 123; }";
! parse();
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
--- 115,119 ----
source_ += "yz = 123; }";
! parse((StatementsParser*)0);
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
***************
*** 128,132 ****
int identifierIndex = source_.length()-2;
! parse();
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
--- 129,133 ----
int identifierIndex = source_.length()-2;
! parse((StatementsParser*)0);
std::string identifier = ToolsBox::getIdentifierAt( identifierIndex,
***************
*** 144,148 ****
" x+= 3;"
"}";
! parse();
ASTNodePtr variable = ToolsBox::findVariableDeclFor( "x",
--- 145,149 ----
" x+= 3;"
"}";
! parse((StatementsParser*)0);
ASTNodePtr variable = ToolsBox::findVariableDeclFor( "x",
***************
*** 166,170 ****
" x+= 3;"
"}";
! parse();
ASTNodePtr variable = ToolsBox::findVariableDeclFor( "x",
--- 167,171 ----
" x+= 3;"
"}";
! parse((StatementsParser*)0);
ASTNodePtr variable = ToolsBox::findVariableDeclFor( "x",
***************
*** 183,187 ****
" x+= 3;"
"}";
! parse();
ToolsBox::SourceRangeList occurrences;
--- 184,188 ----
" x+= 3;"
"}";
! parse((StatementsParser*)0);
ToolsBox::SourceRangeList occurrences;
***************
*** 204,208 ****
int index2 = source_.length();
source_ += "x+= 3;";
! parse();
ToolsBox::SourceRangeList occurrences;
--- 205,209 ----
int index2 = source_.length();
source_ += "x+= 3;";
! parse((StatementsParser*)0);
ToolsBox::SourceRangeList occurrences;
***************
*** 227,231 ****
int identifierLength = identifier.length();
source_ += identifier + "=3;";
! parse();
SourceRange range(ParserTools::findIdentifier(source_.c_str(),
source_.c_str() + source_.size(),
--- 228,232 ----
int identifierLength = identifier.length();
source_ += identifier + "=3;";
! parse((StatementsParser*)0);
SourceRange range(ParserTools::findIdentifier(source_.c_str(),
source_.c_str() + source_.size(),
***************
*** 257,261 ****
source_ += identifier + "=3;"
" }";
! parse();
ToolsBox::SourceRangeList occurrences;
--- 258,262 ----
source_ += identifier + "=3;"
" }";
! parse((StatementsParser*)0);
ToolsBox::SourceRangeList occurrences;
***************
*** 274,278 ****
{
source_ = "int abc_, _abc, abc, xabcy, abd;";
! parse();
ToolsBox::SourceRangeList occurrences;
const std::string identifier( "abc" );
--- 275,279 ----
{
source_ = "int abc_, _abc, abc, xabcy, abd;";
! parse((StatementsParser*)0);
ToolsBox::SourceRangeList occurrences;
const std::string identifier( "abc" );
***************
*** 304,308 ****
"x = 3;" );
! parse();
ASTNodePtr compoundNode = sourceNode_->getChildAt(1);
--- 305,309 ----
"x = 3;" );
! parse((StatementsParser*)0);
ASTNodePtr compoundNode = sourceNode_->getChildAt(1);
Index: SourceBasedTestBase.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/SourceBasedTestBase.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SourceBasedTestBase.h 3 May 2003 17:52:24 -0000 1.7
--- SourceBasedTestBase.h 15 May 2003 16:29:12 -0000 1.8
***************
*** 11,14 ****
--- 11,17 ----
#include <rfta/parser/SourceASTNode.h>
#include <rfta/test/SourceBuilder.h>
+ #include <rfta/parser/ParseContext.h>
+ #include <rfta/parser/MaxLODMutator.h>
+ #include <rfta/parser/NonSemanticBlanker.h>
namespace Refactoring
***************
*** 31,37 ****
void tearDown();
! protected:
! void parse();
! void blankAndParse();
ASTNodePtr getIdentifierNode( const SourceRange &range );
ASTNodePtr getIdentifierNode( const std::string &identifierRangeKey );
--- 34,38 ----
void tearDown();
! protected:
ASTNodePtr getIdentifierNode( const SourceRange &range );
ASTNodePtr getIdentifierNode( const std::string &identifierRangeKey );
***************
*** 41,44 ****
--- 42,80 ----
SourceASTNodePtr sourceNode_;
boost::shared_ptr<Testing::SourceBuilder> builder_;
+
+ template < class ParserType >
+ void parse(ParserType*)
+ {
+ sourceNode_ = SourceASTNode::create( source_, source_ );
+ ParseContext context( sourceNode_ );
+ ParserType parser( context,
+ sourceNode_->getBlankedSourceStart(),
+ sourceNode_->getBlankedSourceEnd() );
+ CPPUNIT_ASSERT( parser.tryParse() );
+
+ // don't bother with lazy parsing for now...
+ MaxLODMutator mutator;
+ mutator.mutate( sourceNode_, sourceNode_ );
+ }
+
+ template < class ParserType >
+ void blankAndParse(ParserType*)
+ {
+ std::string blankedSource;
+ NullPPDirectiveListener nullListener;
+ NonSemanticBlanker blanker( source_, blankedSource, nullListener );
+ blanker.blank();
+
+ sourceNode_ = SourceASTNode::create( blankedSource, source_ );
+ ParseContext context( sourceNode_ );
+ ParserType parser( context,
+ sourceNode_->getBlankedSourceStart(),
+ sourceNode_->getBlankedSourceEnd() );
+ CPPUNIT_ASSERT( parser.tryParse() );
+
+ // don't bother with lazy parsing for now...
+ MaxLODMutator mutator;
+ mutator.mutate( sourceNode_, sourceNode_ );
+ }
};
Index: SourceBasedTestBase.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/SourceBasedTestBase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SourceBasedTestBase.cpp 6 Mar 2003 22:18:41 -0000 1.8
--- SourceBasedTestBase.cpp 15 May 2003 16:29:12 -0000 1.9
***************
*** 8,15 ****
#include <rfta/refactoring/ToolsBox.h>
#include <rfta/parser/ASTNodes.h>
- #include <rfta/parser/MaxLODMutator.h>
- #include <rfta/parser/NonSemanticBlanker.h>
- #include <rfta/parser/ParseContext.h>
- #include <rfta/parser/StatementsParser.h>
--- 8,11 ----
***************
*** 21,25 ****
}
-
SourceBasedTestBase::~SourceBasedTestBase()
{
--- 17,20 ----
***************
*** 45,48 ****
--- 40,44 ----
+ /*
void
SourceBasedTestBase::parse()
***************
*** 59,64 ****
mutator.mutate( sourceNode_, sourceNode_ );
}
!
void
SourceBasedTestBase::blankAndParse()
--- 55,61 ----
mutator.mutate( sourceNode_, sourceNode_ );
}
+ */
! /*
void
SourceBasedTestBase::blankAndParse()
***************
*** 80,83 ****
--- 77,81 ----
mutator.mutate( sourceNode_, sourceNode_ );
}
+ */
Index: IdentifierVisitorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierVisitorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IdentifierVisitorTest.cpp 20 Dec 2002 19:38:03 -0000 1.2
--- IdentifierVisitorTest.cpp 15 May 2003 16:29:12 -0000 1.3
***************
*** 6,10 ****
#include "stdafx.h"
#include "IdentifierVisitorTest.h"
!
namespace Refactoring
--- 6,10 ----
#include "stdafx.h"
#include "IdentifierVisitorTest.h"
! #include <rfta/Parser/StatementsParser.h>
namespace Refactoring
***************
*** 50,54 ****
IdentifierVisitorTest::visitAndVerifyExpectations()
{
! parse();
visitNode( sourceNode_ );
verify();
--- 50,54 ----
IdentifierVisitorTest::visitAndVerifyExpectations()
{
! parse((StatementsParser*)0);
visitNode( sourceNode_ );
verify();
Index: IdentifierResolverTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierResolverTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IdentifierResolverTest.cpp 5 Apr 2003 12:13:00 -0000 1.6
--- IdentifierResolverTest.cpp 15 May 2003 16:29:13 -0000 1.7
***************
*** 6,10 ****
#include "stdafx.h"
#include "IdentifierResolverTest.h"
!
namespace Refactoring
--- 6,10 ----
#include "stdafx.h"
#include "IdentifierResolverTest.h"
! #include <rfta/Parser/StatementsParser.h>
namespace Refactoring
***************
*** 54,58 ****
builder_->addKeyingMid( "", "y", " );", "y.1" );
! parse();
strategy_->setRecordMode();
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "x.1" ) );
--- 54,58 ----
builder_->addKeyingMid( "", "y", " );", "y.1" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->resolveUnqualifiedIdentifier( getIdentifierNode( "x.1" ) );
***************
*** 72,76 ****
builder_->addKeyingMid( "double ", "z", " = 3.14;", "z.0" );
! parse();
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
--- 72,76 ----
builder_->addKeyingMid( "double ", "z", " = 3.14;", "z.0" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
***************
*** 89,93 ****
builder_->addKeyingMid( "", "x", ";", "x.1" );
! parse();
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
--- 89,93 ----
builder_->addKeyingMid( "", "x", ";", "x.1" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "x.0" ) );
***************
*** 108,112 ****
builder_->add( "}" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 108,112 ----
builder_->add( "}" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 126,130 ****
builder_->addKeyingMid( " int ", "y", " = 4;", "y.0" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 126,130 ----
builder_->addKeyingMid( " int ", "y", " = 4;", "y.0" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 149,153 ****
builder_->addKeyingMid( " int ", "z", " = 1;", "z.0" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 149,153 ----
builder_->addKeyingMid( " int ", "z", " = 1;", "z.0" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 174,178 ****
builder_->addKeyingMid( " int ", "y", " = 4;", "y.0" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 174,178 ----
builder_->addKeyingMid( " int ", "y", " = 4;", "y.0" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 197,201 ****
builder_->addKeyingMid( " int ", "x", " = 2;", "x.0" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 197,201 ----
builder_->addKeyingMid( " int ", "x", " = 2;", "x.0" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 224,228 ****
builder_->add( "}" );
! parse();
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
--- 224,228 ----
builder_->add( "}" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->enterNewLocalVariableScope();
***************
*** 264,268 ****
builder_->add( "}" );
! parse();
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "bigBuffer.0" ) );
--- 264,268 ----
builder_->add( "}" );
! parse((StatementsParser*)0);
strategy_->setRecordMode();
strategy_->declareLocalVariable( getVariableNode( "bigBuffer.0" ) );
Index: IdentifierResolverContextTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/IdentifierResolverContextTest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IdentifierResolverContextTest.cpp 10 May 2003 10:55:14 -0000 1.5
--- IdentifierResolverContextTest.cpp 15 May 2003 16:29:13 -0000 1.6
***************
*** 6,10 ****
#include "stdafx.h"
#include "IdentifierResolverContextTest.h"
!
namespace Refactoring
--- 6,10 ----
#include "stdafx.h"
#include "IdentifierResolverContextTest.h"
! #include <rfta/parser/StatementsParser.h>
namespace Refactoring
***************
*** 38,46 ****
}
-
void
IdentifierResolverContextTest::initializeResolver()
! {
! parse();
context_.reset( new IdentifierResolverContext() );
}
--- 38,45 ----
}
void
IdentifierResolverContextTest::initializeResolver()
! {
! parse((StatementsParser *)0);
context_.reset( new IdentifierResolverContext() );
}
Index: CodeWriterTestBase.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeWriterTestBase.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CodeWriterTestBase.cpp 6 Apr 2003 18:06:59 -0000 1.7
--- CodeWriterTestBase.cpp 15 May 2003 16:29:13 -0000 1.8
***************
*** 7,11 ****
#include "CodeWriterTestBase.h"
#include <rfta/refactoring/CodeModel.h>
!
namespace Refactoring
--- 7,11 ----
#include "CodeWriterTestBase.h"
#include <rfta/refactoring/CodeModel.h>
! #include <rfta/Parser/StatementsParser.h>
namespace Refactoring
***************
*** 35,39 ****
CodeWriterTestBase::generateCompound()
{
! blankAndParse();
ASTNodePtr compoundNode = sourceNode_->getChildAt(0);
--- 35,39 ----
CodeWriterTestBase::generateCompound()
{
! blankAndParse((StatementsParser*)0);
ASTNodePtr compoundNode = sourceNode_->getChildAt(0);
Index: CodeModelGeneratorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/CodeModelGeneratorTest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CodeModelGeneratorTest.cpp 21 Apr 2003 03:08:54 -0000 1.8
--- CodeModelGeneratorTest.cpp 15 May 2003 16:29:13 -0000 1.9
***************
*** 9,12 ****
--- 9,13 ----
#include <rfta/refactoring/CodeModelStatements.h>
#include <rfta/refactoring/CodeModelExpressions.h>
+ #include <rfta/Parser/StatementsParser.h>
***************
*** 44,48 ****
source_ = "int x = 3;";
! parse();
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
--- 45,49 ----
source_ = "int x = 3;";
! parse((StatementsParser*)0);
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
***************
*** 75,79 ****
source_ = "const int *x = NULL;";
! parse();
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
--- 76,80 ----
source_ = "const int *x = NULL;";
! parse((StatementsParser*)0);
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
***************
*** 103,107 ****
source_ = "int *x = NULL, **y=&x, *const z;";
! parse();
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
--- 104,108 ----
source_ = "int *x = NULL, **y=&x, *const z;";
! parse((StatementsParser*)0);
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
***************
*** 163,167 ****
source_ = "int (*f)(int);";
! parse();
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
--- 164,168 ----
source_ = "int (*f)(int);";
! parse((StatementsParser*)0);
RFTA_ASSERT_EQUAL( 1, sourceNode_->getChildCount() );
|
|
From: <net...@us...> - 2003-05-15 16:26:32
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv16037/src/rfta
Modified Files:
InlineTempRefactoring.cpp
Log Message:
-- corrected 'todo' string
Index: InlineTempRefactoring.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoring.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InlineTempRefactoring.cpp 27 Apr 2003 22:02:02 -0000 1.8
--- InlineTempRefactoring.cpp 15 May 2003 16:26:29 -0000 1.9
***************
*** 99,104 ****
catch (ParserError e)
{
! // tried to parse outside a function body ?
! // TODO: is this change of the exception ok ? (AndreBaresel)
throw RefactoringError( RefactoringError::identifierIsNotLocalVariable);
}
--- 99,104 ----
catch (ParserError e)
{
! // currently we detect the function body by this parser error.
! // @todo rearrange the parser so that only a function body will be parsed...
throw RefactoringError( RefactoringError::identifierIsNotLocalVariable);
}
|
|
From: <net...@us...> - 2003-05-15 16:25:45
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv15701/src/rfta
Added Files:
IdentifierScopeTest.h IdentifierScopeTest.cpp
IdentifierScope.h IdentifierScope.cpp
Log Message:
-- class to support identifier resolve within name scope and class scope
--- NEW FILE: IdentifierScopeTest.h ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/05/14
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_IDENTIFIERSCOPETEST_H
#define RFTA_IDENTIFIERSCOPETEST_H
#include "IdentifierScope.h"
#include "UnitTesting.h"
namespace Refactoring
{
/// Unit tests for IdentifierScopeTest
class IdentifierScopeTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( IdentifierScopeTest );
CPPUNIT_TEST( testIdentifierResolutionInOneScope );
CPPUNIT_TEST_SUITE_END();
public:
/*! Constructs a IdentifierScopeTest object.
*/
IdentifierScopeTest();
/// Destructor.
virtual ~IdentifierScopeTest();
void setUp();
void tearDown();
void testIdentifierResolutionInOneScope();
};
// Inlines methods for IdentifierScopeTest:
// --------------------------------------------------
} // namespace Refactoring
#endif // RFTA_IDENTIFIERSCOPETEST_H
--- NEW FILE: IdentifierScopeTest.cpp ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/05/14
// //////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "IdentifierScopeTest.h"
#include <boost/weak_ptr.hpp>
#include <rfta/parser/SourceASTNode.h>
#include <rfta/parser/ASTNodes.h>
namespace Refactoring
{
RFTA_TEST_SUITE_REGISTRATION( IdentifierScopeTest );
IdentifierScopeTest::IdentifierScopeTest()
{
}
IdentifierScopeTest::~IdentifierScopeTest()
{
}
void
IdentifierScopeTest::setUp()
{
}
void
IdentifierScopeTest::tearDown()
{
}
void
IdentifierScopeTest::testIdentifierResolutionInOneScope()
{
IdentifierScopePtr rootScope = IdentifierScope::createScope(IdentifierScopeWeakPtr());
IdentifierScopePtr scopeA = IdentifierScope::createSubScope(rootScope,"A");
CPPUNIT_ASSERT_MESSAGE( "Expected a valid root scope.", bool(rootScope) );
CPPUNIT_ASSERT_MESSAGE( "Expected a valid sub scope.", bool(scopeA) );
CPPUNIT_ASSERT_MESSAGE( "Subscope registration wrong.", scopeA == rootScope->getSubScope("A") );
ASTNodePtr nodeB = ASTNode::create(ASTNodeTypes::variableIdentifier,ASTNodeWeakPtr(),0,0,SourceASTNodeWeakPtr());
ASTNodePtr nodeC = ASTNode::create(ASTNodeTypes::variableIdentifier,ASTNodeWeakPtr(),0,0,SourceASTNodeWeakPtr());
rootScope->addIdentifierDeclaration("C",nodeC);
scopeA ->addIdentifierDeclaration("B",nodeB);
try {
ASTNodePtr decl = rootScope->getIdentifierDeclaration("C");
CPPUNIT_ASSERT_MESSAGE( "Expected a AST node.", bool(decl) );
CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Expect a different AST node. (memory adress)", nodeC , decl );
decl = scopeA->getIdentifierDeclaration("::C");
CPPUNIT_ASSERT_MESSAGE( "Expected a AST node.", bool(decl) );
CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Expect a different AST node. (memory adress)", nodeC , decl );
decl = scopeA->getIdentifierDeclaration("B");
CPPUNIT_ASSERT_MESSAGE( "Expected a AST node.", bool(decl) );
CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Expect a different AST node. (memory adress)", nodeB , decl );
decl = rootScope->getIdentifierDeclaration("A::B");
CPPUNIT_ASSERT_MESSAGE( "Expected a AST node.", bool(decl) );
CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Expect a different AST node. (memory adress)", nodeB , decl );
decl = scopeA->getIdentifierDeclaration("::A::B");
CPPUNIT_ASSERT_MESSAGE( "Expected a AST node.", bool(decl) );
CPPUNIT_ASSERT_EQUAL_MESSAGE ( "Expect a different AST node. (memory adress)", nodeB , decl );
}
catch (IdentifierScopeException ex)
{
CPPUNIT_ASSERT_MESSAGE( std::string("Did not expect the following exception: ") + ex.what() , false );
}
}
} // namespace Refactoring
--- NEW FILE: IdentifierScope.h ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/05/13
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_IDENTIFIERSCOPE_H
#define RFTA_IDENTIFIERSCOPE_H
#include <rfta/parser/SourceASTNode.h>
namespace Refactoring
{
class IdentifierScope;
typedef boost::shared_ptr<IdentifierScope> IdentifierScopePtr;
typedef boost::weak_ptr<IdentifierScope> IdentifierScopeWeakPtr;
class IdentifierScopeException: public std::exception
{
public:
enum ExceptionType {
InvalidScope = 1,
InvalidIdentifierName,
WrongQualifiedIdentifier,
IdentifierDeclaredTwice
};
IdentifierScopeException(ExceptionType reason);
virtual const char *what() const;
private:
ExceptionType reason_;
};
/// objects of this class store identifier scopes and sub scopes
/// (identifier visibility, top level is file scope).
class IdentifierScope
{
public:
static IdentifierScopePtr createScope(IdentifierScopeWeakPtr parent);
static IdentifierScopePtr createSubScope(IdentifierScopeWeakPtr parent, std::string scopeName);
/// Destructor. destroyes all information of the scope
virtual ~IdentifierScope();
IdentifierScopeWeakPtr getParentScope() const;
IdentifierScopeWeakPtr getRootScope() const;
bool hasSubScope( std::string scopeName ) const;
IdentifierScopePtr getSubScope(std::string scopeName) const;
void addIdentifierDeclaration( std::string qualifiedName, ASTNodePtr declaration);
ASTNodePtr getIdentifierDeclaration( std::string qualifiedName ) const;
protected:
/*! protects direct creation. use static 'createScope/createSubScope'
*/
IdentifierScope(IdentifierScopeWeakPtr parent);
private:
void registerSubScope(std::string scopeName, IdentifierScopePtr& subScope );
void addLocalIdentifier( std::string localName, ASTNodePtr declaration);
ASTNodePtr getLocalIdentifier( std::string localName );
bool isLocalIdentifier( std::string localName );
typedef std::map<std::string, IdentifierScopePtr> SubScopeMap;
typedef std::map<std::string, ASTNodePtr> IdentifierDeclarationMap;
SubScopeMap subScopes_; //< sub scopes can be defined by types and namespaces
IdentifierDeclarationMap identifierDeclaration_; //< stores declaration of this scope !
IdentifierScopeWeakPtr parent_;
IdentifierScopeWeakPtr root_; // the file scope
};
// Inlines methods for IdentifierScope:
// ----------------------------------------------
inline IdentifierScopeWeakPtr
IdentifierScope::getParentScope() const
{
return parent_;
}
inline IdentifierScopeWeakPtr
IdentifierScope::getRootScope() const
{
return root_;
}
inline IdentifierScope::~IdentifierScope()
{
}
inline IdentifierScopePtr IdentifierScope::createScope(IdentifierScopeWeakPtr parent)
{
IdentifierScopePtr scope( new IdentifierScope(parent) );
if ( ! boost::make_shared(parent) )
scope->root_ = scope;
return scope;
}
inline IdentifierScopeException::IdentifierScopeException(ExceptionType type)
{
reason_ = type;
}
} // namespace Refactoring
#endif // RFTA_IDENTIFIERSCOPE_H
--- NEW FILE: IdentifierScope.cpp ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2003, Andre Baresel.
// Created: 2003/05/13
// //////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "IdentifierScope.h"
namespace Refactoring
{
// constructor, sets parent and root node information
IdentifierScope::IdentifierScope(IdentifierScopeWeakPtr parent)
{
parent_ = parent;
IdentifierScopePtr tmp = boost::make_shared(parent_);
if ( tmp )
root_ = tmp->getRootScope();
}
IdentifierScopePtr
IdentifierScope::createSubScope(IdentifierScopeWeakPtr parent, std::string scopeName)
{
IdentifierScopePtr shrd_p = boost::make_shared(parent);
if ( shrd_p->hasSubScope( scopeName ) )
throw IdentifierScopeException(IdentifierScopeException::InvalidScope);
IdentifierScopePtr subScope = IdentifierScope::createScope(parent);
shrd_p->registerSubScope(scopeName, subScope);
return subScope;
}
bool
IdentifierScope::hasSubScope( std::string scopeName ) const
{
SubScopeMap::const_iterator it = subScopes_.find(scopeName);
return ( it != subScopes_.end() );
}
IdentifierScopePtr
IdentifierScope::getSubScope(std::string scopeName) const
{
SubScopeMap::const_iterator it = subScopes_.find(scopeName);
if ( it != subScopes_.end() )
return it->second;
else
return IdentifierScopePtr ();
}
void
IdentifierScope::registerSubScope(std::string scopeName, IdentifierScopePtr& subScope )
{
subScopes_[scopeName] = subScope;
}
void
IdentifierScope::addIdentifierDeclaration( std::string qualifiedName, ASTNodePtr declaration)
{
int pos = qualifiedName.find(':');
if ( pos != std::string::npos )
{
// check validity of the name:
if ( pos == qualifiedName.length()-1 ||
qualifiedName[pos+1] != ':' )
throw IdentifierScopeException(IdentifierScopeException::InvalidIdentifierName);
// check if qualified name references 'root-scope'
if ( pos == 0 )
boost::make_shared(root_)->addIdentifierDeclaration(qualifiedName.substr(2),declaration);
// find out sub scope:
std::string subScopeName = qualifiedName.substr(0,pos-1);
if (!hasSubScope( subScopeName ))
throw IdentifierScopeException(IdentifierScopeException::WrongQualifiedIdentifier);
// call registration routine of sub scope
getSubScope( subScopeName ) ->addIdentifierDeclaration(qualifiedName.substr(pos+2),declaration);
} else
{
// identifier of this scope.
IdentifierDeclarationMap::iterator it = identifierDeclaration_.find( qualifiedName );
if ( it != identifierDeclaration_.end() )
throw IdentifierScopeException(IdentifierScopeException::IdentifierDeclaredTwice);
identifierDeclaration_[qualifiedName] = declaration;
}
}
ASTNodePtr
IdentifierScope::getIdentifierDeclaration( std::string qualifiedName ) const
{
int pos = qualifiedName.find(':');
if ( pos != std::string::npos )
{
// check validity of the name:
if ( pos == qualifiedName.length()-1 ||
qualifiedName[pos+1] != ':' )
throw IdentifierScopeException(IdentifierScopeException::InvalidIdentifierName);
// check if qualified name references 'root-scope'
if ( pos == 0 )
return boost::make_shared(root_)->getIdentifierDeclaration(qualifiedName.substr(2));
// find out sub scope:
std::string subScopeName = qualifiedName.substr(0,pos);
if (!hasSubScope( subScopeName ))
throw IdentifierScopeException(IdentifierScopeException::WrongQualifiedIdentifier);
// call registration routine of sub scope
return getSubScope( subScopeName ) ->getIdentifierDeclaration(qualifiedName.substr(pos+2));
} else
{
// identifier of this scope.
IdentifierDeclarationMap::const_iterator it = identifierDeclaration_.find( qualifiedName );
if ( it == identifierDeclaration_.end() )
return ASTNodePtr ();
else
return it->second;
}
}
void
IdentifierScope::addLocalIdentifier( std::string localName, ASTNodePtr declaration)
{
}
ASTNodePtr
IdentifierScope::getLocalIdentifier( std::string localName )
{
return ASTNodePtr ();
}
bool IdentifierScope::isLocalIdentifier( std::string localName )
{
return false;
}
const char *
IdentifierScopeException::what() const
{
switch (reason_)
{
case InvalidScope:
return "The specified scope name is not valid.";
case InvalidIdentifierName:
return "The specified identifier name is not valid.";
case WrongQualifiedIdentifier:
return "The identifier qualified name could not be resolved.";
case IdentifierDeclaredTwice:
return "Tried to register identifier declaration twice.";
default:
return "Internal problem. Exception code has not been descriped. (see " __FILE__ " method 'IdentifierScopeException::what')";
}
}
} // namespace Refactoring
|
|
From: <net...@us...> - 2003-05-15 16:24:34
|
Update of /cvsroot/cpptool/rfta/include/rfta/refactoring
In directory sc8-pr-cvs1:/tmp/cvs-serv15096/include/rfta/refactoring
Modified Files:
RefactoringError.h
Log Message:
-- additional exception code
Index: RefactoringError.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/include/rfta/refactoring/RefactoringError.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RefactoringError.h 28 Dec 2002 10:39:38 -0000 1.2
--- RefactoringError.h 15 May 2003 16:24:28 -0000 1.3
***************
*** 25,29 ****
identifierIsNotInitialized, //< exception thrown in InlineTemp
initializerValueNotSupported, //< exception thrown in InlineTemp
! variableIsAssigned //< exception thrown in InlineTemp
};
--- 25,30 ----
identifierIsNotInitialized, //< exception thrown in InlineTemp
initializerValueNotSupported, //< exception thrown in InlineTemp
! variableIsAssigned, //< exception thrown in InlineTemp
! unableToParse //< refactoring operation has been aborded because of a parser error
};
|
|
From: <net...@us...> - 2003-05-15 16:24:34
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv15096/src/rfta
Modified Files:
RefactoringError.cpp
Log Message:
-- additional exception code
Index: RefactoringError.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/RefactoringError.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RefactoringError.cpp 28 Dec 2002 10:39:38 -0000 1.4
--- RefactoringError.cpp 15 May 2003 16:24:29 -0000 1.5
***************
*** 45,48 ****
--- 45,50 ----
case variableIsAssigned:
return "the temporary variable is assigned after initialization.";
+ case unableToParse:
+ return "refactoring tool was not able to parse the source.";
}
|
|
From: <bl...@us...> - 2003-05-15 07:31:46
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv3268/src/rftavc7addin
Modified Files:
Connect.cpp rftavc7addin.vcproj
Added Files:
CommandGroup.cpp CommandGroup.h
Log Message:
* added CommandGroup class to handle grouping command under a single named undo action
* RenameLocaleVariableRefactoring is working !
--- NEW FILE: CommandGroup.cpp ---
#include "StdAfx.h"
#include "Commandgroup.h"
CommandGroup::CommandGroup( const CString &commandName,
CComPtr<EnvDTE::_DTE> application )
{
application->get_UndoContext( &undoContext_ );
VARIANT_BOOL wasOpen;
undoContext_->get_IsOpen( &wasOpen );
wasOpen_ = wasOpen != 0;
if ( !wasOpen_ )
undoContext_->Open( CComBSTR( commandName ), VARIANT_FALSE );
}
CommandGroup::~CommandGroup()
{
cancel();
}
void
CommandGroup::validate()
{
if ( !wasOpen_ )
undoContext_->Close();
wasOpen_ = false;
}
void
CommandGroup::cancel()
{
undoContext_->SetAborted();
}
--- NEW FILE: CommandGroup.h ---
#ifndef RFTAVC7ADDIN_COMMANDGROUP_H_INCLUDED
#define RFTAVC7ADDIN_COMMANDGROUP_H_INCLUDED
class CommandGroup
{
public:
CommandGroup( const CString &commandName,
CComPtr<EnvDTE::_DTE> application );
~CommandGroup();
void validate();
void cancel();
private:
CComPtr<EnvDTE::UndoContext> undoContext_;
bool wasOpen_;
};
#endif // RFTAVC7ADDIN_COMMANDGROUP_H_INCLUDED
Index: Connect.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/Connect.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Connect.cpp 15 May 2003 07:06:46 -0000 1.5
--- Connect.cpp 15 May 2003 07:31:43 -0000 1.6
***************
*** 5,8 ****
--- 5,9 ----
#include "RenameLocaleVariableDialog.h"
#include "TextSelectionHelper.h"
+ #include "CommandGroup.h"
#include "VC7TextDocument.h"
#include <rfta/refactoring/RefactoringError.h>
***************
*** 383,387 ****
--- 384,396 ----
if ( dialog.DoModal() == IDOK )
+ {
+ CString undoName;
+ undoName.Format( "Rename variable '%s' to '%s'",
+ (LPCTSTR)dialog.oldName_,
+ (LPCTSTR)dialog.newName_ );
+ CommandGroup commands( undoName, m_pDTE );
refactoring.apply( (LPCTSTR)dialog.newName_ );
+ commands.validate();
+ }
}
catch ( Refactoring::RefactoringError &e )
Index: rftavc7addin.vcproj
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/rftavc7addin.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rftavc7addin.vcproj 14 May 2003 18:55:50 -0000 1.2
--- rftavc7addin.vcproj 15 May 2003 07:31:43 -0000 1.3
***************
*** 232,235 ****
--- 232,241 ----
</Filter>
<File
+ RelativePath="CommandGroup.cpp">
+ </File>
+ <File
+ RelativePath="CommandGroup.h">
+ </File>
+ <File
RelativePath="TextDocumentHelper.cpp">
</File>
|
|
From: <bl...@us...> - 2003-05-15 07:06:49
|
Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv18210/src/rftavc7addin
Modified Files:
Connect.cpp VC7TextDocument.cpp VC7TextDocument.h
Log Message:
* fixed bug in VC7TextDocument. RenameLocaleVariable refactoring is now working.
Index: Connect.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/Connect.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Connect.cpp 14 May 2003 19:41:55 -0000 1.4
--- Connect.cpp 15 May 2003 07:06:46 -0000 1.5
***************
*** 6,9 ****
--- 6,13 ----
#include "TextSelectionHelper.h"
#include "VC7TextDocument.h"
+ #include <rfta/refactoring/RefactoringError.h>
+ #include <rfta/refactoring/RenameTempRefactoring.h>
+ #include <rfta/refactoring/InlineTempRefactoring.h>
+ #include <rfta/refactoring/SplitTempRefactoring.h>
extern CAddInModule _AtlModule;
***************
*** 369,372 ****
--- 373,404 ----
const Refactoring::SourceRange &selectedRange )
{
+ try
+ {
+ Refactoring::RenameTempRefactoring refactoring( document,
+ selectedRange.getStartIndex() );
+
+ RenameLocaleVariableDialog dialog;
+ dialog.oldName_ = refactoring.getOldVariableName().c_str();
+ dialog.newName_ = refactoring.getOldVariableName().c_str();
+
+ if ( dialog.DoModal() == IDOK )
+ refactoring.apply( (LPCTSTR)dialog.newName_ );
+ }
+ catch ( Refactoring::RefactoringError &e )
+ {
+ CString message( "An error occurred during refactoring:\n" );
+ message += e.what();
+
+ AfxMessageBox( message );
+ CString msg;
+ msg.Format( "Selected range: %s\nSelected Text: %s\nAll Text: %s",
+ selectedRange.toString().c_str(),
+ document.getTextRange( selectedRange ).c_str(),
+ document.getAllText().c_str() );
+ AfxMessageBox( msg );
+ }
+
+
+ /*
CString msg;
msg.Format( "Selected range: %s\nSelected Text: %s\nAll Text: %s",
***************
*** 379,382 ****
--- 411,415 ----
document.replaceTextRange( range, "ABCDE" );
+ */
/*
RenameLocaleVariableDialog dialog;
Index: VC7TextDocument.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/VC7TextDocument.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VC7TextDocument.cpp 14 May 2003 19:41:56 -0000 1.2
--- VC7TextDocument.cpp 15 May 2003 07:06:46 -0000 1.3
***************
*** 1,4 ****
--- 1,5 ----
#include "StdAfx.h"
#include "vc7textdocument.h"
+ #include <algorithm>
***************
*** 29,33 ****
CString ctext( text );
! return std::string( ctext );
}
--- 30,34 ----
CString ctext( text );
! return stripCR( std::string( ctext ) );
}
***************
*** 43,47 ****
CString ctext( text );
! return std::string( ctext );
}
--- 44,48 ----
CString ctext( text );
! return stripCR( std::string( ctext ) );
}
***************
*** 101,104 ****
--- 102,119 ----
setSelectionRange( range );
return replaceSelection( text );
+ }
+
+
+ std::string
+ VC7TextDocument::stripCR( const std::string &text ) const
+ {
+ // We need to strip CR from EOL because there are two characters, but VS count
+ // them as only one when returning absolute character offset.
+ std::string stripped( text );
+ std::string::iterator newEnd = std::remove( stripped.begin(),
+ stripped.end(),
+ '\r' );
+ stripped.erase( newEnd, stripped.end() );
+ return stripped;
}
Index: VC7TextDocument.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/VC7TextDocument.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VC7TextDocument.h 14 May 2003 19:41:56 -0000 1.2
--- VC7TextDocument.h 15 May 2003 07:06:46 -0000 1.3
***************
*** 45,48 ****
--- 45,51 ----
private:
+ std::string stripCR( const std::string &text ) const;
+
+ private:
CComPtr<EnvDTE::TextDocument> document_;
CComPtr<EnvDTE::EditPoint> startPoint_;
|
|
From: <bl...@us...> - 2003-05-15 07:06:03
|
Update of /cvsroot/cpptool/rfta/deplib/cppunit/include/cppunit/config In directory sc8-pr-cvs1:/tmp/cvs-serv17749/deplib/cppunit/include/cppunit/config Modified Files: config-msvc6.h Log Message: * include/cppunit/config/config-msvc6.h: changed the compiler outputter default format (CPPUNIT_COMPILER_LOCATION_FORMAT) for Visual Studio 7.0. Assertion now appears in the task list. Index: config-msvc6.h =================================================================== RCS file: /cvsroot/cpptool/rfta/deplib/cppunit/include/cppunit/config/config-msvc6.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config-msvc6.h 23 Oct 2002 20:25:06 -0000 1.1.1.1 --- config-msvc6.h 15 May 2003 07:06:00 -0000 1.2 *************** *** 52,56 **** // See class CompilerOutputter for format. #undef CPPUNIT_COMPILER_LOCATION_FORMAT ! #define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):" // Uncomment to turn on STL wrapping => use this to test compilation. --- 52,60 ---- // See class CompilerOutputter for format. #undef CPPUNIT_COMPILER_LOCATION_FORMAT ! #if _MSC_VER >= 1300 // VS 7.0 ! # define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l) : error : " ! #else ! # define CPPUNIT_COMPILER_LOCATION_FORMAT "%p(%l):" ! #endif // Uncomment to turn on STL wrapping => use this to test compilation. |
|
From: <bl...@us...> - 2003-05-14 19:44:15
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin In directory sc8-pr-cvs1:/tmp/cvs-serv18117/src/rftavc6addin Added Files: rftavc6addin.vcproj Log Message: * added visual studio .net 2002 (vc7.0) projects. --- NEW FILE: rftavc6addin.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="rftavc6addin" SccProjectName="" SccLocalPath="" Keyword="MFCProj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\..\..\build\rftavc6addin\Release" IntermediateDirectory=".\..\..\build\rftavc6addin\Release" ConfigurationType="2" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../deplib/boost-compatibility,../../include,../../deplib/cppunit/include,../../deplib/boostcvs" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\..\build\rftavc6addin\Release/rftavc6addin.pch" AssemblerListingLocation=".\..\..\build\rftavc6addin\Release/" ObjectFile=".\..\..\build\rftavc6addin\Release/" ProgramDataBaseFileName=".\..\..\build\rftavc6addin\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" OutputFile=".\..\..\build\rftavc6addin\Release/rftavc6addin.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib" ModuleDefinitionFile=".\rftavc6addin.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\build\rftavc6addin\Release/rftavc6addin.pdb" SubSystem="2" ImportLibrary=".\..\..\build\rftavc6addin\Release/rftavc6addin.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\rftavc6addin\Release/rftavc6addin.tlb"/> <Tool Name="VCPostBuildEventTool" Description="exporting..." CommandLine="copy $(TargetPath) ..\..\bin\rftavc6addin.dll"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_AFXDLL;NDEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\..\..\build\rftavc6addin\Debug" IntermediateDirectory=".\..\..\build\rftavc6addin\Debug" ConfigurationType="2" UseOfMFC="2" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../deplib/boost-compatibility,../../include,../../deplib/cppunit/include,../../deplib/boostcvs" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\..\build\rftavc6addin\Debug/rftavc6addin.pch" AssemblerListingLocation=".\..\..\build\rftavc6addin\Debug/" ObjectFile=".\..\..\build\rftavc6addin\Debug/" ProgramDataBaseFileName=".\..\..\build\rftavc6addin\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="cppunitd_dll.lib" OutputFile=".\..\..\build\rftavc6addin\Debug/rftavc6addin.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib,../../deplib/cppunit/lib" ModuleDefinitionFile=".\rftavc6addin.def" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\build\rftavc6addin\Debug/rftavc6addin.pdb" SubSystem="2" ImportLibrary=".\..\..\build\rftavc6addin\Debug/rftavc6addin.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\rftavc6addin\Debug/rftavc6addin.tlb"/> <Tool Name="VCPostBuildEventTool" Description="Exporting..." CommandLine="copy $(TargetPath) ..\..\bin\rftavc6addin.dll"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_AFXDLL;_DEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> <File RelativePath=".\res\TBarLrge.bmp"> </File> <File RelativePath=".\res\TBarMedm.bmp"> </File> <File RelativePath=".\res\bmp00001.bmp"> </File> <File RelativePath=".\res\rftavc6addin.rc2"> </File> <File RelativePath=".\res\toolbar1.bmp"> </File> <File RelativePath=".\res\toolbar_.bmp"> </File> </Filter> <Filter Name="Stuffs" Filter=""> <File RelativePath=".\Resource.h"> </File> <File RelativePath=".\StdAfx.cpp"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> </File> <File RelativePath=".\StdAfx.h"> </File> <File RelativePath=".\rftavc6addin.cpp"> </File> <File RelativePath=".\rftavc6addin.def"> </File> <File RelativePath=".\rftavc6addin.h"> </File> </Filter> <Filter Name="AddIn" Filter=""> <File RelativePath=".\Commands.cpp"> </File> <File RelativePath=".\Commands.h"> </File> <File RelativePath=".\DSAddIn.cpp"> </File> <File RelativePath=".\DSAddIn.h"> </File> <File RelativePath=".\rftavc6addin.odl"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCMIDLTool" TargetEnvironment="1" HeaderFileName="rftavc6addinTypes.h"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCMIDLTool" TargetEnvironment="1" HeaderFileName="rftavc6addinTypes.h"/> </FileConfiguration> </File> <File RelativePath=".\rftavc6addin.rc"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCResourceCompilerTool" AdditionalIncludeDirectories="$(OUTDIR);$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCResourceCompilerTool" AdditionalIncludeDirectories="$(OUTDIR);$(NoInherit)"/> </FileConfiguration> </File> </Filter> <Filter Name="COMWrapper" Filter=""> <File RelativePath=".\ApplicationHelper.cpp"> </File> <File RelativePath=".\ApplicationHelper.h"> </File> <File RelativePath=".\TextDocumentHelper.cpp"> </File> <File RelativePath=".\TextDocumentHelper.h"> </File> <File RelativePath=".\TextSelectionHelper.cpp"> </File> <File RelativePath=".\TextSelectionHelper.h"> </File> </Filter> <Filter Name="Refactoring" Filter=""> <File RelativePath=".\RenameLocaleVariableDialog.cpp"> </File> <File RelativePath=".\RenameLocaleVariableDialog.h"> </File> <File RelativePath=".\RftaInlineLocalVarDialog.cpp"> </File> <File RelativePath=".\RftaInlineLocalVarDialog.h"> </File> <File RelativePath=".\SplitLocaleVariableDialog.cpp"> </File> <File RelativePath=".\SplitLocaleVariableDialog.h"> </File> <File RelativePath=".\VCLineBasedTextDocument.cpp"> </File> <File RelativePath=".\VCLineBasedTextDocument.h"> </File> </Filter> <File RelativePath=".\How-To-Add-Commands.txt"> </File> <File RelativePath=".\ReadMe.txt"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: <bl...@us...> - 2003-05-14 19:44:15
|
Update of /cvsroot/cpptool/rfta/src/rftaparser In directory sc8-pr-cvs1:/tmp/cvs-serv18117/src/rftaparser Added Files: rftaparser.vcproj Log Message: * added visual studio .net 2002 (vc7.0) projects. --- NEW FILE: rftaparser.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="rftaparser" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\..\..\build\rftaparser\Release" IntermediateDirectory=".\..\..\build\rftaparser\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" [...1080 lines suppressed...] </File> <File RelativePath=".\Makefile.am"> </File> <File RelativePath=".\NonSemanticBlanker.cpp"> </File> <File RelativePath="..\..\include\rfta\parser\NonSemanticBlanker.h"> </File> <File RelativePath="..\rfta\ParserTools.cpp"> </File> <File RelativePath="..\..\include\rfta\parser\ParserTools.h"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: <bl...@us...> - 2003-05-14 19:44:15
|
Update of /cvsroot/cpptool/rfta/src/rfta In directory sc8-pr-cvs1:/tmp/cvs-serv18117/src/rfta Added Files: rfta.vcproj Log Message: * added visual studio .net 2002 (vc7.0) projects. --- NEW FILE: rfta.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="rfta" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\..\..\build\rfta\Release" IntermediateDirectory=".\..\..\build\rfta\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../deplib/boost-compatibility,../../include,../../deplib/cppunit/include,../../deplib/boostcvs" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;RFTA_DLL_BUILD;RFTA_NO_UT" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\..\build\rfta\Release/rfta.pch" AssemblerListingLocation=".\..\..\build\rfta\Release/" ObjectFile=".\..\..\build\rfta\Release/" ProgramDataBaseFileName=".\..\..\build\rfta\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib cppunit_dll.lib" OutputFile="..\..\build\rfta\Release/rfta_mdr.ext" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../deplib/cppunit/lib,../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\build\rfta\Release/rfta_mdr.pdb" ImportLibrary=".\..\..\build\rfta\Release/rfta_mdr.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\rfta\Release/rfta.tlb"/> <Tool Name="VCPostBuildEventTool" Description="Testing..." CommandLine="copy $(TargetPath) ..\..\bin\rfta_mdr.ext copy $(TargetDir)$(TargetName).lib ..\..\lib\rfta_mdr.lib "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\..\..\build\rfta\Debug" IntermediateDirectory=".\..\..\build\rfta\Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../deplib/boost-compatibility,../../include,../../deplib/cppunit/include,../../deplib/boostcvs" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;RFTA_DLL_BUILD;CPPUNIT_WRAP_COLUMN=120" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\..\build\rfta\Debug/rfta.pch" AssemblerListingLocation=".\..\..\build\rfta\Debug/" ObjectFile=".\..\..\build\rfta\Debug/" ProgramDataBaseFileName=".\..\..\build\rfta\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib cppunitd_dll.lib" OutputFile="..\..\build\rfta\Debug\rfta_mdd.ext" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../deplib/cppunit/lib,../../lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\build\rfta\Debug/rfta_mdd.pdb" ImportLibrary=".\..\..\build\rfta\Debug/rfta_mdd.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\rfta\Debug/rfta.tlb"/> <Tool Name="VCPostBuildEventTool" Description="Testing..." CommandLine="copy $(TargetPath) ..\..\bin\rfta_mdd.ext copy $(TargetDir)$(TargetName).lib ..\..\lib\rfta_mdd.lib cd ..\..\bin ..\deplib\cppunit\lib\DllPlugInTesterd_dll.exe -c -b $(TargetName).ext :Refactoring "/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="Dependencies" Filter="*.dll"> <File RelativePath="..\..\bin\rftaparser_mdd.ext"> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCustomBuildTool" CommandLine="copy $(InputPath) $(IntDir)\$(InputName).ext " Outputs="$(IntDir)\$(InputName).ext"/> </FileConfiguration> </File> <File RelativePath="..\..\bin\rftaparser_mdr.ext"> </File> </Filter> <Filter Name="CodeAnalysis" Filter=""> <File RelativePath=".\IdentifierResolver.cpp"> </File> <File RelativePath=".\IdentifierResolver.h"> </File> <File RelativePath=".\IdentifierResolverContext.cpp"> </File> <File RelativePath=".\IdentifierResolverContext.h"> </File> <File RelativePath=".\IdentifierResolverStrategy.cpp"> </File> <File RelativePath=".\IdentifierResolverStrategy.h"> </File> <File RelativePath=".\IdentifierVisitor.cpp"> </File> <File RelativePath=".\IdentifierVisitor.h"> </File> <File RelativePath=".\StatementsVisitor.cpp"> </File> <File RelativePath=".\StatementsVisitor.h"> </File> <File RelativePath=".\ToolsBox.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\ToolsBox.h"> </File> <File RelativePath=".\VariableDeclCollector.cpp"> </File> <File RelativePath=".\VariableDeclCollector.h"> </File> <File RelativePath=".\VariableDeclVisitor.cpp"> </File> <File RelativePath=".\VariableDeclVisitor.h"> </File> </Filter> <Filter Name="Refactoring" Filter=""> <File RelativePath=".\InlineTempRefactoring.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\InlineTempRefactoring.h"> </File> <File RelativePath=".\ReduceTempScopeRefactoring.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\ReduceTempScopeRefactoring.h"> </File> <File RelativePath=".\RefactoringBase.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\RefactoringBase.h"> </File> <File RelativePath=".\RefactoringError.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\RefactoringError.h"> </File> <File RelativePath=".\RenameTempRefactoring.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\RenameTempRefactoring.h"> </File> <File RelativePath=".\SplitDeclarationRefactoring.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\SplitDeclarationRefactoring.h"> </File> <File RelativePath=".\SplitTempRefactoring.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\SplitTempRefactoring.h"> </File> </Filter> <Filter Name="Text" Filter=""> <File RelativePath=".\LineBasedTextDocument.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\LineBasedTextDocument.h"> </File> <File RelativePath=".\PlainTextDocument.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\PlainTextDocument.h"> </File> <File RelativePath=".\ReplaceTextTransform.cpp"> </File> <File RelativePath=".\ReplaceTextTransform.h"> </File> <File RelativePath=".\TextDocument.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\TextDocument.h"> </File> <File RelativePath=".\TransformList.cpp"> </File> <File RelativePath=".\TransformList.h"> </File> </Filter> <Filter Name="CodeModel" Filter=""> <File RelativePath="..\..\include\rfta\refactoring\ChangeTrackers.h"> </File> <File RelativePath=".\CodeModel.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModel.h"> </File> <File RelativePath="..\..\doc\CodeModel.txt"> </File> <File RelativePath=".\CodeModelElement.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModelElement.h"> </File> <File RelativePath=".\CodeModelExpressions.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModelExpressions.h"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModelForward.h"> </File> <File RelativePath=".\CodeModelStatements.cpp"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModelStatements.h"> </File> <File RelativePath="..\..\include\rfta\refactoring\CodeModelVisitor.h"> </File> <File RelativePath=".\CodeRewriter.cpp"> </File> <File RelativePath=".\CodeRewriter.h"> </File> <File RelativePath=".\IndentLevelManager.cpp"> </File> <File RelativePath=".\IndentLevelManager.h"> </File> </Filter> <Filter Name="Tests" Filter=""> <Filter Name="TextManipulation" Filter=""> <File RelativePath=".\LineBasedTextDocumentTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\LineBasedTextDocumentTest.h"> </File> <File RelativePath=".\MockIdentifierResolverStrategy.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\MockIdentifierResolverStrategy.h"> </File> <File RelativePath=".\MockLineBasedTextDocument.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\MockLineBasedTextDocument.h"> </File> <File RelativePath=".\MockTextDocument.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\MockTextDocument.h"> </File> <File RelativePath=".\ReplaceTextTransformTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\ReplaceTextTransformTest.h"> </File> <File RelativePath=".\TransformListTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\TransformListTest.h"> </File> </Filter> <Filter Name="CodeAnalysisTest" Filter=""> <File RelativePath=".\IdentifierResolverContextTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\IdentifierResolverContextTest.h"> </File> <File RelativePath=".\IdentifierResolverTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\IdentifierResolverTest.h"> </File> <File RelativePath=".\IdentifierVisitorTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\IdentifierVisitorTest.h"> </File> <File RelativePath=".\ToolsBoxTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\ToolsBoxTest.h"> </File> <File RelativePath=".\VariableDeclCollectorTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\VariableDeclCollectorTest.h"> </File> <File RelativePath=".\VariableDeclVisitorTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\VariableDeclVisitorTest.h"> </File> </Filter> <Filter Name="RefactoringTest" Filter=""> <File RelativePath=".\InlineTempRefactoringTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\InlineTempRefactoringTest.h"> </File> <File RelativePath=".\ReduceTempScopeRefactoringTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\ReduceTempScopeRefactoringTest.h"> </File> <File RelativePath=".\RenameTempRefactoringTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\RenameTempRefactoringTest.h"> </File> <File RelativePath=".\SplitDeclarationRefactoringTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\SplitDeclarationRefactoringTest.h"> </File> <File RelativePath=".\SplitTempRefactoringTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\SplitTempRefactoringTest.h"> </File> </Filter> <Filter Name="Testing" Filter=""> <File RelativePath="..\..\include\mock\Expectations.h"> </File> <File RelativePath=".\RftaTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\SourceBasedTestBase.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\SourceBasedTestBase.h"> </File> <File RelativePath="..\rftatest\SourceBuilder.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath="..\..\include\rfta\test\SourceBuilder.h"> </File> <File RelativePath=".\UnitTesting.h"> </File> </Filter> <Filter Name="CodeModelTest" Filter=""> <File RelativePath=".\CodeModelGeneratorTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\CodeModelGeneratorTest.h"> </File> <File RelativePath=".\CodeWriterInsertTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\CodeWriterInsertTest.h"> </File> <File RelativePath=".\CodeWriterTest.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\CodeWriterTest.h"> </File> <File RelativePath=".\CodeWriterTestBase.cpp"> <FileConfiguration Name="Release|Win32" ExcludedFromBuild="TRUE"> <Tool Name="VCCLCompilerTool"/> </FileConfiguration> </File> <File RelativePath=".\CodeWriterTestBase.h"> </File> </Filter> </Filter> <Filter Name="Main" Filter=""> <File RelativePath="..\..\include\rfta\refactoring\Config.h"> </File> <File RelativePath=".\StdAfx.cpp"> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1"/> </FileConfiguration> </File> <File RelativePath=".\StdAfx.h"> </File> <File RelativePath=".\rfta.cpp"> </File> </Filter> <File RelativePath=".\Makefile.am"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: <bl...@us...> - 2003-05-14 19:44:14
|
Update of /cvsroot/cpptool/rfta/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18117/src
Added Files:
rfta.sln
Log Message:
* added visual studio .net 2002 (vc7.0) projects.
--- NEW FILE: rfta.sln ---
Microsoft Visual Studio Solution File, Format Version 7.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DllPlugInTester", "..\deplib\cppunit\src\DllPlugInTester\DllPlugInTester.vcproj", "{4A2F26AB-1D9B-4746-A855-157FA7A37537}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astdump", "astdumper\astdump.vcproj", "{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit_dll", "..\deplib\cppunit\src\cppunit\cppunit_dll.vcproj", "{2EA464D8-AA14-4CED-B21A-3B84B892B33E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eclipseplugin", "eclipseplugin\eclipseplugin.vcproj", "{73FA65D6-7E38-4517-AAEF-C01354C33AC6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyrfta", "pyrfta\pyrfta.vcproj", "{58F4135E-3049-4DCD-8242-F44C9014F9AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rfta", "rfta\rfta.vcproj", "{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rftaparser", "rftaparser\rftaparser.vcproj", "{3FB51A64-B118-4B24-BB68-56E94C2341DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rftavc6addin", "rftavc6addin\rftavc6addin.vcproj", "{893CE9D9-B56A-4421-80F2-EC69460CB8A7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rftavc7addin", "rftavc7addin\rftavc7addin.vcproj", "{10EDA388-9FAF-4920-8E31-83879630241C}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "rftavc7addinSetup", "rftavc7addin\rftavc7addinSetup\rftavc7addinSetup.vdproj", "{9D6B64ED-9717-4CD4-9937-3395B0311E90}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rftavc7addinui", "rftavc7addin\rftavc7addinui\rftavc7addinui.vcproj", "{6FEC82A8-D508-4BDA-8005-77F70DB3709C}"
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Debug Static
ConfigName.2 = Debug Unicode
ConfigName.3 = Release
ConfigName.4 = Release Static
ConfigName.5 = Release Unicode
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.0 = {2EA464D8-AA14-4CED-B21A-3B84B892B33E}
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.0 = {3FB51A64-B118-4B24-BB68-56E94C2341DF}
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.0 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.1 = {3FB51A64-B118-4B24-BB68-56E94C2341DF}
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.0 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.0 = {3FB51A64-B118-4B24-BB68-56E94C2341DF}
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.0 = {2EA464D8-AA14-4CED-B21A-3B84B892B33E}
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.1 = {4A2F26AB-1D9B-4746-A855-157FA7A37537}
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.0 = {AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug.ActiveCfg = Debug|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug.Build.0 = Debug|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug Static.ActiveCfg = Debug Static|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug Static.Build.0 = Debug Static|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug Unicode.ActiveCfg = Debug Unicode|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Debug Unicode.Build.0 = Debug Unicode|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release.ActiveCfg = Release|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release.Build.0 = Release|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release Static.ActiveCfg = Release Static|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release Static.Build.0 = Release Static|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release Unicode.ActiveCfg = Release Unicode|Win32
{4A2F26AB-1D9B-4746-A855-157FA7A37537}.Release Unicode.Build.0 = Release Unicode|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug.ActiveCfg = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug.Build.0 = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug Static.ActiveCfg = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug Static.Build.0 = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug Unicode.ActiveCfg = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Debug Unicode.Build.0 = Debug|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release.ActiveCfg = Release|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release.Build.0 = Release|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release Static.ActiveCfg = Release|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release Static.Build.0 = Release|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release Unicode.ActiveCfg = Release|Win32
{DCBE106B-4FAA-48AF-99F5-B9D7787DDCB4}.Release Unicode.Build.0 = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug.ActiveCfg = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug.Build.0 = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug Static.ActiveCfg = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug Static.Build.0 = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug Unicode.ActiveCfg = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Debug Unicode.Build.0 = Debug|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release.ActiveCfg = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release.Build.0 = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release Static.ActiveCfg = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release Static.Build.0 = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release Unicode.ActiveCfg = Release|Win32
{2EA464D8-AA14-4CED-B21A-3B84B892B33E}.Release Unicode.Build.0 = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug.ActiveCfg = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug.Build.0 = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug Static.ActiveCfg = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug Static.Build.0 = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug Unicode.ActiveCfg = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Debug Unicode.Build.0 = Debug|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release.ActiveCfg = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release.Build.0 = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release Static.ActiveCfg = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release Static.Build.0 = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release Unicode.ActiveCfg = Release|Win32
{73FA65D6-7E38-4517-AAEF-C01354C33AC6}.Release Unicode.Build.0 = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug.ActiveCfg = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug.Build.0 = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug Static.ActiveCfg = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug Static.Build.0 = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug Unicode.ActiveCfg = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Debug Unicode.Build.0 = Debug|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release.ActiveCfg = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release.Build.0 = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release Static.ActiveCfg = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release Static.Build.0 = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release Unicode.ActiveCfg = Release|Win32
{58F4135E-3049-4DCD-8242-F44C9014F9AF}.Release Unicode.Build.0 = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug.ActiveCfg = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug.Build.0 = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug Static.ActiveCfg = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug Static.Build.0 = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug Unicode.ActiveCfg = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Debug Unicode.Build.0 = Debug|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release.ActiveCfg = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release.Build.0 = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release Static.ActiveCfg = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release Static.Build.0 = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release Unicode.ActiveCfg = Release|Win32
{AECF0AF3-8DB0-498F-8F99-99C1B78BBCBD}.Release Unicode.Build.0 = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug.ActiveCfg = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug.Build.0 = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug Static.ActiveCfg = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug Static.Build.0 = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug Unicode.ActiveCfg = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Debug Unicode.Build.0 = Debug|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release.ActiveCfg = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release.Build.0 = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release Static.ActiveCfg = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release Static.Build.0 = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release Unicode.ActiveCfg = Release|Win32
{3FB51A64-B118-4B24-BB68-56E94C2341DF}.Release Unicode.Build.0 = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug.ActiveCfg = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug.Build.0 = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug Static.ActiveCfg = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug Static.Build.0 = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug Unicode.ActiveCfg = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Debug Unicode.Build.0 = Debug|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release.ActiveCfg = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release.Build.0 = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release Static.ActiveCfg = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release Static.Build.0 = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release Unicode.ActiveCfg = Release|Win32
{893CE9D9-B56A-4421-80F2-EC69460CB8A7}.Release Unicode.Build.0 = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug.ActiveCfg = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug.Build.0 = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug Static.ActiveCfg = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug Static.Build.0 = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug Unicode.ActiveCfg = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Debug Unicode.Build.0 = Debug|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release.ActiveCfg = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release.Build.0 = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release Static.ActiveCfg = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release Static.Build.0 = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release Unicode.ActiveCfg = Release|Win32
{10EDA388-9FAF-4920-8E31-83879630241C}.Release Unicode.Build.0 = Release|Win32
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug.ActiveCfg = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug.Build.0 = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug Static.ActiveCfg = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug Static.Build.0 = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug Unicode.ActiveCfg = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Debug Unicode.Build.0 = Debug
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release.ActiveCfg = Release
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release.Build.0 = Release
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release Static.ActiveCfg = Release
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release Static.Build.0 = Release
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release Unicode.ActiveCfg = Release
{9D6B64ED-9717-4CD4-9937-3395B0311E90}.Release Unicode.Build.0 = Release
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug.ActiveCfg = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug.Build.0 = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug Static.ActiveCfg = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug Static.Build.0 = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug Unicode.ActiveCfg = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Debug Unicode.Build.0 = Debug|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release.ActiveCfg = Release|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release.Build.0 = Release|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release Static.ActiveCfg = Release|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release Static.Build.0 = Release|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release Unicode.ActiveCfg = Release|Win32
{6FEC82A8-D508-4BDA-8005-77F70DB3709C}.Release Unicode.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
|
|
From: <bl...@us...> - 2003-05-14 19:44:13
|
Update of /cvsroot/cpptool/rfta/src/pyrfta In directory sc8-pr-cvs1:/tmp/cvs-serv18117/src/pyrfta Added Files: pyrfta.vcproj Log Message: * added visual studio .net 2002 (vc7.0) projects. --- NEW FILE: pyrfta.vcproj --- <?xml version="1.0" encoding = "Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.00" Name="pyrfta" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release|Win32" OutputDirectory=".\..\..\build\pyrfta\Release" IntermediateDirectory=".\..\..\build\pyrfta\Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm500 " InlineFunctionExpansion="1" AdditionalIncludeDirectories="../../include" PreprocessorDefinitions="NDEBUG;BOOST_PYTHON_STATIC_LINK;WIN32;_WINDOWS;BOOST_PYTHON_DYNAMIC_LIB;_USRDLL" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\..\..\build\pyrfta\Release/pyrfta.pch" AssemblerListingLocation=".\..\..\build\pyrfta\Release/" ObjectFile=".\..\..\build\pyrfta\Release/" ProgramDataBaseFileName=".\..\..\build\pyrfta\Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib python22.lib boost_python.lib" OutputFile="..\..\build\pyrfta\Release/pyrfta.pyd" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib,../../deplib/libs" ProgramDatabaseFile=".\..\..\build\pyrfta\Release/pyrfta.pdb" ImportLibrary=".\..\..\build\pyrfta\Release/pyrfta.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\pyrfta\Release/pyrfta.tlb"/> <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) ..\..\bin\pyrfta.pyd"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\..\..\build\pyrfta\Debug" IntermediateDirectory=".\..\..\build\pyrfta\Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm500 " Optimization="0" AdditionalIncludeDirectories="../../include" PreprocessorDefinitions="_DEBUG;BOOST_PYTHON_DYNAMIC_LIB;WIN32;_WINDOWS;_USRDLL" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\..\..\build\pyrfta\Debug/pyrfta.pch" AssemblerListingLocation=".\..\..\build\pyrfta\Debug/" ObjectFile=".\..\..\build\pyrfta\Debug/" ProgramDataBaseFileName=".\..\..\build\pyrfta\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib python22.lib boost_python_debug.lib" OutputFile="..\..\build\pyrfta\Debug/pyrfta.pyd" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib,../../deplib/libs" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\..\..\build\pyrfta\Debug/pyrfta.pdb" ImportLibrary=".\..\..\build\pyrfta\Debug/pyrfta.lib"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\..\..\build\pyrfta\Debug/pyrfta.tlb"/> <Tool Name="VCPostBuildEventTool" CommandLine="copy $(TargetPath) ..\..\bin\pyrfta.pyd"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1036"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> </Configuration> </Configurations> <Files> <Filter Name="pytest" Filter=""> <File RelativePath=".\pytest\test.py"> </File> </Filter> <File RelativePath=".\ExposeBase.cpp"> </File> <File RelativePath=".\ExposeCPPParser.cpp"> </File> <File RelativePath="..\..\include\xtl\python\ExposeEnumerator.h"> </File> <File RelativePath=".\ExposeExpressions.cpp"> </File> <File RelativePath=".\ExposeExpressions2.cpp"> </File> <File RelativePath=".\ExposeStatements.cpp"> </File> <File RelativePath=".\ExposeStatements2.cpp"> </File> <File RelativePath=".\ExposeStatements3.cpp"> </File> <File RelativePath=".\ExposeVisitors.cpp"> </File> <File RelativePath=".\Forwards.h"> </File> <File RelativePath=".\pyrfta.cpp"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
