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: <bl...@us...> - 2003-01-31 21:37:09
|
Update of /cvsroot/cpptool/rfta/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4218/src
Modified Files:
rfta.dsw rfta.opt
Log Message:
* generate symbol in release configuration
Index: rfta.dsw
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta.dsw,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rfta.dsw 8 Nov 2002 07:46:48 -0000 1.3
--- rfta.dsw 31 Jan 2003 21:37:01 -0000 1.4
***************
*** 12,15 ****
--- 12,18 ----
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name cppunit_dll
+ End Project Dependency
}}}
Index: rfta.opt
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta.opt,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
Binary files /tmp/cvsN3v7T0 and /tmp/cvs8BHYTQ differ
|
|
From: <bl...@us...> - 2003-01-31 21:37:09
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin In directory sc8-pr-cvs1:/tmp/cvs-serv4218/src/rftavc6addin Modified Files: rftavc6addin.dsp Log Message: * generate symbol in release configuration Index: rftavc6addin.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/rftavc6addin.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rftavc6addin.dsp 30 Dec 2002 10:43:26 -0000 1.2 --- rftavc6addin.dsp 31 Jan 2003 21:37:04 -0000 1.3 *************** *** 54,60 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../lib" # Begin Special Build Tool ! TargetPath=\Projects\Cpptool\rfta\build\rftavc6addin\Release\rftavc6addin.dll SOURCE="$(InputPath)" PostBuild_Desc=exporting... --- 54,60 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 ! # ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"../../lib" # Begin Special Build Tool ! TargetPath=\prg\vc\Rfta\build\rftavc6addin\Release\rftavc6addin.dll SOURCE="$(InputPath)" PostBuild_Desc=exporting... *************** *** 88,92 **** # ADD LINK32 cppunitd_dll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"../../deplib/cppunit/lib" # Begin Special Build Tool ! TargetPath=\Projects\Cpptool\rfta\build\rftavc6addin\Debug\rftavc6addin.dll SOURCE="$(InputPath)" PostBuild_Desc=Exporting... --- 88,92 ---- # ADD LINK32 cppunitd_dll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"../../deplib/cppunit/lib" # Begin Special Build Tool ! TargetPath=\prg\vc\Rfta\build\rftavc6addin\Debug\rftavc6addin.dll SOURCE="$(InputPath)" PostBuild_Desc=Exporting... |
|
From: <bl...@us...> - 2003-01-31 21:37:09
|
Update of /cvsroot/cpptool/rfta/src/astdumper In directory sc8-pr-cvs1:/tmp/cvs-serv4218/src/astdumper Modified Files: astdump.dsp Log Message: * generate symbol in release configuration Index: astdump.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/astdumper/astdump.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** astdump.dsp 23 Oct 2002 20:25:18 -0000 1.1.1.1 --- astdump.dsp 31 Jan 2003 21:37:03 -0000 1.2 *************** *** 51,55 **** LINK32=link.exe # ADD BASE 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 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 /subsystem:console /machine:I386 ! # 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 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 /subsystem:console /machine:I386 /libpath:"../../bin" # Begin Special Build Tool TargetPath=\prg\vc\Rfta\build\astdump\Release\astdump.exe --- 51,55 ---- LINK32=link.exe # ADD BASE 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 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 /subsystem:console /machine:I386 ! # 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 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 /subsystem:console /debug /machine:I386 /libpath:"../../bin" # Begin Special Build Tool TargetPath=\prg\vc\Rfta\build\astdump\Release\astdump.exe |
|
From: <bl...@us...> - 2003-01-31 21:37:07
|
Update of /cvsroot/cpptool/rfta/src/rfta In directory sc8-pr-cvs1:/tmp/cvs-serv4218/src/rfta Modified Files: rfta.dsp Log Message: * generate symbol in release configuration Index: rfta.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.dsp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** rfta.dsp 9 Jan 2003 19:43:05 -0000 1.34 --- rfta.dsp 31 Jan 2003 21:37:03 -0000 1.35 *************** *** 54,58 **** LINK32=link.exe # ADD BASE 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 /machine:I386 ! # 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 /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 --- 54,58 ---- LINK32=link.exe # ADD BASE 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 /machine:I386 ! # 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 |
|
From: <bl...@us...> - 2003-01-31 21:36:23
|
Update of /cvsroot/cpptool/rfta/bug
In directory sc8-pr-cvs1:/tmp/cvs-serv4000/bug
Added Files:
LocaleVariableNotRecognized.cpp ParserCrash.cpp
Log Message:
* added bug samples
--- NEW FILE: LocaleVariableNotRecognized.cpp ---
// Fails to recognize the last occurrence of bigBuffer as a local variable
{
std::vector<int> bigBuffer;
{
KTEST_ASSERT_EQUAL( index, bigBuffer[index] );
}
}
--- NEW FILE: ParserCrash.cpp ---
// Crash when trying to rename the last occurrence of bigBuffer. (from the add-in, seems to be in the IdentifierResolver).
{
const int bufferSize = 256000;
std::vector<int> bigBuffer;
bigBuffer.reserve( bufferSize );
for ( int index =0; index < bufferSize; ++index )
bigBuffer[ index ] = 0;
const char *byteBuffer = (char *)&bigBuffer[0];
int recievedLength = 0;
int totalLength = sizeof(int) * bufferSize;
KTEST_ASSERT_EQUAL( index, bigBuffer[index] );
}
|
|
From: <bl...@us...> - 2003-01-31 21:22:45
|
Update of /cvsroot/cpptool/rfta/bug In directory sc8-pr-cvs1:/tmp/cvs-serv30758/bug Log Message: Directory /cvsroot/cpptool/rfta/bug added to the repository |
|
From: <net...@us...> - 2003-01-09 21:19:25
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv31628/src/rftavc6addin
Modified Files:
How-To-Add-Commands.txt DSAddIn.h DSAddIn.cpp
Log Message:
-- some code refactoring
Index: How-To-Add-Commands.txt
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/How-To-Add-Commands.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** How-To-Add-Commands.txt 9 Jan 2003 19:43:05 -0000 1.2
--- How-To-Add-Commands.txt 9 Jan 2003 21:19:20 -0000 1.3
***************
*** 34,75 ****
Insert the following code for your addin function:
!
! {
! // ENTER HERE the ICommand function name you have choosen in Step 1)
! LPCTSTR szCommand = _T(" xxxxxxxxxxxxxxxx ");
!
! VARIANT_BOOL bRet;
! CString strCmdString;
!
! // ENTER HERE the StringTable Indentifier you have created in Step 2c)
! strCmdString.LoadString( xxxxxxxxxxxxxxxxx );
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
!
! // ENTER HERE the ICommand function name you have choosen in Step 1)
! CComBSTR bszMethod(_T("RftaRenameLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
!
! // ENTER HERE the correct index position of the icon in the toolbar
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, xxxxxx , m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
}
Step 5)
--- 34,52 ----
Insert the following code for your addin function:
! ---------------------------------------------------------------------
! // COMMAND '>>> PLACE YOUR COMMENT HERE <<<'
! if (initAddinCommand(
!
! _T("RftaInlineLocaleVariable"), // <--- place your command name (of step1) here
! IDS_INLINELOCAL_INFO, // <--- place your command description (StringTable step 2) here
! 1, // <--- place the icon position in tool bar here
!
! pApplication, bFirstTime
! ) == S_FALSE)
! {
! *OnConnection = VARIANT_FALSE;
! return S_OK;
}
+ ---------------------------------------------------------------------
Step 5)
Index: DSAddIn.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/DSAddIn.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSAddIn.h 18 Dec 2002 22:53:27 -0000 1.1
--- DSAddIn.h 9 Jan 2003 21:19:20 -0000 1.2
***************
*** 39,42 ****
--- 39,44 ----
CCommandsObj* m_pCommands;
DWORD m_dwCookie;
+
+ STDMETHOD(initAddinCommand)(THIS_ _TCHAR* _szCommand,UINT cmdInfoRes,UINT buttonIdx, IApplication* pApplication, VARIANT_BOOL bFirstTime );
};
Index: DSAddIn.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/DSAddIn.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DSAddIn.cpp 30 Dec 2002 10:43:26 -0000 1.2
--- DSAddIn.cpp 9 Jan 2003 21:19:20 -0000 1.3
***************
*** 44,152 ****
(LPDISPATCH) m_pCommands, IDR_TOOLBAR_REFACTORING, IDR_TOOLBAR_REFACTORING, m_dwCookie));
! // Inform DevStudio of the commands we implement
!
! // TODO: Replace the AddCommand call below with a series of calls,
! // one for each command your add-in will add.
! // The command name should not be localized to other languages. The
! // tooltip, command description, and other strings related to this
! // command are stored in the string table (IDS_CMD_STRING) and should
! // be localized.
{
! LPCTSTR szCommand = _T("RftaRenameLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_RENAMELOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaRenameLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 0, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
}
! // The command name should not be localized to other languages. The
! // tooltip, command description, and other strings related to this
! // command are stored in the string table (IDS_CMD_STRING) and should
! // be localized.
{
! LPCTSTR szCommand = _T("RftaInlineLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_INLINELOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaInlineLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 1, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
}
! // The command name should not be localized to other languages. The
! // tooltip, command description, and other strings related to this
! // command are stored in the string table (IDS_CMD_STRING) and should
! // be localized.
{
! LPCTSTR szCommand = _T("RftaSplitLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_SPLITLOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaSplitLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 2, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
}
--- 44,74 ----
(LPDISPATCH) m_pCommands, IDR_TOOLBAR_REFACTORING, IDR_TOOLBAR_REFACTORING, m_dwCookie));
! // Inform DevStudio of the commands we implement
! // COMMAND 'RENAME-LOCAL'
! if (initAddinCommand(
! _T("RftaRenameLocaleVariable"), IDS_RENAMELOCAL_INFO, 0, pApplication, bFirstTime
! ) == S_FALSE)
{
! *OnConnection = VARIANT_FALSE;
! return S_OK;
}
! // COMMAND 'INLINE-LOCAL'
! if (initAddinCommand(
! _T("RftaInlineLocaleVariable"), IDS_INLINELOCAL_INFO, 1, pApplication, bFirstTime
! ) == S_FALSE)
{
! *OnConnection = VARIANT_FALSE;
! return S_OK;
}
! // COMMAND 'SPLIT-LOCAL'
! if (initAddinCommand(
! _T("RftaSplitLocaleVariable"), IDS_SPLITLOCAL_INFO, 2, pApplication, bFirstTime
! ) == S_FALSE)
{
! *OnConnection = VARIANT_FALSE;
! return S_OK;
}
***************
*** 168,169 ****
--- 90,128 ----
return S_OK;
}
+
+ STDMETHODIMP CDSAddIn::initAddinCommand(_TCHAR* _szCommand,UINT cmdInfoRes,UINT buttonIdx, IApplication* pApplication, VARIANT_BOOL bFirstTime)
+ {
+ // The command name should not be localized to other languages. The
+ // tooltip, command description, and other strings related to this
+ // command are stored in the string table (IDS_CMD_STRING) and should
+ // be localized.
+ LPCTSTR szCommand = _T(_szCommand);
+ VARIANT_BOOL bRet;
+ CString strCmdString;
+ strCmdString.LoadString(cmdInfoRes);
+ strCmdString = szCommand + strCmdString;
+ CComBSTR bszCmdString(strCmdString);
+ CComBSTR bszMethod(_T(_szCommand));
+ CComBSTR bszCmdName(szCommand);
+ VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, buttonIdx, m_dwCookie, &bRet));
+ if (bRet == VARIANT_FALSE)
+ {
+ // AddCommand failed because a command with this name already
+ // exists. You may try adding your command under a different name.
+ // Or, you can fail to load as we will do here.
+ return S_FALSE;
+ }
+
+ // Add toolbar buttons only if this is the first time the add-in
+ // is being loaded. Toolbar buttons are automatically remembered
+ // by Developer Studio from session to session, so we should only
+ // add the toolbar buttons once.
+ if (bFirstTime == VARIANT_TRUE)
+ {
+ VERIFY_OK(pApplication->
+ AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
+ }
+
+ return S_OK;
+
+ }
\ No newline at end of file
|
|
From: <bl...@us...> - 2003-01-09 19:44:54
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv14608/src/rftavc6addin
Modified Files:
TextDocumentHelper.cpp TextDocumentHelper.h
VCLineBasedTextDocument.cpp
Log Message:
* fixed some constness issues
Index: TextDocumentHelper.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/TextDocumentHelper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TextDocumentHelper.cpp 25 Dec 2002 12:38:09 -0000 1.2
--- TextDocumentHelper.cpp 9 Jan 2003 19:44:51 -0000 1.3
***************
*** 22,26 ****
bool
! TextDocumentHelper::isValid()
{
return !!_document;
--- 22,26 ----
bool
! TextDocumentHelper::isValid() const
{
return !!_document;
***************
*** 29,33 ****
TextSelectionHelper
! TextDocumentHelper::selection()
{
CComPtr<IDispatch> selectionInterface;
--- 29,33 ----
TextSelectionHelper
! TextDocumentHelper::selection() const
{
CComPtr<IDispatch> selectionInterface;
***************
*** 46,50 ****
int
! TextDocumentHelper::getTabSize()
{
long tabSize;
--- 46,50 ----
int
! TextDocumentHelper::getTabSize() const
{
long tabSize;
Index: TextDocumentHelper.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/TextDocumentHelper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TextDocumentHelper.h 25 Dec 2002 12:38:09 -0000 1.2
--- TextDocumentHelper.h 9 Jan 2003 19:44:51 -0000 1.3
***************
*** 22,32 ****
virtual ~TextDocumentHelper();
! bool isValid();
! TextSelectionHelper selection();
void discardingClose();
! int getTabSize();
private:
--- 22,32 ----
virtual ~TextDocumentHelper();
! bool isValid() const;
! TextSelectionHelper selection() const;
void discardingClose();
! int getTabSize() const;
private:
Index: VCLineBasedTextDocument.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/VCLineBasedTextDocument.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VCLineBasedTextDocument.cpp 30 Dec 2002 15:22:55 -0000 1.3
--- VCLineBasedTextDocument.cpp 9 Jan 2003 19:44:51 -0000 1.4
***************
*** 11,15 ****
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper ), LineBasedTextDocument( helper.getTabSize() )
{
initialize( getAllText() );
--- 11,16 ----
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper )
! , LineBasedTextDocument( helper.getTabSize() )
{
initialize( getAllText() );
|
|
From: <bl...@us...> - 2003-01-09 19:43:09
|
Update of /cvsroot/cpptool/rfta/src/rfta In directory sc8-pr-cvs1:/tmp/cvs-serv13636/src/rfta Modified Files: rfta.dsp Log Message: * added files Index: rfta.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.dsp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** rfta.dsp 30 Dec 2002 10:44:08 -0000 1.33 --- rfta.dsp 9 Jan 2003 19:43:05 -0000 1.34 *************** *** 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 /machine:I386 /out:"..\..\build\rfta\Release/rfta_mdr.ext" /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib" # Begin Special Build Tool ! TargetDir=\Projects\Cpptool\rfta\build\rfta\Release ! TargetPath=\Projects\Cpptool\rfta\build\rfta\Release\rfta_mdr.ext TargetName=rfta_mdr SOURCE="$(InputPath)" --- 56,61 ---- # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /out:"..\..\build\rfta\Release/rfta_mdr.ext" /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib" # Begin Special Build Tool ! TargetDir=\prg\vc\Rfta\build\rfta\Release ! TargetPath=\prg\vc\Rfta\build\rfta\Release\rfta_mdr.ext TargetName=rfta_mdr SOURCE="$(InputPath)" *************** *** 90,95 **** # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Debug\rfta_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib" # Begin Special Build Tool ! TargetDir=\Projects\Cpptool\rfta\build\rfta\Debug ! TargetPath=\Projects\Cpptool\rfta\build\rfta\Debug\rfta_mdd.ext TargetName=rfta_mdd SOURCE="$(InputPath)" --- 90,95 ---- # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"..\..\build\rfta\Debug\rfta_mdd.ext" /pdbtype:sept /libpath:"../../deplib/cppunit/lib" /libpath:"../../lib" # Begin Special Build Tool ! TargetDir=\prg\vc\Rfta\build\rfta\Debug ! TargetPath=\prg\vc\Rfta\build\rfta\Debug\rfta_mdd.ext TargetName=rfta_mdd SOURCE="$(InputPath)" *************** *** 691,698 **** --- 691,716 ---- SOURCE=.\InlineTempRefactoringTest.cpp + + !IF "$(CFG)" == "rfta - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rfta - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\InlineTempRefactoringTest.h + + !IF "$(CFG)" == "rfta - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rfta - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File *************** *** 712,715 **** --- 730,742 ---- SOURCE=.\ReduceTempScopeRefactoringTest.h + + !IF "$(CFG)" == "rfta - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rfta - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File *************** *** 880,883 **** --- 907,919 ---- SOURCE=.\CodeWriterTest.h + + !IF "$(CFG)" == "rfta - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rfta - Win32 Debug" + + !ENDIF + # End Source File # End Group |
|
From: <bl...@us...> - 2003-01-09 19:43:09
|
Update of /cvsroot/cpptool/rfta/src/rftaparser In directory sc8-pr-cvs1:/tmp/cvs-serv13636/src/rftaparser Modified Files: rftaparser.dsp Log Message: * added files Index: rftaparser.dsp =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftaparser/rftaparser.dsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** rftaparser.dsp 28 Dec 2002 10:37:57 -0000 1.26 --- rftaparser.dsp 9 Jan 2003 19:43:06 -0000 1.27 *************** *** 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 /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" /libpath:"../../deplib/cppunit/lib" # 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)" --- 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 /machine:I386 /out:"..\..\build\rftaparser\Release/rftaparser_mdr.ext" /libpath:"../../deplib/cppunit/lib" # 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)" *************** *** 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)" --- 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)" *************** *** 567,574 **** --- 567,592 ---- SOURCE=.\ExpressionOperationMutatorTest.cpp + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File SOURCE=.\ExpressionOperationMutatorTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File *************** *** 770,773 **** --- 788,800 ---- SOURCE=.\SourceRangeTest.h + + !IF "$(CFG)" == "rftaparser - Win32 Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "rftaparser - Win32 Debug" + + !ENDIF + # End Source File # Begin Source File |
|
From: <bl...@us...> - 2003-01-09 19:43:08
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv13636/src/rftavc6addin
Modified Files:
How-To-Add-Commands.txt
Log Message:
* added files
Index: How-To-Add-Commands.txt
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/How-To-Add-Commands.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** How-To-Add-Commands.txt 30 Dec 2002 10:43:26 -0000 1.1
--- How-To-Add-Commands.txt 9 Jan 2003 19:43:05 -0000 1.2
***************
*** 83,84 ****
--- 83,88 ----
Add calls to your refactoring functionality in here (also the dialog
handling etc.) ... watch the other functions...
+
+ Notes: to see the new toolbar button in VC++ 6 when you reinstall the add-in,
+ you will need to desactive and then reactivate the add-in
+ (in the Tools/Customize... dialog). This will cause the toolbar to be recreated.
|
|
From: <net...@us...> - 2003-01-07 18:53:42
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin In directory sc8-pr-cvs1:/tmp/cvs-serv15809 Modified Files: .cvsignore Log Message: -- corrected ignores Index: .cvsignore =================================================================== RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 7 Jan 2003 18:51:24 -0000 1.2 --- .cvsignore 7 Jan 2003 18:53:00 -0000 1.3 *************** *** 3,5 **** *.WW *.c ! --- 3,6 ---- *.WW *.c ! *.plg ! rftavc6addinTypes.h |
|
From: <net...@us...> - 2003-01-07 18:51:33
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv15240
Modified Files:
.cvsignore
Added Files:
SplitLocaleVariableDialog.h RftaInlineLocalVarDialog.h
Log Message:
-- dialogs for the new refactorings
--- NEW FILE: SplitLocaleVariableDialog.h ---
#if !defined(AFX_SPLITLOCALEVARIABLEDIALOG_H__3CE35443_0DDD_40CB_A445_ED1B50A946FA__INCLUDED_)
#define AFX_SPLITLOCALEVARIABLEDIALOG_H__3CE35443_0DDD_40CB_A445_ED1B50A946FA__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// SplitLocaleVariableDialog.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// SplitLocaleVariableDialog dialog
class SplitLocaleVariableDialog : public CDialog
{
// Construction
public:
SplitLocaleVariableDialog(CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(SplitLocaleVariableDialog)
enum { IDD = IDD_SPLIT_LOCAL_VAR };
CString m_NewVariableName;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(SplitLocaleVariableDialog)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(SplitLocaleVariableDialog)
// NOTE: the ClassWizard will add member functions here
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_SPLITLOCALEVARIABLEDIALOG_H__3CE35443_0DDD_40CB_A445_ED1B50A946FA__INCLUDED_)
--- NEW FILE: RftaInlineLocalVarDialog.h ---
#if !defined(AFX_RFTAINLINELOCALVARDIALOG_H__529FC0DC_6793_483D_B8D5_55D22A5AF808__INCLUDED_)
#define AFX_RFTAINLINELOCALVARDIALOG_H__529FC0DC_6793_483D_B8D5_55D22A5AF808__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// RftaInlineLocalVarDialog.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// RftaInlineLocalVarDialog dialog
class RftaInlineLocalVarDialog : public CDialog
{
// Construction
public:
RftaInlineLocalVarDialog(CWnd* pParent = NULL); // standard constructor
// Dialog Data
//{{AFX_DATA(RftaInlineLocalVarDialog)
enum { IDD = IDD_INLINE_LOCAL_VARIABLE };
CString m_VariableName;
BOOL m_AddBraces;
//}}AFX_DATA
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(RftaInlineLocalVarDialog)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(RftaInlineLocalVarDialog)
// NOTE: the ClassWizard will add member functions here
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_RFTAINLINELOCALVARDIALOG_H__529FC0DC_6793_483D_B8D5_55D22A5AF808__INCLUDED_)
Index: .cvsignore
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore 20 Dec 2002 08:30:37 -0000 1.1
--- .cvsignore 7 Jan 2003 18:51:24 -0000 1.2
***************
*** 3,5 ****
*.WW
*.c
! *.h
--- 3,5 ----
*.WW
*.c
!
|
|
From: <net...@us...> - 2002-12-30 15:22:58
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv1626/rfta/src/rftavc6addin
Modified Files:
VCLineBasedTextDocument.cpp
Log Message:
-- corrected a workarround
Index: VCLineBasedTextDocument.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/VCLineBasedTextDocument.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VCLineBasedTextDocument.cpp 30 Dec 2002 10:43:26 -0000 1.2
--- VCLineBasedTextDocument.cpp 30 Dec 2002 15:22:55 -0000 1.3
***************
*** 11,15 ****
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper ), LineBasedTextDocument(3)
{
initialize( getAllText() );
--- 11,15 ----
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper ), LineBasedTextDocument( helper.getTabSize() )
{
initialize( getAllText() );
|
|
From: <net...@us...> - 2002-12-30 15:02:32
|
Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv20269/rfta/src/rftaparser
Modified Files:
VariableDeclMutator.cpp
Log Message:
-- bugfix for the array initializer
Index: VariableDeclMutator.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/VariableDeclMutator.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** VariableDeclMutator.cpp 20 Dec 2002 08:30:51 -0000 1.13
--- VariableDeclMutator.cpp 30 Dec 2002 15:02:28 -0000 1.14
***************
*** 342,346 ****
while ( current_ != end_ )
{
! char c = *current_;
if ( c == ';' || c == ',' )
return current_ != (start+1);
--- 342,346 ----
while ( current_ != end_ )
{
! char c = *current_;
if ( c == ';' || c == ',' )
return current_ != (start+1);
***************
*** 355,358 ****
--- 355,363 ----
return false;
}
+ else if ( c == '{' )
+ {
+ if ( !tryFindNextBalanced( current_, end_, '{', '}' ) )
+ return false;
+ }
else
++current_;
|
|
From: <net...@us...> - 2002-12-30 15:02:06
|
Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv19786/rfta/src/rftaparser
Modified Files:
VariableDeclMutatorTest.h VariableDeclMutatorTest.cpp
Log Message:
-- added a test for the array initializer bug
Index: VariableDeclMutatorTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/VariableDeclMutatorTest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VariableDeclMutatorTest.h 12 Dec 2002 15:18:01 -0000 1.4
--- VariableDeclMutatorTest.h 30 Dec 2002 15:01:57 -0000 1.5
***************
*** 33,36 ****
--- 33,37 ----
CPPUNIT_TEST( testVarDeclNoSemiColonEnding );
CPPUNIT_TEST( testThreeDeclWithSpaceBeforeInializer );
+ CPPUNIT_TEST( testArrayInitializer );
CPPUNIT_TEST_SUITE_END();
***************
*** 56,60 ****
void testTwoIntDecl();
void testTwoObjectConstruction();
! void testTwoDeclSourceRanges();
void testMissinterpretedUnsupportedExpression1();
--- 57,61 ----
void testTwoIntDecl();
void testTwoObjectConstruction();
! void testTwoDeclSourceRanges();
void testMissinterpretedUnsupportedExpression1();
***************
*** 63,66 ****
--- 64,69 ----
void testVarDeclNoSemiColonEnding();
void testThreeDeclWithSpaceBeforeInializer();
+
+ void testArrayInitializer();
private:
Index: VariableDeclMutatorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/VariableDeclMutatorTest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** VariableDeclMutatorTest.cpp 20 Dec 2002 08:39:41 -0000 1.12
--- VariableDeclMutatorTest.cpp 30 Dec 2002 15:01:59 -0000 1.13
***************
*** 473,476 ****
--- 473,486 ----
}
+ void
+ VariableDeclMutatorTest::testArrayInitializer()
+ {
+ const std::string source( "int x1[2][3] = { { 1 , 2 , 3 } , { 4 , 5 , 6 } };" );
+ SourceASTNodePtr sourceAST = RFTA_ASSERT_VARIABLE_DECL_MUTATOR_PASS( source );
+ RFTA_ASSERT_VARIABLE_DECL_INIT( sourceAST, 0,
+ "int ", "", "x1", "[2][3]",
+ Testing::assign, "= { { 1 , 2 , 3 } , { 4 , 5 , 6 } }" );
+ }
+
} // namespace Refactoring
|
|
From: <net...@us...> - 2002-12-30 13:59:21
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv8998/rfta/src/rfta
Modified Files:
InlineTempRefactoring.cpp
Log Message:
-- handling for expr-lists added
Index: InlineTempRefactoring.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoring.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InlineTempRefactoring.cpp 30 Dec 2002 10:44:08 -0000 1.3
--- InlineTempRefactoring.cpp 30 Dec 2002 13:59:18 -0000 1.4
***************
*** 143,157 ****
{
bool go_deeper = false;
do {
go_deeper = false;
if (!parentExpr->hasProperty(ASTNodeProperties::expressionTypeProperty))
{
! // call mutator on this expression:
ParseContext context( sourceNode_ );
ExpressionOperationMutator mutator( context, parentExpr, sourceNode_ );
mutator.mutate();
! // check if no expression type was added:
if (!parentExpr->hasProperty(ASTNodeProperties::expressionTypeProperty))
! break;
}
--- 143,162 ----
{
bool go_deeper = false;
+ // this loop does implement lazy parsing of the expression where the
+ // temporary variable occures. It does parse step by step only these sub
+ // parts that are needed to be anlysed (where the variable is placed)
do {
go_deeper = false;
+
+ // check if the expression has been parsed allready
if (!parentExpr->hasProperty(ASTNodeProperties::expressionTypeProperty))
{
! // call mutator that parses this expression:
ParseContext context( sourceNode_ );
ExpressionOperationMutator mutator( context, parentExpr, sourceNode_ );
mutator.mutate();
! // check if expression type was added (the parser has detected a type):
if (!parentExpr->hasProperty(ASTNodeProperties::expressionTypeProperty))
! break; // it has not... so we don't know if it is an assignment
}
***************
*** 160,173 ****
if (exprType->getType() == ASTNodeTypes::assignmentExpression)
{
! // find the first child that is <expression>
int idx;
for (idx=0;idx<parentExpr->getChildCount();idx++)
if (parentExpr->getChildAt(idx)->getType()==ASTNodeTypes::expression)
break;
! // check if localVariable is on the left hand side:
ASTNodePtr left = parentExpr->getChildAt(idx);
SourceRange varRange = (*it)->getRange();
SourceRange leftRange = left->getRange();
if (leftRange.contains(varRange))
throw RefactoringError( RefactoringError::variableIsAssigned );
else
--- 165,181 ----
if (exprType->getType() == ASTNodeTypes::assignmentExpression)
{
! // find the first child that is an <expression>
int idx;
for (idx=0;idx<parentExpr->getChildCount();idx++)
if (parentExpr->getChildAt(idx)->getType()==ASTNodeTypes::expression)
break;
! // check if localVariable is on the left hand side of the assignment:
ASTNodePtr left = parentExpr->getChildAt(idx);
SourceRange varRange = (*it)->getRange();
SourceRange leftRange = left->getRange();
+
if (leftRange.contains(varRange))
+ // @todo: if the expression parser has been extended we need
+ // to check here, if the assignment is really done to the variable
throw RefactoringError( RefactoringError::variableIsAssigned );
else
***************
*** 175,178 ****
--- 183,210 ----
parentExpr = parentExpr->getChildAt(idx+1);
go_deeper = true;
+ }
+ }
+ // check if it is an expression-list
+ if (exprType->getType() == ASTNodeTypes::expressionList)
+ {
+ // find the first child that is an <expression>
+ int idx;
+ for (idx=0;idx<parentExpr->getChildCount();idx++)
+ if (parentExpr->getChildAt(idx)->getType()==ASTNodeTypes::expression)
+ break;
+ while (idx<parentExpr->getChildCount())
+ {
+ // check if localVariable is on the left hand side of the assignment:
+ ASTNodePtr elem = parentExpr->getChildAt(idx);
+ SourceRange varRange = (*it)->getRange();
+ SourceRange elemRange = elem->getRange();
+
+ if (elemRange.contains(varRange))
+ {
+ parentExpr = parentExpr->getChildAt(idx);
+ go_deeper = true;
+ break;
+ }
+ idx++;
}
}
|
|
From: <net...@us...> - 2002-12-30 13:57:55
|
Update of /cvsroot/cpptool/rfta/src/rftaparser
In directory sc8-pr-cvs1:/tmp/cvs-serv7917/rfta/src/rftaparser
Modified Files:
ExpressionOperationMutatorTest.cpp
ExpressionOperationMutator.cpp
Log Message:
-- implemented expr-list fully + tests activated
Index: ExpressionOperationMutatorTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/ExpressionOperationMutatorTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpressionOperationMutatorTest.cpp 28 Dec 2002 10:52:50 -0000 1.2
--- ExpressionOperationMutatorTest.cpp 30 Dec 2002 13:57:53 -0000 1.3
***************
*** 91,97 ****
{
SourceASTNodePtr sourceAST = Testing::createAST("a=10,i=2",CPPUNIT_SOURCELINE() );
-
- /*
- deactiated because expression-list-parsing is not implemented.
ASTNodePtr expr = sourceAST->getChildAt(0);
--- 91,94 ----
***************
*** 116,120 ****
5,
3 );
- */
}
--- 113,116 ----
Index: ExpressionOperationMutator.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftaparser/ExpressionOperationMutator.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExpressionOperationMutator.cpp 28 Dec 2002 10:37:57 -0000 1.1
--- ExpressionOperationMutator.cpp 30 Dec 2002 13:57:53 -0000 1.2
***************
*** 56,59 ****
--- 56,60 ----
{
bool exprListDetectedBefore = false;
+ int lastOp = node_->getRange().getStartIndex();
// find first ',' or '('
ExpressionMutator::Tokens::iterator i = token.begin();
***************
*** 66,71 ****
if ((*i).type_ == ExpressionMutator::comma)
{
! // collect a expression-list element:
!
if (!exprListDetectedBefore)
--- 67,72 ----
if ((*i).type_ == ExpressionMutator::comma)
{
! // collect a expression-list element:
! int OpStart = (*i).start_ - sourceNode_->getBlankedSourceStart();
if (!exprListDetectedBefore)
***************
*** 73,95 ****
exprListDetectedBefore = true;
! // add a property marking this expression as expression-list
! int OpStart = (*i).start_ - sourceNode_->getBlankedSourceStart();
ASTNodePtr property = createASTNode(ASTNodeTypes::expressionList,node_,OpStart,1);
node_->setPropertyNode(ASTNodeProperties::expressionTypeProperty,property);
}
}
i++;
}
- // check if a comma was found:
- if (i!=token.end())
- {
- // split assignment at this iterator position:
-
! // stop here - further mutation can be done by request.
! return;
}
- // we didn't found an expression list so check for assignment expression:
- splitAssignmentExpression(token);
}
--- 74,104 ----
exprListDetectedBefore = true;
! // add a property marking this expression as expression-list
ASTNodePtr property = createASTNode(ASTNodeTypes::expressionList,node_,OpStart,1);
node_->setPropertyNode(ASTNodeProperties::expressionTypeProperty,property);
}
+
+ int Start = lastOp;
+ int End = OpStart;
+ ASTNodePtr listElem = createASTNode(ASTNodeTypes::expression,node_, Start, End - Start);
+ node_->addChild(listElem);
+
+ lastOp = OpStart+1;
}
i++;
}
! if (exprListDetectedBefore)
! {
! int Start = lastOp;
! int End = node_->getRange().getEndIndex();
! ASTNodePtr listElem = createASTNode(ASTNodeTypes::expression,node_, Start, End - Start);
! node_->addChild(listElem);
! }
! else
! {
! // we didn't found an expression list so check for assignment expression:
! splitAssignmentExpression(token);
}
}
|
|
From: <net...@us...> - 2002-12-30 13:57:26
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv7533/rfta/src/rfta
Modified Files:
InlineTempRefactoringTest.cpp
Log Message:
-- added some test for bugs
Index: InlineTempRefactoringTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoringTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InlineTempRefactoringTest.cpp 30 Dec 2002 10:44:08 -0000 1.2
--- InlineTempRefactoringTest.cpp 30 Dec 2002 13:57:22 -0000 1.3
***************
*** 207,211 ****
applyRefactoringNoThrow ( "if (x==1) ;" , "x" , CPPUNIT_SOURCELINE() );
applyRefactoringExpectThrow( "y=2,x=1;" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
! applyRefactoringNoThrow ( "y=2,x==1;" , "x" , CPPUNIT_SOURCELINE() );
applyRefactoringExpectThrow( "int j = x = 2;", "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
// the following will fail because of incomplete expression parser:
--- 207,211 ----
applyRefactoringNoThrow ( "if (x==1) ;" , "x" , CPPUNIT_SOURCELINE() );
applyRefactoringExpectThrow( "y=2,x=1;" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
! applyRefactoringNoThrow ( "y+=x,y=2,x==1;" , "x" , CPPUNIT_SOURCELINE() );
applyRefactoringExpectThrow( "int j = x = 2;", "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
// the following will fail because of incomplete expression parser:
***************
*** 214,217 ****
--- 214,221 ----
applyRefactoringExpectThrow( "fct(x = 1);" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
applyRefactoringExpectThrow( "x++;" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
+ applyRefactoringNoThrow ( "y[x]==1;" , "x" , CPPUNIT_SOURCELINE() );
+ applyRefactoringNoThrow ( "*x == 1;" , "x" , CPPUNIT_SOURCELINE() );
+ applyRefactoringExpectThrow( "*(x++);" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
+ applyRefactoringExpectThrow( "&x = p;" , "x" , RefactoringError::variableIsAssigned , CPPUNIT_SOURCELINE() );
*/
}
|
|
From: <net...@us...> - 2002-12-30 10:45:04
|
Update of /cvsroot/cpptool/rfta/include/rfta/refactoring
In directory sc8-pr-cvs1:/tmp/cvs-serv30503/include/rfta/refactoring
Added Files:
InlineTempRefactoring.h
Log Message:
-- bugfix + moved header to global include
--- NEW FILE: InlineTempRefactoring.h ---
// //////////////////////////////////////////////////////////////////////////
// (c)Copyright 2002, Andre Baresel
// Created: 2002/12/25
// //////////////////////////////////////////////////////////////////////////
#ifndef RFTA_RFTA_INLINETEMPREFACTORING_H
#define RFTA_RFTA_INLINETEMPREFACTORING_H
#include <rfta/parser/ASTNode.h>
#include <rfta/refactoring/RefactoringBase.h>
#include <rfta/refactoring/ToolsBox.h>
namespace Refactoring
{
/// This class implements the algorithm for InlineTemp refactoring.
class RFTA_API InlineTempRefactoring : public RefactoringBase
{
public:
/**
* constructs on object and prepares the inlining
*/
InlineTempRefactoring(TextDocument &document,int temporaryLocation);
/**
* destroys object data.
*/
virtual ~InlineTempRefactoring();
/**
* function executes the inlining.
*/
void apply( bool doAddBraces ); //< refer 'areBracesSuggested'
/**
* function returns the name of the temporary which is about to be inlined
*/
const std::string getVariableName() const;
/**
* returns the number of occurences of the variable.
*/
int getVariableOccurrenceCount() const;
bool areBracesSuggested(); //< returns true if braces are suggested
private:
void prepare(); //< does prepare the inlining (check if it's possible and find the locations for inlining)
void findLocaleVariableOccurrences(); //< find the locations of variable uses
void calculateTempDeclRange(); //< finds the source range of the temporary declaration
bool isInitializerAtomic(); //< does check the initializer for being an atomic value or not
void checkForVariableAssignments();
int temporaryLocation_; //< location where refactoring was asked for
SourceASTNodePtr sourceNode_; //< parsed source of the location
ToolsBox::ASTNodes occurrences_; //< occurences of the temporary variable
ASTNodePtr localeVariableNode_; //< ast node of the identifier at selection
ASTNodePtr temporaryDecl; //< ast node of the declaration of the selected identifier
ASTNodePtr initValue_; //< ast node of the initializer that initializes the selected variable
SourceRange rangeOfTempDeclaration; //< Range of temporary declaration that is inlined (this range can be erased after inlining)
bool tempDeclaredInMiddle; //< true if the temporary is declared between other variables.
};
// Inlines methods for InlineTempRefactoring:
// ------------------------------------------
inline bool InlineTempRefactoring::areBracesSuggested()
{
return !isInitializerAtomic();
}
} // namespace Refactoring
#endif // RFTA_RFTA_INLINETEMPREFACTORING_H
|
|
From: <net...@us...> - 2002-12-30 10:44:36
|
Update of /cvsroot/cpptool/rfta/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv30410/doc
Modified Files:
AbstractSyntaxSTreeStructure.txt
Log Message:
-- documented changes
Index: AbstractSyntaxSTreeStructure.txt
===================================================================
RCS file: /cvsroot/cpptool/rfta/doc/AbstractSyntaxSTreeStructure.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AbstractSyntaxSTreeStructure.txt 15 Dec 2002 20:02:20 -0000 1.4
--- AbstractSyntaxSTreeStructure.txt 30 Dec 2002 10:44:32 -0000 1.5
***************
*** 54,57 ****
--- 54,62 ----
iteration-statement-property => [{statement}]
iteration-property => [for-iteration-expression]
+
+ [for-iteration-expression]
+ ? declaration-property => [declaration-or-expression-statement]
+ ? condition-property => [expression-statement]
+ ? next-step-property => [expression-statement]
[if-statement]
***************
*** 104,112 ****
value-property => [value-expression]
* Low level of detail which structure is not yet determined:
[condition-expression]
[type-decl-expression]
! [for-iteration-expression]
! [type-decl-expression]
! [exception-expression]
\ No newline at end of file
--- 109,122 ----
value-property => [value-expression]
+ * Expression level:
+
+ [expression]
+ ? expression-type-property => #mutate: assignmentExpression, expressionList
+ n [local-scope-identifier]
+ n [expression]
+
* Low level of detail which structure is not yet determined:
[condition-expression]
[type-decl-expression]
! [exception-expression]
|
|
From: <net...@us...> - 2002-12-30 10:44:13
|
Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv30300/rfta
Modified Files:
rfta.dsp InlineTempRefactoringTest.h
InlineTempRefactoringTest.cpp InlineTempRefactoring.cpp
Log Message:
-- bugfix + moved header to global include
Index: rfta.dsp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/rfta.dsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** rfta.dsp 28 Dec 2002 10:40:23 -0000 1.32
--- rfta.dsp 30 Dec 2002 10:44:08 -0000 1.33
***************
*** 219,223 ****
# Begin Source File
! SOURCE=.\InlineTempRefactoring.h
# End Source File
# Begin Source File
--- 219,223 ----
# Begin Source File
! SOURCE=..\..\include\rfta\refactoring\InlineTempRefactoring.h
# End Source File
# Begin Source File
Index: InlineTempRefactoringTest.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoringTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InlineTempRefactoringTest.h 28 Dec 2002 10:44:39 -0000 1.1
--- InlineTempRefactoringTest.h 30 Dec 2002 10:44:08 -0000 1.2
***************
*** 19,22 ****
--- 19,23 ----
CPPUNIT_TEST_SUITE( InlineTempRefactoringTest );
CPPUNIT_TEST( testEasiestCase );
+ CPPUNIT_TEST( testSelectAtUse );
CPPUNIT_TEST( testThrowNoInitializer );
CPPUNIT_TEST( testThrowInitializerNotSupported );
***************
*** 41,44 ****
--- 42,46 ----
void testEasiestCase();
+ void testSelectAtUse();
void testThrowNoInitializer();
void testThrowInitializerNotSupported();
Index: InlineTempRefactoringTest.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoringTest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InlineTempRefactoringTest.cpp 28 Dec 2002 10:44:39 -0000 1.1
--- InlineTempRefactoringTest.cpp 30 Dec 2002 10:44:08 -0000 1.2
***************
*** 6,10 ****
#include "stdafx.h"
#include "InlineTempRefactoringTest.h"
! #include "InlineTempRefactoring.h"
#include <rfta/refactoring/PlainTextDocument.h>
--- 6,10 ----
#include "stdafx.h"
#include "InlineTempRefactoringTest.h"
! #include <rfta/refactoring/InlineTempRefactoring.h>
#include <rfta/refactoring/PlainTextDocument.h>
***************
*** 50,54 ****
InlineTempRefactoring refactoring( *document_,
selectionIndex );
! refactoring.apply( );
CPPUNIT_ASSERT_EQUAL( LocaleVariableName, refactoring.getVariableName() );
}
--- 50,54 ----
InlineTempRefactoring refactoring( *document_,
selectionIndex );
! refactoring.apply( refactoring.areBracesSuggested() );
CPPUNIT_ASSERT_EQUAL( LocaleVariableName, refactoring.getVariableName() );
}
***************
*** 70,74 ****
InlineTempRefactoring refactoring( *document_,
selectionIndex );
! refactoring.apply( );
std::string failure = std::string("Test fails since it expects the refactoring error '") + expected.what() + "'.";
--- 70,74 ----
InlineTempRefactoring refactoring( *document_,
selectionIndex );
! refactoring.apply( refactoring.areBracesSuggested() );
std::string failure = std::string("Test fails since it expects the refactoring error '") + expected.what() + "'.";
***************
*** 125,128 ****
--- 125,151 ----
builder_->addKeyingMid( " double ", "x"," = 4;", "selection" );
builder_->add( "y += y * x;");
+ builder_->add(
+ " return x * getQuantity();"
+ "}" );
+
+ applyRefactoring( "x" );
+
+ std::string expectedSource(
+ "{"
+ " double y;"
+ " y += y * 4;"
+ " return 4 * getQuantity();"
+ "}" );
+ std::string actualSource( document_->getAllText() );
+ RFTA_ASSERT_EQUAL( expectedSource, actualSource );
+ }
+
+ void
+ InlineTempRefactoringTest::testSelectAtUse()
+ {
+ builder_->add(
+ "{"
+ " double y;double x=4;" );
+ builder_->addKeyingMid( " y += y * ", "x",";", "selection" );
builder_->add(
" return x * getQuantity();"
Index: InlineTempRefactoring.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/InlineTempRefactoring.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InlineTempRefactoring.cpp 28 Dec 2002 10:52:15 -0000 1.2
--- InlineTempRefactoring.cpp 30 Dec 2002 10:44:08 -0000 1.3
***************
*** 5,9 ****
#include "stdafx.h"
! #include "InlineTempRefactoring.h"
#include <rfta/refactoring/RefactoringError.h>
#include <rfta/refactoring/TextDocument.h>
--- 5,9 ----
#include "stdafx.h"
! #include <rfta/refactoring/InlineTempRefactoring.h>
#include <rfta/refactoring/RefactoringError.h>
#include <rfta/refactoring/TextDocument.h>
***************
*** 138,145 ****
++it )
{
! if ( *it != localeVariableNode_)
! {
! // get the expression this variable belongs to:
! ASTNodePtr parentExpr = boost::make_shared((*it)->getParentNode());
bool go_deeper = false;
do {
--- 138,145 ----
++it )
{
! // get the expression this variable belongs to:
! ASTNodePtr parentExpr = boost::make_shared((*it)->getParentNode());
! if ( parentExpr != temporaryDecl)
! {
bool go_deeper = false;
do {
***************
*** 297,301 ****
void
! InlineTempRefactoring::apply()
{
TransformList transforms;
--- 297,301 ----
void
! InlineTempRefactoring::apply( bool doAddBraces )
{
TransformList transforms;
***************
*** 309,313 ****
std::string newtext;
! if (isInitializerAtomic())
{
newtext = initValue_->getOriginalText();
--- 309,313 ----
std::string newtext;
! if (!doAddBraces)
{
newtext = initValue_->getOriginalText();
***************
*** 322,326 ****
++it )
{
! if ( *it != localeVariableNode_)
{
SourceRange range = (*it)->getRange();
--- 322,327 ----
++it )
{
! ASTNodePtr parentExpr = boost::make_shared((*it)->getParentNode());
! if ( parentExpr != temporaryDecl)
{
SourceRange range = (*it)->getRange();
|
|
From: <net...@us...> - 2002-12-30 10:43:29
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv30180
Modified Files:
VCLineBasedTextDocument.cpp rftavc6addin.odl rftavc6addin.dsp
Resource.h DSAddIn.cpp Commands.h Commands.cpp
Added Files:
SplitLocaleVariableDialog.cpp RftaInlineLocalVarDialog.cpp
How-To-Add-Commands.txt
Log Message:
-- added fcts 'InlineTemp' and 'SplitTemp'
--- NEW FILE: SplitLocaleVariableDialog.cpp ---
// SplitLocaleVariableDialog.cpp : implementation file
//
#include "stdafx.h"
#include "rftavc6addin.h"
#include "SplitLocaleVariableDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// SplitLocaleVariableDialog dialog
SplitLocaleVariableDialog::SplitLocaleVariableDialog(CWnd* pParent /*=NULL*/)
: CDialog(SplitLocaleVariableDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(SplitLocaleVariableDialog)
m_NewVariableName = _T("");
//}}AFX_DATA_INIT
}
void SplitLocaleVariableDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(SplitLocaleVariableDialog)
DDX_Text(pDX, IDC_NEW_NAME, m_NewVariableName);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(SplitLocaleVariableDialog, CDialog)
//{{AFX_MSG_MAP(SplitLocaleVariableDialog)
// NOTE: the ClassWizard will add message map macros here
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// SplitLocaleVariableDialog message handlers
--- NEW FILE: RftaInlineLocalVarDialog.cpp ---
// RftaInlineLocalVarDialog.cpp : implementation file
//
#include "stdafx.h"
#include "rftavc6addin.h"
#include "RftaInlineLocalVarDialog.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// RftaInlineLocalVarDialog dialog
RftaInlineLocalVarDialog::RftaInlineLocalVarDialog(CWnd* pParent /*=NULL*/)
: CDialog(RftaInlineLocalVarDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(RftaInlineLocalVarDialog)
m_VariableName = _T("");
m_AddBraces = FALSE;
//}}AFX_DATA_INIT
}
void RftaInlineLocalVarDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(RftaInlineLocalVarDialog)
DDX_Text(pDX, IDC_OLD_NAME, m_VariableName);
DDX_Check(pDX, IDC_CHECK1, m_AddBraces);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(RftaInlineLocalVarDialog, CDialog)
//{{AFX_MSG_MAP(RftaInlineLocalVarDialog)
// NOTE: the ClassWizard will add message map macros here
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// RftaInlineLocalVarDialog message handlers
--- NEW FILE: How-To-Add-Commands.txt ---
This article describes howto add new refactoring commands
to the vc6 addin:
step 1)
go to VS6-IDE class-browser of the project vc6addin.
right click the 'ICommands' element and select "Add Method"
Enter a method name representing your add in function
step 2)
go to VS6-IDE resource-browser of the project vc6addin
* right click 'Dialog' and select "insert dialog"
Choose a dialog identifier representing your addin function
* double click 'IDR_TOOLBAR_REFACTORING' and draw a new icon for
your function at the last position in the toolbar
* double click 'StringTable' and add a String describing the tool
tip for the new button in the tool bar (choose a good StringIdentifier
(IDS_...) for your function
step 3)
go to VS6-IDE class-browser of the project vc6addin.
* right click project name and select 'New Form...' (maybe you need to create a class
wizard file before this option appears). Select the Dialog-ID of your
designed dialog of step 1).
* create class members for all dialog data elements using the class wizard
(this is needed to access the data entered by the user)
step 4)
open the file DSAddIn.cpp and go to method'CDSAddIn::OnConnection'.
there your will find the code for registration of all refactoring methods that
appear in the tool bar.
Insert the following code for your addin function:
{
// ENTER HERE the ICommand function name you have choosen in Step 1)
LPCTSTR szCommand = _T(" xxxxxxxxxxxxxxxx ");
VARIANT_BOOL bRet;
CString strCmdString;
// ENTER HERE the StringTable Indentifier you have created in Step 2c)
strCmdString.LoadString( xxxxxxxxxxxxxxxxx );
strCmdString = szCommand + strCmdString;
CComBSTR bszCmdString(strCmdString);
// ENTER HERE the ICommand function name you have choosen in Step 1)
CComBSTR bszMethod(_T("RftaRenameLocaleVariable"));
CComBSTR bszCmdName(szCommand);
// ENTER HERE the correct index position of the icon in the toolbar
VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, xxxxxx , m_dwCookie, &bRet));
if (bRet == VARIANT_FALSE)
{
// AddCommand failed because a command with this name already
// exists. You may try adding your command under a different name.
// Or, you can fail to load as we will do here.
*OnConnection = VARIANT_FALSE;
return S_OK;
}
// Add toolbar buttons only if this is the first time the add-in
// is being loaded. Toolbar buttons are automatically remembered
// by Developer Studio from session to session, so we should only
// add the toolbar buttons once.
if (bFirstTime == VARIANT_TRUE)
{
VERIFY_OK(pApplication->
AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
}
}
Step 5)
Open file "Commands.h" and go to the section "ICommands methods"
There will be a new element with the name you entered in Step 1).
Please add the parameter "THIS"
Open file "Commands.cpp" go to the end.
There will be an empty implementation of the function you specified in
step 1).
Add calls to your refactoring functionality in here (also the dialog
handling etc.) ... watch the other functions...
Index: VCLineBasedTextDocument.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/VCLineBasedTextDocument.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VCLineBasedTextDocument.cpp 18 Dec 2002 22:53:27 -0000 1.1
--- VCLineBasedTextDocument.cpp 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 11,15 ****
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper )
{
initialize( getAllText() );
--- 11,15 ----
VCLineBasedTextDocument::VCLineBasedTextDocument( const TextDocumentHelper &helper )
! : helper_( helper ), LineBasedTextDocument(3)
{
initialize( getAllText() );
Index: rftavc6addin.odl
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/rftavc6addin.odl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rftavc6addin.odl 18 Dec 2002 22:53:27 -0000 1.1
--- rftavc6addin.odl 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 31,34 ****
--- 31,38 ----
[id(1)]
HRESULT RftaRenameLocaleVariable();
+ [id(2), helpstring("Inline local variable value at all occurences of the variable.")]
+ HRESULT RftaInlineLocaleVariable();
+ [id(3), helpstring("Split the uses of local variables at assignment point (create additional declaration with new name)")]
+ HRESULT RftaSplitLocaleVariable();
};
Index: rftavc6addin.dsp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/rftavc6addin.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rftavc6addin.dsp 18 Dec 2002 22:53:27 -0000 1.1
--- rftavc6addin.dsp 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 56,60 ****
# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../lib"
# Begin Special Build Tool
! TargetPath=\prg\vc\Rfta\build\rftavc6addin\Release\rftavc6addin.dll
SOURCE="$(InputPath)"
PostBuild_Desc=exporting...
--- 56,60 ----
# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../lib"
# Begin Special Build Tool
! TargetPath=\Projects\Cpptool\rfta\build\rftavc6addin\Release\rftavc6addin.dll
SOURCE="$(InputPath)"
PostBuild_Desc=exporting...
***************
*** 88,92 ****
# ADD LINK32 cppunitd_dll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"../../deplib/cppunit/lib"
# Begin Special Build Tool
! TargetPath=\prg\vc\Rfta\build\rftavc6addin\Debug\rftavc6addin.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Exporting...
--- 88,92 ----
# ADD LINK32 cppunitd_dll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"../../deplib/cppunit/lib"
# Begin Special Build Tool
! TargetPath=\Projects\Cpptool\rfta\build\rftavc6addin\Debug\rftavc6addin.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Exporting...
***************
*** 105,108 ****
--- 105,112 ----
# Begin Source File
+ SOURCE=.\res\bmp00001.bmp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\res\rftavc6addin.rc2
# PROP Exclude_From_Scan -1
***************
*** 118,121 ****
--- 122,133 ----
SOURCE=.\res\TBarMedm.bmp
# End Source File
+ # Begin Source File
+
+ SOURCE=.\res\toolbar1.bmp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\res\toolbar_.bmp
+ # End Source File
# End Group
# Begin Group "Stuffs"
***************
*** 218,221 ****
--- 230,249 ----
# Begin Source File
+ SOURCE=.\RftaInlineLocalVarDialog.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\RftaInlineLocalVarDialog.h
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\SplitLocaleVariableDialog.cpp
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\SplitLocaleVariableDialog.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\VCLineBasedTextDocument.cpp
# End Source File
***************
*** 225,228 ****
--- 253,260 ----
# End Source File
# End Group
+ # Begin Source File
+
+ SOURCE=".\How-To-Add-Commands.txt"
+ # End Source File
# Begin Source File
Index: Resource.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/Resource.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Resource.h 18 Dec 2002 22:53:27 -0000 1.1
--- Resource.h 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 5,14 ****
#define IDS_RFTAVC6ADDIN_LONGNAME 1
#define IDS_RFTAVC6ADDIN_DESCRIPTION 2
! #define IDS_CMD_STRING 3
! #define IDR_TOOLBAR_MEDIUM 128
! #define IDR_TOOLBAR_LARGE 129
#define IDD_RENAME_LOCALE_VARIABLE 130
#define IDC_NEW_NAME 1000
#define IDC_OLD_NAME 1001
// Next default values for new objects
--- 5,23 ----
#define IDS_RFTAVC6ADDIN_LONGNAME 1
#define IDS_RFTAVC6ADDIN_DESCRIPTION 2
! #define IDS_RENAMELOCAL_INFO 3
! #define IDS_INLINELOCAL_INFO 4
! #define IDS_SPLITLOCAL_INFO 5
! #define IDR_REPLACE_MEDIUM 128
#define IDD_RENAME_LOCALE_VARIABLE 130
+ #define IDB_INLINE_MEDIUM 131
+ #define IDD_INLINE_LOCAL_VARIABLE 132
+ #define IDR_TOOLBAR_REFACTORING 135
+ #define IDD_SPLIT_LOCAL_VAR 137
#define IDC_NEW_NAME 1000
#define IDC_OLD_NAME 1001
+ #define IDC_CHECK1 1002
+ #define ID_BUTTON32771 32771
+ #define ID_BUTTON32772 32772
+ #define ID_BUTTON32773 32773
// Next default values for new objects
***************
*** 16,22 ****
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 131
! #define _APS_NEXT_COMMAND_VALUE 32771
! #define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 25,31 ----
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
! #define _APS_NEXT_RESOURCE_VALUE 138
! #define _APS_NEXT_COMMAND_VALUE 32774
! #define _APS_NEXT_CONTROL_VALUE 1003
#define _APS_NEXT_SYMED_VALUE 101
#endif
Index: DSAddIn.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/DSAddIn.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSAddIn.cpp 18 Dec 2002 22:53:27 -0000 1.1
--- DSAddIn.cpp 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 42,46 ****
VERIFY_OK(pApplication->SetAddInInfo((long) AfxGetInstanceHandle(),
! (LPDISPATCH) m_pCommands, IDR_TOOLBAR_MEDIUM, IDR_TOOLBAR_LARGE, m_dwCookie));
// Inform DevStudio of the commands we implement
--- 42,46 ----
VERIFY_OK(pApplication->SetAddInInfo((long) AfxGetInstanceHandle(),
! (LPDISPATCH) m_pCommands, IDR_TOOLBAR_REFACTORING, IDR_TOOLBAR_REFACTORING, m_dwCookie));
// Inform DevStudio of the commands we implement
***************
*** 53,83 ****
// command are stored in the string table (IDS_CMD_STRING) and should
// be localized.
! LPCTSTR szCommand = _T("RftaRenameLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_CMD_STRING);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaRenameLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 0, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
*OnConnection = VARIANT_TRUE;
--- 53,153 ----
// command are stored in the string table (IDS_CMD_STRING) and should
// be localized.
! {
! LPCTSTR szCommand = _T("RftaRenameLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_RENAMELOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaRenameLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 0, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
! }
!
! // The command name should not be localized to other languages. The
! // tooltip, command description, and other strings related to this
! // command are stored in the string table (IDS_CMD_STRING) and should
! // be localized.
! {
! LPCTSTR szCommand = _T("RftaInlineLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_INLINELOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaInlineLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 1, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
! }
!
! // The command name should not be localized to other languages. The
! // tooltip, command description, and other strings related to this
! // command are stored in the string table (IDS_CMD_STRING) and should
! // be localized.
! {
! LPCTSTR szCommand = _T("RftaSplitLocaleVariable");
! VARIANT_BOOL bRet;
! CString strCmdString;
! strCmdString.LoadString(IDS_SPLITLOCAL_INFO);
! strCmdString = szCommand + strCmdString;
! CComBSTR bszCmdString(strCmdString);
! CComBSTR bszMethod(_T("RftaSplitLocaleVariable"));
! CComBSTR bszCmdName(szCommand);
! VERIFY_OK(pApplication->AddCommand(bszCmdString, bszMethod, 2, m_dwCookie, &bRet));
! if (bRet == VARIANT_FALSE)
! {
! // AddCommand failed because a command with this name already
! // exists. You may try adding your command under a different name.
! // Or, you can fail to load as we will do here.
! *OnConnection = VARIANT_FALSE;
! return S_OK;
! }
!
! // Add toolbar buttons only if this is the first time the add-in
! // is being loaded. Toolbar buttons are automatically remembered
! // by Developer Studio from session to session, so we should only
! // add the toolbar buttons once.
! if (bFirstTime == VARIANT_TRUE)
! {
! VERIFY_OK(pApplication->
! AddCommandBarButton(dsGlyph, bszCmdName, m_dwCookie));
! }
! }
*OnConnection = VARIANT_TRUE;
Index: Commands.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/Commands.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Commands.h 18 Dec 2002 22:53:27 -0000 1.1
--- Commands.h 30 Dec 2002 10:43:26 -0000 1.2
***************
*** 94,97 ****
--- 94,99 ----
// ICommands methods
STDMETHOD(RftaRenameLocaleVariable)(THIS);
+ STDMETHOD(RftaInlineLocaleVariable)(THIS);
+ STDMETHOD(RftaSplitLocaleVariable)();
};
Index: Commands.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/Commands.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Commands.cpp 22 Dec 2002 16:03:53 -0000 1.4
--- Commands.cpp 30 Dec 2002 10:43:26 -0000 1.5
***************
*** 7,13 ****
--- 7,17 ----
#include "Commands.h"
#include "RenameLocaleVariableDialog.h"
+ #include "RftaInlineLocalVarDialog.h"
+ #include "SplitLocaleVariableDialog.h"
#include "VCLineBasedTextDocument.h"
#include <rfta/refactoring/RefactoringError.h>
#include <rfta/refactoring/RenameTempRefactoring.h>
+ #include <rfta/refactoring/InlineTempRefactoring.h>
+ #include <rfta/refactoring/SplitTempRefactoring.h>
#ifdef _DEBUG
***************
*** 198,201 ****
--- 202,274 ----
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 );
+ }
+
+ return S_OK;
+ }
+
+ STDMETHODIMP CCommands::RftaInlineLocaleVariable()
+ {
+ AFX_MANAGE_STATE(AfxGetStaticModuleState())
+
+ TextDocumentHelper documentHelper = ApplicationHelper::activeTextDocument();
+ if ( !documentHelper.isValid() )
+ return S_OK; // current document is not a text document
+
+ VCLineBasedTextDocument document( documentHelper );
+ Refactoring::SourceRange selection = document.getSelectionRange();
+
+ try
+ {
+ Refactoring::InlineTempRefactoring refactoring( document,
+ selection.getStartIndex() );
+
+ bool addBraces = refactoring.areBracesSuggested();
+ RftaInlineLocalVarDialog dialog;
+ dialog.m_VariableName = refactoring.getVariableName().c_str();
+ dialog.m_AddBraces = addBraces;
+
+ if ( dialog.DoModal() == IDOK )
+ refactoring.apply( dialog.m_AddBraces==TRUE );
+ }
+ catch ( Refactoring::RefactoringError &e )
+ {
+ CString message( "An error occurred during refactoring:\n" );
+ message += e.what();
+
+ AfxMessageBox( message );
+ }
+
+ return S_OK;
+ }
+
+ STDMETHODIMP CCommands::RftaSplitLocaleVariable()
+ {
+ AFX_MANAGE_STATE(AfxGetStaticModuleState())
+
+ TextDocumentHelper documentHelper = ApplicationHelper::activeTextDocument();
+ if ( !documentHelper.isValid() )
+ return S_OK; // current document is not a text document
+
+ VCLineBasedTextDocument document( documentHelper );
+ Refactoring::SourceRange selection = document.getSelectionRange();
+
+ try
+ {
+ Refactoring::SplitTempRefactoring refactoring( document,
+ selection.getStartIndex() );
+
+ SplitLocaleVariableDialog dialog;
+
+ if ( dialog.DoModal() == IDOK )
+ {
+ refactoring.apply( LPCTSTR(dialog.m_NewVariableName) );
+ }
}
catch ( Refactoring::RefactoringError &e )
|
|
From: <net...@us...> - 2002-12-30 10:42:38
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin/res In directory sc8-pr-cvs1:/tmp/cvs-serv30007/res Added Files: bmp00001.bmp Log Message: -- redesign icons, added icons for new fcts --- NEW FILE: bmp00001.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: <net...@us...> - 2002-12-30 10:41:48
|
Update of /cvsroot/cpptool/rfta/src/rftavc6addin
In directory sc8-pr-cvs1:/tmp/cvs-serv29820/src/rftavc6addin
Modified Files:
rftavc6addin.rc
Log Message:
-- redesign icons, added icons for new fcts
Index: rftavc6addin.rc
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc6addin/rftavc6addin.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rftavc6addin.rc 18 Dec 2002 22:53:27 -0000 1.1
--- rftavc6addin.rc 30 Dec 2002 10:41:45 -0000 1.2
***************
*** 14,64 ****
/////////////////////////////////////////////////////////////////////////////
! // French (France) resources
! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
#ifdef _WIN32
! LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
#pragma code_page(1252)
#endif //_WIN32
- #ifdef APSTUDIO_INVOKED
- /////////////////////////////////////////////////////////////////////////////
- //
- // TEXTINCLUDE
- //
-
- 1 TEXTINCLUDE DISCARDABLE
- BEGIN
- "resource.h\0"
- END
-
- 2 TEXTINCLUDE DISCARDABLE
- BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
- END
-
- 3 TEXTINCLUDE DISCARDABLE
- BEGIN
- "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
- "#define _AFX_NO_OLE_RESOURCES\r\n"
- "#define _AFX_NO_TRACKER_RESOURCES\r\n"
- "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
- "\r\n"
- "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r\n"
- "#ifdef _WIN32\r\n"
- "LANGUAGE 12, 1\r\n"
- "#pragma code_page(1252)\r\n"
- "#endif //_WIN32\r\n"
- "#include ""res\\rftavc6addin.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
- "#include ""l.fra\\afxres.rc"" // Standard components\r\n"
- "#endif\r\n"
- "1 TYPELIB ""rftavc6addin.tlb""\r\n"
- "\0"
- END
-
- #endif // APSTUDIO_INVOKED
-
-
/////////////////////////////////////////////////////////////////////////////
//
--- 14,25 ----
/////////////////////////////////////////////////////////////////////////////
! // Neutral resources
! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
! LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
***************
*** 66,71 ****
//
! IDR_TOOLBAR_MEDIUM BITMAP MOVEABLE PURE "res\\TBarMedm.bmp"
! IDR_TOOLBAR_LARGE BITMAP MOVEABLE PURE "res\\TBarLrge.bmp"
#ifndef _MAC
--- 27,33 ----
//
! IDR_REPLACE_MEDIUM BITMAP MOVEABLE PURE "res\\TBarMedm.bmp"
! IDB_INLINE_MEDIUM BITMAP DISCARDABLE "res\\bmp00001.bmp"
! IDR_TOOLBAR_REFACTORING BITMAP DISCARDABLE "res\\toolbar1.bmp"
#ifndef _MAC
***************
*** 130,133 ****
--- 92,106 ----
END
+ IDD_SPLIT_LOCAL_VAR DIALOG DISCARDABLE 0, 0, 215, 50
+ STYLE 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
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 146,150 ****
--- 119,246 ----
BOTTOMMARGIN, 50
END
+
+ IDD_SPLIT_LOCAL_VAR, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 208
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 43
+ END
+ END
+ #endif // APSTUDIO_INVOKED
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Toolbar
+ //
+
+ IDR_TOOLBAR_REFACTORING TOOLBAR DISCARDABLE 16, 16
+ BEGIN
+ BUTTON ID_BUTTON32771
+ BUTTON ID_BUTTON32772
+ BUTTON ID_BUTTON32773
+ END
+
+ #endif // Neutral resources
+ /////////////////////////////////////////////////////////////////////////////
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ // Neutral (Default) resources
+
+ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
+ #ifdef _WIN32
+ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
+ #pragma code_page(1252)
+ #endif //_WIN32
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // Dialog
+ //
+
+ IDD_INLINE_LOCAL_VARIABLE DIALOG DISCARDABLE 0, 0, 315, 53
+ STYLE 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
+ CONTROL "Arrange braces arround inlined value:",IDC_CHECK1,
+ "Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,16,
+ 133,10
+ END
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // DESIGNINFO
+ //
+
+ #ifdef APSTUDIO_INVOKED
+ GUIDELINES DESIGNINFO DISCARDABLE
+ BEGIN
+ IDD_INLINE_LOCAL_VARIABLE, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 308
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 46
+ END
+ END
+ #endif // APSTUDIO_INVOKED
+
+ #endif // Neutral (Default) resources
+ /////////////////////////////////////////////////////////////////////////////
+
+
+ /////////////////////////////////////////////////////////////////////////////
+ // French (France) resources
+
+ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+ #ifdef _WIN32
+ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+ #pragma code_page(1252)
+ #endif //_WIN32
+
+ #ifdef APSTUDIO_INVOKED
+ /////////////////////////////////////////////////////////////////////////////
+ //
+ // TEXTINCLUDE
+ //
+
+ 1 TEXTINCLUDE DISCARDABLE
+ BEGIN
+ "resource.h\0"
+ END
+
+ 2 TEXTINCLUDE DISCARDABLE
+ BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
END
+
+ 3 TEXTINCLUDE DISCARDABLE
+ BEGIN
+ "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+ "#define _AFX_NO_OLE_RESOURCES\r\n"
+ "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+ "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+ "\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE 12, 1\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#endif //_WIN32\r\n"
+ "#include ""res\\rftavc6addin.rc2"" // non-Microsoft Visual C++ edited resources\r\n"
+ "#include ""l.fra\\afxres.rc"" // Standard components\r\n"
+ "#endif\r\n"
+ "1 TYPELIB ""rftavc6addin.tlb""\r\n"
+ "\0"
+ END
+
#endif // APSTUDIO_INVOKED
***************
*** 160,164 ****
IDS_RFTAVC6ADDIN_DESCRIPTION
"C++ Refactoring Assistant to help automatizing refactoring."
! IDS_CMD_STRING "\nRename locale variable refactoring\nRename the selected locale variable\nRftavc6addin Command"
END
--- 256,262 ----
IDS_RFTAVC6ADDIN_DESCRIPTION
"C++ Refactoring Assistant to help automatizing refactoring."
! IDS_RENAMELOCAL_INFO "\nRename locale variable refactoring\nRename the selected locale variable\nRename the selected locale variable"
! IDS_INLINELOCAL_INFO "\nInline local variable refactoring\nInline local variable refactoring\nInline local variable refactoring"
! IDS_SPLITLOCAL_INFO "\nSplit local variable definition and uses at assignment position\nSplit local variable definition and uses at assignment position\nSplit local variable definition and uses at assignment position"
END
|
