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

2002-06-05 20:52 UTC-0800 Ron Pinkas <ron@ronpinkas.com>

Browse Source 
* make_b32.bat
    - Commented SET BISON_SIMPLE line as it causes incompatibility with current version of Bison.

  * source/compiler/harbour.sly
  * source/macro/macro.y
    + Added missing ; as per Bison 1.35 warnings.
This commit is contained in:
Ron Pinkas
2002-06-06 03:54:13 +00:00
parent 3001d59de3
commit e7f150194c
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -7,6 +7,15 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-06-05 20:52 UTC-0800 Ron Pinkas <ron@ronpinkas.com>
* make_b32.bat
- Commented SET BISON_SIMPLE line as it causes incompatibility with current version of Bison.
* source/compiler/harbour.sly
* source/macro/macro.y
+ Added missing ; as per Bison 1.35 warnings.
2002-06-05 18:00 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* source/rtl/gtwin/gtwin.c
! Fixed Esc key translation problem that only occurred in some

2
harbour/make_b32.bat
View File

@@ -16,7 +16,7 @@ if "%1" == "CLEAN" goto CLEAN
:BUILD
SET BISON_SIMPLE=source\compiler\harbour.simple
REM SET BISON_SIMPLE=source\compiler\harbour.simple
make -fmakefile.bc %1 %2 %3 > make_b32.log
if errorlevel 1 goto BUILD_ERR

21
harbour/source/compiler/harbour.sly
View File

@@ -55,6 +55,14 @@ extern void yy_delete_buffer( void * ); /* yacc functions to manage multiple fil
#endif
/* lex & yacc related prototypes */
#if !defined(__GNUC__) && !defined(__IBMCPP__)
#if 0
/* This makes BCC 551 fail with Bison 1.30, even with the
supplied harbour.simple file, which makes Bison 1.30 blow.
[vszakats] */
void __yy_memcpy ( char*, const char*, unsigned int ); /* to satisfy Borland compiler */
#endif
#endif
extern int yyparse( void ); /* main yacc parsing function */
extern void yyerror( char * ); /* parsing error management function */
extern int yylex( void ); /* main lex token function, called by yyparse() */
@@ -472,8 +480,9 @@ LiteralValue : LITERAL { $$ = hb_compExprNewString( $1 );
pBaseArrayName = hb_compExprNewString( pCopy );
}
bTrancuateBaseArray = FALSE;
; }
}
}
;
LiteralAlias : LiteralValue ALIASOP { $$ = $1; }
;
@@ -1321,14 +1330,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 );
@@ -2255,7 +2264,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 );
@@ -2263,7 +2272,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;
@@ -2283,7 +2292,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 ) );

5
harbour/source/macro/macro.y
View File

@@ -80,7 +80,7 @@
#if !defined(__GNUC__) && !defined(__IBMCPP__)
#if 0
/* This makes BCC 551 fail with Bison 1.30, even with the
/* This makes BCC 551 fail with Bison 1.30, even with the
supplied harbour.simple file, which makes Bison 1.30 blow.
[vszakats] */
void __yy_memcpy ( char*, const char*, unsigned int ); /* to satisfy Borland compiler */
@@ -488,7 +488,7 @@ Expression : SimpleExpression { $$ = $1; HB_MACRO_CHECK( $$ ); }
| PareExpList { $$ = $1; HB_MACRO_CHECK( $$ ); }
;
RootParamList : EmptyExpression ',' {
RootParamList : EmptyExpression ',' {
if( !(HB_MACRO_DATA->Flags & HB_MACRO_GEN_LIST) )
{
HB_TRACE(HB_TR_DEBUG, ("macro -> invalid expression: %s", HB_MACRO_DATA->string));
@@ -501,6 +501,7 @@ RootParamList : EmptyExpression ',' {
HB_MACRO_DATA->iListElements = 1;
$$ = hb_compExprAddListExpr( ( HB_MACRO_DATA->Flags & HB_MACRO_GEN_PARE ) ? hb_compExprNewList( $1 ) : hb_compExprNewArgList( $1 ), $4 );
}
;
AsParamList : RootParamList { $$ = $1; }
| AsParamList ',' EmptyExpression { HB_MACRO_DATA->iListElements++; $$ = hb_compExprAddListExpr( $1, $3 ); }