fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2000-11-04 14:45 UTC+0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* 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 */
This commit is contained in:
Ron Pinkas
2000-11-04 23:03:31 +00:00
parent 23f87d712b
commit 039265a0ba
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -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

6
harbour/hb_slex.bc
View File

@@ -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

9
harbour/include/hbexpra.c
View File

@@ -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

4
harbour/source/pp/pptable.c
View File

@@ -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]",