From 7df80dd7098ddea07c26d37cb1e790eae841a5a6 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Fri, 17 Nov 2000 19:44:48 +0000 Subject: [PATCH] ChangeLog 2000-11-17 20:50 UTC+0100 --- harbour/ChangeLog | 6 ++++++ harbour/source/vm/macro.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5767483c6f..ece3e4ed9b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +2000-11-17 20:50 UTC+0100 Ryszard Glab + + *source/hvm/macro.c + * fixed initialization of 'status' structure member that caused + random 'undefined function' error messages + 2000-11-17 16:40 GMT+1 Maurilio Longo * source/rtl/tbrowse.prg ! fixed redrawing of header and footer separator (it was shorter than needed) diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c index 21f667bbdd..53d126cccd 100644 --- a/harbour/source/vm/macro.c +++ b/harbour/source/vm/macro.c @@ -412,6 +412,7 @@ void hb_macroGetValue( HB_ITEM_PTR pItem ) struMacro.Flags = HB_MACRO_GEN_PUSH; struMacro.bShortCuts = hb_comp_bShortCuts; struMacro.uiNameLen = HB_SYMBOL_NAME_LEN; + struMacro.status = HB_MACRO_CONT; iStatus = hb_macroParse( &struMacro, szString ); hb_stackPop(); /* remove compiled string */ @@ -442,6 +443,7 @@ void hb_macroSetValue( HB_ITEM_PTR pItem ) struMacro.Flags = HB_MACRO_GEN_POP; struMacro.bShortCuts = hb_comp_bShortCuts; struMacro.uiNameLen = HB_SYMBOL_NAME_LEN; + struMacro.status = HB_MACRO_CONT; iStatus = hb_macroParse( &struMacro, szString ); hb_stackPop(); /* remove compiled string */ @@ -511,6 +513,7 @@ static void hb_macroUseAliased( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int iFlag struMacro.Flags = iFlag; struMacro.bShortCuts = hb_comp_bShortCuts; struMacro.uiNameLen = HB_SYMBOL_NAME_LEN; + struMacro.status = HB_MACRO_CONT; iStatus = hb_macroParse( &struMacro, szString ); hb_xfree( szString ); struMacro.string = NULL; @@ -537,6 +540,7 @@ static void hb_macroUseAliased( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int iFlag struMacro.Flags = iFlag | HB_MACRO_GEN_ALIASED; struMacro.bShortCuts = hb_comp_bShortCuts; struMacro.uiNameLen = HB_SYMBOL_NAME_LEN; + struMacro.status = HB_MACRO_CONT; iStatus = hb_macroParse( &struMacro, szString ); hb_stackPop(); /* remove compiled string */ @@ -564,7 +568,8 @@ HB_MACRO_PTR hb_macroCompile( char * szString ) pMacro = ( HB_MACRO_PTR ) hb_xgrab( sizeof( HB_MACRO ) ); pMacro->Flags = HB_MACRO_DEALLOCATE | HB_MACRO_GEN_PUSH; pMacro->bShortCuts = hb_comp_bShortCuts; - pMacro->uiNameLen = HB_SYMBOL_NAME_LEN; + pMacro->uiNameLen = HB_SYMBOL_NAME_LEN; + pMacro->status = HB_MACRO_CONT; iStatus = hb_macroParse( pMacro, szString ); if( ! ( iStatus == HB_MACRO_OK && ( pMacro->status & HB_MACRO_CONT ) ) ) {