diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 25b92635ff..c7aa2fa079 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2001-01-21 15:40 UTC-0800 Ron Pinkas + * source/compiler/harbour.slx + * Minor correction. + 2001-01-20 17:20 UTC-0800 Ron Pinkas * hb_slex.vc + Added -DSIMPLEX to CLIBFLAGS diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx index c15f0c237d..0fa1a2ee5b 100644 --- a/harbour/source/compiler/harbour.slx +++ b/harbour/source/compiler/harbour.slx @@ -293,6 +293,7 @@ LANGUAGE_RULES_ARE { IF_SEQUENCE_IS( WANTS_VAR , IDENTIFIER , 0 , 0 ) PASS_THROUGH(), IF_SEQUENCE_IS( WANTS_VAR , MACROVAR , 0 , 0 ) PASS_THROUGH(), IF_SEQUENCE_IS( WANTS_VAR , MACROTEXT , 0 , 0 ) PASS_THROUGH(), + IF_SEQUENCE_IS( WANTS_VAR , '&' , 0 , 0 ) PASS_THROUGH(), IF_SEQUENCE_IS( WANTS_VAR , 0 , 0 , 0 ) REDUCE_TO( HB_IDENTIFIER , 0 ), /* Wants Identifier. */ @@ -920,7 +921,7 @@ int hb_comp_SLX_CustomAction( int x, int aiHold[], int *ptr_iHold, BOOL *ptr_bIg case HB_WITH : *ptr_bIgnoreWords = FALSE; - if( iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT ) + if( iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT || iLastToken == ')' ) { return WITH + DONT_REDUCE; } else {