From 039265a0ba7dc92e4d88af465dff595d979ad889 Mon Sep 17 00:00:00 2001
From: Ron Pinkas <ron@profit-master.com>
Date: Sat, 4 Nov 2000 23:03:31 +0000
Subject: [PATCH] 2000-11-04 14:45 UTC+0800 Ron Pinkas <ron@profit-master.com>

   * include/hbexpra.c
   * source/pp/pptable.c
     ! Excluded Ryszard changes using #if[n]def SIMPLEX from SimpLex version.
       Ryszard code remains intact for Flex version (including 3 reported bugs).

   * hb_slex.bc
     + Added -DSIMPLEX when compiling source/pp/pptable.c, source/compiler/expropta.c, and source/macro/macroa.c
       /* This allow conditional exclusion of Ryszard changes for SimpLex version. */

     /* Todo - have to do same in GNU make */
---
 harbour/ChangeLog           | 13 +++++++++++++
 harbour/hb_slex.bc          |  6 +++---
 harbour/include/hbexpra.c   |  9 ++++++++-
 harbour/source/pp/pptable.c |  4 ++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2811e5c1c4..de78e4773a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,16 @@
+2000-11-04 14:45 UTC+0800 Ron Pinkas <ron@profit-master.com>
+
+   * include/hbexpra.c
+   * source/pp/pptable.c
+     ! Excluded Ryszard changes using #if[n]def SIMPLEX from SimpLex version.
+       Ryszard code remains intact for Flex version (including 3 reported bugs).
+
+   * hb_slex.bc
+     + Added -DSIMPLEX when compiling source/pp/pptable.c, source/compiler/expropta.c, and source/macro/macroa.c
+       /* This allow conditional exclusion of Ryszard changes for SimpLex version. */
+
+     /* Todo - have to do same in GNU make */
+
 2000-11-04 11:17 UTC+0800 Ron Pinkas <ron@profit-master.com>
    * makefile.bc
      Added missing dependancy of source/rtl/tgetint.prg
diff --git a/harbour/hb_slex.bc b/harbour/hb_slex.bc
index 7014aa44af..9648bdce7b 100644
--- a/harbour/hb_slex.bc
+++ b/harbour/hb_slex.bc
@@ -705,7 +705,7 @@ $(OBJ_DIR)\pplib.obj : $(PP_DIR)\pplib.c
    tlib $(PP_LIB) $(ARFLAGS) -+$@,,
 
 $(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
+   $(CC) $(CLIBFLAGS) -DSIMPLEX -o$@ $**
    tlib $(PP_LIB) $(ARFLAGS) -+$@,,
 
 $(OBJ_DIR)\pragma.obj : $(PP_DIR)\pragma.c
@@ -791,7 +791,7 @@ $(OBJ_DIR)\genhrb.obj : $(COMPILER_DIR)\genhrb.c
    $(CC) $(CLIBFLAGS) -o$@ $**
 
 $(OBJ_DIR)\expropta.obj : $(COMPILER_DIR)\expropta.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
+   $(CC) $(CLIBFLAGS) -DSIMPLEX -o$@ $**
 
 $(OBJ_DIR)\exproptb.obj : $(COMPILER_DIR)\exproptb.c
    $(CC) $(CLIBFLAGS) -o$@ $**
@@ -1894,7 +1894,7 @@ $(OBJ_DIR)\macroslx.obj : $(MACRO_DIR)\macroslx.c
    tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
 
 $(OBJ_DIR)\macroa.obj : $(MACRO_DIR)\macroa.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
+   $(CC) $(CLIBFLAGS) -DSIMPLEX -o$@ $**
    tlib $(MACRO_LIB) $(ARFLAGS) -+$@,,
 
 $(OBJ_DIR)\macrob.obj : $(MACRO_DIR)\macrob.c
diff --git a/harbour/include/hbexpra.c b/harbour/include/hbexpra.c
index af80853b59..51a563bf5d 100644
--- a/harbour/include/hbexpra.c
+++ b/harbour/include/hbexpra.c
@@ -307,6 +307,9 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms )
             HB_EXPR_PCODE1( hb_compExprDelete, pName );
          }
       }
+
+#ifndef SIMPLEX
+
       else if( ( strcmp( "_GET_", pName->value.asSymbol ) == 0 ) && iCount )
       {
          /* Reserved Clipper function used to handle GET variables
@@ -397,14 +400,18 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms )
             pName->value.asSymbol = hb_compIdentifierNew( "__GET", TRUE );
             if( pArg->ExprType == HB_ET_VARIABLE )
             {
-               /* Change into a variable reference so a set/get codeblock 
+               /* Change into a variable reference so a set/get codeblock
                 * will assign a new value correctly
                 */
                pArg->ExprType = HB_ET_VARREF;
             }
 #endif
       }
+
+#endif
+
    }
+
    else if( pName->ExprType == HB_ET_MACRO )
    {
       /* Signal that macro compiler have to generate a pcode that will
diff --git a/harbour/source/pp/pptable.c b/harbour/source/pp/pptable.c
index 491d901b7d..44086516b7 100644
--- a/harbour/source/pp/pptable.c
+++ b/harbour/source/pp/pptable.c
@@ -211,7 +211,11 @@ void hb_pp_Table( void )
        "if ( Empty(\1A30) ) ;   SET FORMAT TO ; else ;   __SetFormat( &('{||' + \1A30 + '()}') ) ; end",&sC___96 };
    static COMMANDS sC___98 = {0,"SET","FORMAT TO","__SetFormat()",&sC___97 };
    static COMMANDS sC___99 = {0,"@","\1A00, \1B00 GET \1C00 [PICTURE \1D00] [VALID \1E00] [WHEN \1F00] [SEND \1G00]",
+#ifdef SIMPLEX
+       "SetPos( \1A00, \1B00 ) ; AAdd( GetList, _GET_( \1C00, \1C20, \1D00, \1E40, \1F40,{|_1| If( PCount()==0,\1C00,\1C00:=_1 )} ):display() ) [; ATail(GetList):\1G00]",&sC___98 };
+#else
        "SetPos( \1A00, \1B00 ) ; AAdd( GetList, _GET_( \1C00, \1C20, \1D00, \1E40, \1F40, ):display() ) [; ATail(GetList):\1G00]",&sC___98 };
+#endif
    static COMMANDS sC___100 = {0,"@","\1A00, \1B00 SAY \1C00 [\1D10] GET \1E00 [\1F10]",
        "@ \1A00, \1B00 SAY \1C00 [\1D00] ; @ Row(), Col()+1 GET \1E00 [\1F00]",&sC___99 };
    static COMMANDS sC___101 = {0,"@","\1A00, \1B00 GET \1C00 [\1D10] RANGE \1E00, \1F00 [\1G10]",