From 025c50818c34d595c04c552b082b02132701273d Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Sun, 20 Jan 2002 15:02:55 +0000 Subject: [PATCH] 2002-01-19 06:11 UTC+0100 Ron Pinkas * source/compiler/harbour.slx ! Minor bug correction. --- harbour/ChangeLog | 4 ++++ harbour/source/compiler/harbour.slx | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 33827f6cc2..e464c33c31 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,10 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + * source/vm/memvars.c +2002-01-19 06:11 UTC+0100 Ron Pinkas + + Added ChangeLog to the /contrib/apollo dir + + contrib/apollo/test/apollo.ch + defines for function sx_SysProp * contrib/apollo/test/apollo.prg Added define "Apollo.ch" diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx index 0fd3da149f..9c93ab627e 100644 --- a/harbour/source/compiler/harbour.slx +++ b/harbour/source/compiler/harbour.slx @@ -934,23 +934,23 @@ int hb_comp_SLX_CustomAction( int x, int aiHold[], int *ptr_iHold, BOOL *ptr_bIg iIdentifier++; DEBUG_INFO( printf( "HB_IN, Primary Identifier %s Increased to: %i\n", "IN", iIdentifier ) ); return IDENTIFIER; - } + } case HB_STEP : *ptr_bIgnoreWords = FALSE; - if( iLastToken == NUM_INTEGER || iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT || iLastToken == ')' || iLastToken == ']' ) + if( iLastToken == NUM_INTEGER || iLastToken == NUM_LONG || iLastToken == NUM_DOUBLE || iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT || iLastToken == ')' || iLastToken == ']' ) { return STEP + DONT_REDUCE; } else - { - yylval.string = hb_compIdentifierNew( "STEP", TRUE ); - iIdentifier++; - DEBUG_INFO( printf( "HB_STEP, Primary Identifier %s Increased to: %i\n", "STEP", iIdentifier ) ); - return IDENTIFIER; - } + { + yylval.string = hb_compIdentifierNew( "STEP", TRUE ); + iIdentifier++; + DEBUG_INFO( printf( "HB_STEP, Primary Identifier %s Increased to: %i\n", "STEP", iIdentifier ) ); + return IDENTIFIER; + } case HB_TO : *ptr_bIgnoreWords = FALSE; - if( iLastToken == NUM_INTEGER || iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT || iLastToken == ')' || iLastToken == ']' ) + if( iLastToken == NUM_INTEGER || iLastToken == NUM_LONG || iLastToken == NUM_DOUBLE || iLastToken == IDENTIFIER || iLastToken == MACROVAR || iLastToken == MACROTEXT || iLastToken == ')' || iLastToken == ']' ) { return TO + DONT_REDUCE; } else {