fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-01-15 14:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/vm/macro.c
    ! make macro substitution before macro compilation - Clipper
      compatible behavior - fix borrowed from xHarbour
    ! do not overwrite 1-st error object by others which can appear
      during macro TYPE() checking
This commit is contained in:
Przemyslaw Czerpak
2008-01-15 13:27:56 +00:00
parent 7bcc218e29
commit 0e5377f9dc
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -8,6 +8,13 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-01-15 14:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/vm/macro.c
! make macro substitution before macro compilation - Clipper
compatible behavior - fix borrowed from xHarbour
! do not overwrite 1-st error object by others which can appear
during macro TYPE() checking
2008-01-14 13:44 UTC+0100 Miguel Angel Marchuet Frutos <miguelangel@marchuet.net>
* source/vm/extend.c
* Undo Added conversion from logical params in hb_par* functions.

26
harbour/source/vm/macro.c
View File

@@ -152,9 +152,9 @@ static HB_ERROR_HANDLE( hb_macroErrorType )
HB_MACRO_PTR pMacro = ( HB_MACRO_PTR ) ErrorInfo->Cargo;
/* copy error object for later diagnostic usage */
if( pMacro->pError )
hb_itemRelease( pMacro->pError );
pMacro->pError = hb_itemNew( ErrorInfo->Error );
if( !pMacro->pError )
pMacro->pError = hb_itemNew( ErrorInfo->Error );
pMacro->status &= ~HB_MACRO_CONT;
/* ignore rest of compiled code */
@@ -389,6 +389,7 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext, BYTE flags )
{
HB_MACRO struMacro;
int iStatus;
BOOL fFree;
#ifdef HB_MACRO_STATEMENTS
char * pText;
char * pOut;
@@ -398,8 +399,21 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext, BYTE flags )
struMacro.Flags = HB_MACRO_GEN_PUSH;
struMacro.uiNameLen = HB_SYMBOL_NAME_LEN;
struMacro.status = HB_MACRO_CONT;
struMacro.string = pItem->item.asString.value;
struMacro.length = pItem->item.asString.length;
/*
* Clipper appears to expand nested macros staticly vs. by
* Macro Parser, f.e.:
* PROCEDURE Main()
* LOCAL cText
* cText := "( v := 'A' ) + &v"
* M->v := "'B'"
* ? "Macro:", cText
* ? "Result:", &cText
* ? "Type:", type(cText)
* RETURN
*/
struMacro.string = hb_macroTextSubst( pItem->item.asString.value, &struMacro.length );
fFree = struMacro.string != pItem->item.asString.value;
if( iContext != 0 )
{
@@ -458,7 +472,6 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext, BYTE flags )
hb_xfree( pOut );
}
#endif
hb_stackPop(); /* remove compiled string */
if( iStatus == HB_MACRO_OK && ( struMacro.status & HB_MACRO_CONT ) )
{
@@ -470,6 +483,9 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext, BYTE flags )
else
hb_macroSyntaxError( &struMacro );
if( fFree )
hb_xfree( struMacro.string );
hb_macroDelete( &struMacro );
}
}