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

andijahja@cbn.net.id

Browse Source
This commit is contained in:
Andi Jahja
2001-11-19 11:31:27 +00:00
parent 891690234d
commit 803393db40
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -1,3 +1,12 @@
2001-11-19 xx:xx GMT+0700 Andi Jahja <harbour@cbn.net.id>
* source/compiler/harbour.y
! add type casts for MsVC
* makefile.vc / makefile.bc
! add flag "--no-line" to bison to kill MsVC warnings,
so now macroy.c and harboury.c will be cleanly compiled
! change compiler flag: -w => -W3 ( no longer cause eye irritation )
2001-11-18 22:15 GMT+1 JFL (mafact) <jfl@mafact.com>
* harbour/source/vm/classes.c
* change CLSADDMSG() to intercept Operator overloading and

6
harbour/makefile.bc
View File

@@ -833,12 +833,12 @@ $(OBJ_DIR)\harbour.obj : $(COMPILER_DIR)\harbour.c
!if $(HB_LEX) == SIMPLEX
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.sly
bison -d $** -o$@
bison --no-line -d $** -o$@
!else
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
bison -d $** -o$@
bison --no-line -d $** -o$@
!endif
@@ -2095,7 +2095,7 @@ $(OBJ_DIR)\msgzhgb.obj : $(LANG_DIR)\msgzhgb.c
#
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
bison -p hb_comp -d $** -o$@
bison --no-line -p hb_comp -d $** -o$@
!if $(HB_LEX) == SIMPLEX
# Flex not needed in SimpLex build.

22
harbour/makefile.vc
View File

@@ -919,7 +919,7 @@ $(HARBOUR_EXE) : \
$(COMPILER_DIR)\exproptb.c \
$(COMPILER_DIR)\exproptc.c
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CFLAGS) -I$(OBJ_DIR) -Fo$(OBJ_DIR)\ -w $** -o $(HARBOUR_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
$(CC) $(CFLAGS) -I$(OBJ_DIR) -Fo$(OBJ_DIR)\ -W3 $** -o $(HARBOUR_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
-$(DEL) $(OBJ_DIR)\unistd.h
!else
@@ -944,7 +944,7 @@ $(HARBOUR_EXE) : \
$(COMPILER_DIR)\exproptb.c \
$(COMPILER_DIR)\exproptc.c
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CFLAGS) -I$(OBJ_DIR) -Fo$(OBJ_DIR)\ -w $** -o $(HARBOUR_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
$(CC) $(CFLAGS) -I$(OBJ_DIR) -Fo$(OBJ_DIR)\ -W3 $** -o $(HARBOUR_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
-$(DEL) $(OBJ_DIR)\unistd.h
!endif
@@ -1008,15 +1008,15 @@ $(GTDOS_LIB) : $(GTDOS_LIB_OBJS)
!if ( "$(HB_LEX)"=="SIMPLEX" )
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.sly
bison -d -o$@ $**
bison -d --no-line -o$@ $**
$(OBJ_DIR)\hbslex.obj : $(COMPILER_DIR)\hbslex.c
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -w -Fo$@ $**
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -W3 -Fo$@ $**
!else
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
bison -d -o$(OBJ_DIR)\harboury.c $(COMPILER_DIR)\harbour.y
bison -d --no-line -o$(OBJ_DIR)\harboury.c $(COMPILER_DIR)\harbour.y
$(OBJ_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l
flex -i -8 -o$(OBJ_DIR)\harbourl.c $(COMPILER_DIR)\harbour.l
@@ -1030,15 +1030,15 @@ $(OBJ_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l
!if ( "$(HB_LEX)"=="SIMPLEX" )
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
bison -p hb_comp -d $** -o$@
bison -p --no-line hb_comp -d $** -o$@
$(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
$(CC) $(CLIBFLAGS) -w -Fo$@ $**
$(CC) $(CLIBFLAGS) -W3 -Fo$@ $**
!else
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
bison -d -p hb_comp -o$(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.y
bison -d --no-line -p hb_comp -o$(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.y
$(OBJ_DIR)\macrol.c : $(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.l
flex -i -8 -Phb_comp -o$(OBJ_DIR)\macrol.c $(MACRO_DIR)\macro.l
@@ -1046,20 +1046,20 @@ $(OBJ_DIR)\macrol.c : $(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.l
!endif
$(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
$(CC) $(CLIBFLAGS) -w -Fo$@ $**
$(CC) $(CLIBFLAGS) -W3 -Fo$@ $**
!if ( "$(HB_LEX)"=="SIMPLEX" )
$(OBJ_DIR)\macroslx.obj : $(MACRO_DIR)\macroslx.c
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -w -Fo$@ $**
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -W3 -Fo$@ $**
-$(DEL) $(OBJ_DIR)\unistd.h
!else
$(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
-$(ECHO) > $(OBJ_DIR)\unistd.h
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -w -Fo$@ $**
$(CC) $(CLIBFLAGS) -I$(OBJ_DIR) -W3 -Fo$@ $**
-$(DEL) $(OBJ_DIR)\unistd.h
!endif

10
harbour/source/compiler/harbour.y
View File

@@ -1106,14 +1106,14 @@ ExtVarDef : VarDef
}
| MacroVar DimList
{
USHORT uCount = hb_compExprListLen( $2 );
USHORT uCount = (USHORT) hb_compExprListLen( $2 );
hb_compExprDelete( hb_compExprGenPush( $2 ) );
hb_compGenPCode3( HB_P_ARRAYDIM, HB_LOBYTE( uCount ), HB_HIBYTE( uCount ), ( BOOL ) 1 );
hb_compRTVariableAdd( hb_compExprNewRTVar( NULL, $1 ), TRUE );
}
| MacroVar DimList AsArray
{
USHORT uCount = hb_compExprListLen( $2 );
USHORT uCount = (USHORT) hb_compExprListLen( $2 );
hb_compExprDelete( hb_compExprGenPush( $2 ) );
hb_compGenPCode3( HB_P_ARRAYDIM, HB_LOBYTE( uCount ), HB_HIBYTE( uCount ), ( BOOL ) 1 );
hb_compRTVariableAdd( hb_compExprNewRTVar( NULL, $1 ), TRUE );
@@ -2040,7 +2040,7 @@ static void hb_compVariableDim( char * szName, HB_EXPR_PTR pInitValue )
{
if( hb_comp_iVarScope == VS_PUBLIC || hb_comp_iVarScope == VS_PRIVATE )
{
USHORT uCount = hb_compExprListLen( pInitValue );
USHORT uCount = (USHORT) hb_compExprListLen( pInitValue );
hb_compVariableAdd( szName, 'A' );
hb_compExprDelete( hb_compExprGenPush( pInitValue ) );
hb_compGenPCode3( HB_P_ARRAYDIM, HB_LOBYTE( uCount ), HB_HIBYTE( uCount ), ( BOOL ) 1 );
@@ -2048,7 +2048,7 @@ static void hb_compVariableDim( char * szName, HB_EXPR_PTR pInitValue )
}
else if( hb_comp_iVarScope == VS_STATIC )
{
USHORT uCount = hb_compExprListLen( pInitValue );
USHORT uCount = (USHORT) hb_compExprListLen( pInitValue );
HB_EXPR_PTR pVar = hb_compExprNewVar( szName );
HB_EXPR_PTR pAssign;
@@ -2068,7 +2068,7 @@ static void hb_compVariableDim( char * szName, HB_EXPR_PTR pInitValue )
}
else
{
USHORT uCount = hb_compExprListLen( pInitValue );
USHORT uCount = (USHORT) hb_compExprListLen( pInitValue );
hb_compVariableAdd( szName, 'A' );
hb_compExprDelete( hb_compExprGenPush( pInitValue ) );