From 10821a6d96a957f4bc3fad7fd6000b94263db197 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Sun, 17 Oct 1999 01:51:46 +0000 Subject: [PATCH] 19991016-18:40 GMT+8 Ron Pinkas * harbour.y * Corrected bug with Push/Pop optimizer and BlockList. --- harbour/ChangeLog | 4 ++++ harbour/source/compiler/harbour.y | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aa4e4b2884..71525c8168 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +19991016-18:40 GMT+8 Ron Pinkas + * harbour.y + * Corrected bug with Push/Pop optimizer and BlockList. + 19991016-14:40 GMT+8 Ron Pinkas * compiler.h + added lLstPushPos to PFUNCTION structure to support nesting (like in blocks ). diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 9f8aadca61..8be51963d4 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -1011,7 +1011,7 @@ CodeBlock : BlockBegin '|' BlockExpList '}' { CodeBlockEnd(); } BlockBegin : '{' '|' { CodeBlockStart(); } ; -BlockExpList : { SetLastPushPos(); } Expression { $$ = 1; } +BlockExpList : Expression { $$ = 1; } | ',' { SetLastPushPos(); PushNil(); RemoveExtraPush(); PushNil(); $$ = 2; } | BlockExpList ',' { RemoveExtraPush(); PushNil(); $$++; } | BlockExpList ',' { RemoveExtraPush(); } Expression { $$++; }