diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a103bf4e43..c25bb22ac8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2001-08-04 11:00 UTC-0800 Ron Pinkas + * source/vm/macro.c + ! Added missing ; in line 956 + 2001-08-04 15:15 UTC+0100 Ryszard Glab * doc/en/compiler.txt @@ -32,25 +36,25 @@ * source/macro/macroa.c * source/macro/macrob.c * added HB_SETMACRO() function to control various compatibility - issues at the runtime. + issues at the runtime. HB_SETMACRO( , ) - This controls the macro compiler's features. The feature can + This controls the macro compiler's features. The feature can be either enabled (.T.) or disabled (.F.) Currently available features (defined in set.ch file) HB_SM_HARBOUR => (enabled by default) - enable/disable harbour extensions + enable/disable harbour extensions HB_SM_XBASE => (disaled by default) enable/disable xbase dialects extensions HB_SM_SHORTCUTS => (enabled by default) enable/disable shortcut evaluation of logical expressions - HB_SM_PREPROC => + HB_SM_PREPROC => enable/disable preprocessing (if harbour is build with HB_MACRO_STATEMENTS option) * source/rdd/dblist.prg * the array of expressions is scanned for extended macro lists when xbase compatibility is enabled (see HB_SETMACRO()) - + * source/vm/asort.c * moved HB_ASORT_OPT_ITEMCOPY setting to hbsetup.h @@ -59,7 +63,7 @@ in the harbour code (Please keep updated this file (and hbsetup.ch) if a new setting is used) - + + doc/en/macro.txt * initial documentation for macro compiler * documentation of HB_SETMACRO() function @@ -67,7 +71,7 @@ 2001-08-04 00:06 GMT Dave Pearson * doc/whatsnew.txt * Brought the document up to date. - + 2001-08-03 19:30 GMT -3 Luiz Rafael Culik *Changelog *renamed to Changelog.011 and started an new one @@ -78,7 +82,7 @@ +gl option to tell that the compiler is gcc under linux *fixes to the edit mode to be more compatible with linux *Now Setbuild() return the command line to gcc(Linux and Os/2) insted of an response file - + * source/pp/pragma.c * contrib/dot/pp_harb.ch * tests/inline_c.prg diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c index c826b134a8..7b2c39e3f0 100644 --- a/harbour/source/vm/macro.c +++ b/harbour/source/vm/macro.c @@ -63,10 +63,10 @@ #include "hbpp.h" #endif -/* .and. & .or. expressions shortcuts - the expression optimiser needs +/* .and. & .or. expressions shortcuts - the expression optimiser needs * a global variable */ -BOOL hb_comp_bShortCuts = TRUE; +BOOL hb_comp_bShortCuts = TRUE; /* various flags for macro compiler */ static ULONG s_macroFlags = (HB_SM_SHORTCUTS | HB_SM_HARBOUR); @@ -88,7 +88,7 @@ static int hb_macroParse( HB_MACRO_PTR pMacro, char * szString ) { /* update the current status for logical shortcuts */ hb_comp_bShortCuts = s_macroFlags & HB_SM_SHORTCUTS; - + /* initialize the input buffer - it will be scanned by lex */ pMacro->string = szString; pMacro->length = strlen( szString ); @@ -441,7 +441,7 @@ char * hb_macroTextSubst( char * szString, ULONG *pulStringLen ) * * iContext contains HB_P_MACROPUSHPARE if a macro is used inside a codeblock * EVAL( {|| ¯o} ) - * + * */ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext ) { @@ -470,14 +470,14 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext ) if( iContext != 0 ) { - /* + /* * If compiled in xbase compatibility mode: * macro := "1,2" * funCall( ¯o ) ==> funCall( 1, 2 ) * { ¯o } ==> { 1, 2 } * var[ ¯o ] ==> var[ 1, 2 ] * var := (somevalue, ¯o) ==> var := 2 - * + * * Always: * macro := "1,2" * EVAL( {|| ¯o} ) @@ -495,7 +495,7 @@ void hb_macroGetValue( HB_ITEM_PTR pItem, BYTE iContext ) { char * ptr; int slen; - + pText = ( char * ) hb_xgrab( HB_PP_STR_SIZE ); pOut = ( char * ) hb_xgrab( HB_PP_STR_SIZE ); ptr = pText; @@ -887,7 +887,7 @@ char * hb_macroGetType( HB_ITEM_PTR pItem ) return szType; } -/* +/* * Set macro capabilities if flag > 0 or get current macro capabilities * if flag == 0 */ @@ -895,21 +895,21 @@ ULONG hb_macroSetMacro( BOOL bSet, ULONG flag ) { ULONG ulCurrentFlags = s_macroFlags; - if( flag > 0 ) + if( flag > 0 ) { if( bSet ) s_macroFlags |= flag; else s_macroFlags &= ~flag; } - + return ulCurrentFlags; } HB_FUNC( HB_SETMACRO ) { int iPrmCnt = hb_pcount(); - + if( iPrmCnt > 0 ) { ULONG ulFlags = ( ULONG ) hb_parnl( 1 ); @@ -932,7 +932,7 @@ HB_FUNC( HB_SETMACRO ) if( pValue ) hb_macroSetMacro( hb_itemGetL( pValue ), ulFlags ); break; - + case HB_SM_PREPROC : /* enable/disable preprocessing before compilation */ hb_retl( s_macroFlags & ulFlags ); @@ -953,8 +953,8 @@ HB_FUNC( HB_SETMACRO ) break; default: - /* do nothing */ - } + ;/* do nothing */ + } } else hb_ret(); /* return NIL */