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

ChangeLog 19991223-16:35

Browse Source
This commit is contained in:
Ryszard Glab
1999-12-23 15:22:38 +00:00
parent a6ada2a564
commit 685b34cc2d
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
19991223-16:35 GMT+1 Ryszard Glab <rglab@imid.med.pl>
*include/hbexpr.c
*source/compiler/expropt.c
*source/compiler/harbour.y
* fixed compiler parse error on aliased macro expressions
M->&( expression )
19991222-18:20 GMT+1 Ryszard Glab <rglab@imid.med.pl>
*include/hbexpr.c

5
harbour/include/hbexpr.c
View File

@@ -2348,7 +2348,7 @@ static HB_EXPR_FUNC( hb_compExprUseMacro )
*/
if( pSelf->value.asMacro.SubType == HB_ET_MACRO_FUNCALL )
hb_compGenPCode1( HB_P_MACROSYMBOL );
else
else if( pSelf->value.asMacro.SubType != HB_ET_MACRO_ALIASED )
hb_compGenPCode1( HB_P_MACROPUSH );
/* NOTE: pcode for alias context is generated in
* hb_compExprUseAliasVar()
@@ -2386,7 +2386,8 @@ static HB_EXPR_FUNC( hb_compExprUseMacro )
/* compile & run - macro compiler will generate pcode to pop a value
* from the eval stack
*/
hb_compGenPCode1( HB_P_MACROPOP );
if( pSelf->value.asMacro.SubType != HB_ET_MACRO_ALIASED )
hb_compGenPCode1( HB_P_MACROPOP );
}
break;

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

@@ -467,6 +467,7 @@ FieldVarAlias : FieldAlias VarAlias { hb_compExprDelete( $1 ); $$ =
AliasId : IDENTIFIER { $$ = hb_compExprNewVar( $1 ); }
| MacroVar { $$ = $1; }
| MacroExpr { $$ = $1; }
;
AliasVar : NumAlias AliasId { $$ = hb_compExprNewAliasVar( $1, $2 ); }