From 78339ed12d1c3076edf35e10970ec79026bd6e17 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Sat, 5 Aug 2000 01:58:04 +0000 Subject: [PATCH] 2000-08-04 13:00 UTC+0800 Ron Pinkas * source/compiler/harbour.slx * Optimized rules for WITH --- harbour/ChangeLog | 6 +++- harbour/source/compiler/harbour.slx | 45 ++++------------------------- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 209d4335ed..fb566667d0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,9 +1,13 @@ +2000-08-04 13:00 UTC+0800 Ron Pinkas + * source/compiler/harbour.slx + * Optimized rules for WITH + 2000-08-04 19:00 UTC-0400 David G. Holm * source/rtl/run.c * Changed submitted by Marek Paliwoda -2000-08-03 18:50 UTC+0800 Ron Pinkas +2000-08-04 13:00 UTC+0800 Ron Pinkas * source/macro/macro.slx * source/compiler/harbour.slx + Added (int) casting to isalpha() parameter calls. diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx index 86e981c62b..3e5952ec95 100644 --- a/harbour/source/compiler/harbour.slx +++ b/harbour/source/compiler/harbour.slx @@ -696,46 +696,11 @@ LANGUAGE_RULES_ARE { IF_SEQUENCE_IS( WITH_ , 0 , 0 , 0 ) REDUCE_TO( HB_WITH_ID , 0 ), /* This _WITH_ is not at BOL. */ - IF_SEQUENCE_IS( _WITH_ , TO , 0 , 0 ) REDUCE_TO( HB_WITH_ID , TO ), - IF_SEQUENCE_IS( _WITH_ , INASSIGN , 0 , 0 ) REDUCE_TO( HB_WITH_ID , INASSIGN ), - /* IF_SEQUENCE_IS( _WITH_ , INC , 0 , 0 ) REDUCE_TO( HB_WITH_ID , INC ), - IF_SEQUENCE_IS( _WITH_ , DEC , 0 , 0 ) REDUCE_TO( HB_WITH_ID , DEC ), */ - IF_SEQUENCE_IS( _WITH_ , ALIASOP , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ALIASOP ), - IF_SEQUENCE_IS( _WITH_ , AND , 0 , 0 ) REDUCE_TO( HB_WITH_ID , AND ), - IF_SEQUENCE_IS( _WITH_ , OR , 0 , 0 ) REDUCE_TO( HB_WITH_ID , OR ), - IF_SEQUENCE_IS( _WITH_ , EQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , EQ ), - IF_SEQUENCE_IS( _WITH_ , NE2 , 0 , 0 ) REDUCE_TO( HB_WITH_ID , NE2 ), - IF_SEQUENCE_IS( _WITH_ , LE , 0 , 0 ) REDUCE_TO( HB_WITH_ID , LE ), - IF_SEQUENCE_IS( _WITH_ , GE , 0 , 0 ) REDUCE_TO( HB_WITH_ID , GE ), - IF_SEQUENCE_IS( _WITH_ , PLUSEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , PLUSEQ ), - IF_SEQUENCE_IS( _WITH_ , MINUSEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , MINUSEQ ), - IF_SEQUENCE_IS( _WITH_ , MULTEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , MULTEQ ), - IF_SEQUENCE_IS( _WITH_ , DIVEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , DIVEQ ), - IF_SEQUENCE_IS( _WITH_ , POWER , 0 , 0 ) REDUCE_TO( HB_WITH_ID , POWER ), - IF_SEQUENCE_IS( _WITH_ , EXPEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , EXPEQ ), - IF_SEQUENCE_IS( _WITH_ , MODEQ , 0 , 0 ) REDUCE_TO( HB_WITH_ID , MODEQ ), - IF_SEQUENCE_IS( _WITH_ , '!' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '!' ), - IF_SEQUENCE_IS( _WITH_ , '<' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '<' ), - IF_SEQUENCE_IS( _WITH_ , '>' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '>' ), - IF_SEQUENCE_IS( _WITH_ , '(' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '(' ), - IF_SEQUENCE_IS( _WITH_ , '[' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '[' ), - IF_SEQUENCE_IS( _WITH_ , ']' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ']' ), - IF_SEQUENCE_IS( _WITH_ , '-' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '-' ), - IF_SEQUENCE_IS( _WITH_ , '+' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '+' ), - IF_SEQUENCE_IS( _WITH_ , '*' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '*' ), - IF_SEQUENCE_IS( _WITH_ , '/' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '/' ), - IF_SEQUENCE_IS( _WITH_ , '^' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '^' ), - IF_SEQUENCE_IS( _WITH_ , '%' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '%' ), - IF_SEQUENCE_IS( _WITH_ , ':' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ':' ), - IF_SEQUENCE_IS( _WITH_ , '=' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '=' ), - IF_SEQUENCE_IS( _WITH_ , ',' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ',' ), - IF_SEQUENCE_IS( _WITH_ , '$' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '$' ), - IF_SEQUENCE_IS( _WITH_ , ')' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ')' ), - IF_SEQUENCE_IS( _WITH_ , '}' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '}' ), - IF_SEQUENCE_IS( _WITH_ , '|' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '|' ), - IF_SEQUENCE_IS( _WITH_ , '\n' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , '\n' ), - IF_SEQUENCE_IS( _WITH_ , ';' , 0 , 0 ) REDUCE_TO( HB_WITH_ID , ';' ), - IF_SEQUENCE_IS( _WITH_ , 0 , 0 , 0 ) REDUCE_TO( WITH , 0 ), + IF_SEQUENCE_IS( IDENTIFIER , _WITH_ , 0 , 0 ) REDUCE_TO( IDENTIFIER , WITH ), + IF_SEQUENCE_IS( MACROVAR , _WITH_ , 0 , 0 ) REDUCE_TO( MACROVAR , WITH ), + IF_SEQUENCE_IS( MACROTEXT , _WITH_ , 0 , 0 ) REDUCE_TO( MACROTEXT , WITH ), + IF_SEQUENCE_IS( ')' , _WITH_ , 0 , 0 ) REDUCE_TO( ')' , WITH ), + IF_SEQUENCE_IS( _WITH_ , 0 , 0 , 0 ) REDUCE_TO( HB_WITH_ID , 0 ), IF_SEQUENCE_IS( DO , TO , 0 , 0 ) REDUCE_TO( HB_DO_ID , TO ), IF_SEQUENCE_IS( DO , INASSIGN , 0 , 0 ) REDUCE_TO( HB_DO_ID , INASSIGN ),