diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 285cf2b811..02a203c1d4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-11-03 16:05 UTC+0800 Ron Pinkas + * source/pp/pptable.c + * Changed {|u| to {|_1| and := u to := _1 in bSetGet of _GET_(...) to avoid unexpected result with @ X,Y GET u + 2000-11-03 15:50 UTC+0800 Ron Pinkas * source/compiler/harbour.sly + Added rule to accept Get and GetA as FunCall diff --git a/harbour/source/pp/pptable.c b/harbour/source/pp/pptable.c index 7e0d3dfabf..c88aed6ea8 100644 --- a/harbour/source/pp/pptable.c +++ b/harbour/source/pp/pptable.c @@ -211,7 +211,7 @@ 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]", - "SetPos( \1A00, \1B00 ) ; AAdd( GetList, _GET_( \1C00, \1C20, \1D00, \1E40, \1F40,{|u| If( PCount()==0,\1C00,\1C00:=u )} ):display() ) [; ATail(GetList):\1G00]",&sC___98 }; + "SetPos( \1A00, \1B00 ) ; AAdd( GetList, _GET_( \1C00, \1C20, \1D00, \1E40, \1F40,{|_1| If( PCount()==0,\1C00,\1C00:=_1 )} ):display() ) [; ATail(GetList):\1G00]",&sC___98 }; 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]",