2012-11-26 14:43 UTC+0100 Viktor Szakats (harbour syenar.net)

* contrib/xhb/xhberr.prg
    % optimized hb_macroBlock() calls to __dynsN2Sym() calls.
      Thanks Przemek for the tip.

  * src/rdd/hbsix/sxcompat.prg
    % sx_VFGet(): restored macro evaluation, for speed
This commit is contained in:
Viktor Szakats
2012-11-26 13:47:38 +00:00
parent 5b5f79db68
commit c34a2948ed
3 changed files with 18 additions and 10 deletions

View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-26 14:43 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/xhb/xhberr.prg
% optimized hb_macroBlock() calls to __dynsN2Sym() calls.
Thanks Przemek for the tip.
* src/rdd/hbsix/sxcompat.prg
% sx_VFGet(): restored macro evaluation, for speed
2012-11-26 12:20 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbwin/hbwin.ch
! added HB_ prefix to win defines

View File

@@ -481,25 +481,25 @@ STATIC FUNCTION LogError( oerr )
hb_WAEval( {||
IF hb_IsFunction( "Select" )
FWriteLine( nHandle, "Work Area No ......: " + strvalue( Eval( hb_macroBlock( "Select()" ) ) ) )
FWriteLine( nHandle, "Work Area No ......: " + strvalue( Eval( __dynsN2Sym( "Select" ) ) ) )
ENDIF
IF hb_IsFunction( "Alias" )
FWriteLine( nHandle, "Alias .............: " + Eval( hb_macroBlock( "Alias()" ) ) )
FWriteLine( nHandle, "Alias .............: " + Eval( __dynsN2Sym( "Alias" ) ) )
ENDIF
IF hb_IsFunction( "RecNo" )
FWriteLine( nHandle, "Current Recno .....: " + strvalue( Eval( hb_macroBlock( "RecNo()" ) ) ) )
FWriteLine( nHandle, "Current Recno .....: " + strvalue( Eval( __dynsN2Sym( "RecNo" ) ) ) )
ENDIF
IF hb_IsFunction( "DbFilter" )
FWriteLine( nHandle, "Current Filter ....: " + Eval( hb_macroBlock( "dbFilter()" ) ) )
IF hb_IsFunction( "dbFilter" )
FWriteLine( nHandle, "Current Filter ....: " + Eval( __dynsN2Sym( "dbFilter" ) ) )
ENDIF
IF hb_IsFunction( "DbRelation" )
FWriteLine( nHandle, "Relation Exp. .....: " + Eval( hb_macroBlock( "dbRelation()" ) ) )
IF hb_IsFunction( "dbRelation" )
FWriteLine( nHandle, "Relation Exp. .....: " + Eval( __dynsN2Sym( "dbRelation" ) ) )
ENDIF
IF hb_IsFunction( "IndexOrd" )
FWriteLine( nHandle, "Index Order .......: " + strvalue( Eval( hb_macroBlock( "IndexOrd(0)" ) ) ) )
FWriteLine( nHandle, "Index Order .......: " + strvalue( Eval( __dynsN2Sym( "IndexOrd" ) ) ) )
ENDIF
IF hb_IsFunction( "IndexKey" )
FWriteLine( nHandle, "Active Key ........: " + strvalue( Eval( hb_macroBlock( "IndexKey(0)" ) ) ) )
FWriteLine( nHandle, "Active Key ........: " + strvalue( Eval( hb_macroBlock( "IndexKey( 0 )" ) ) ) )
ENDIF
FWriteLine( nHandle, "" )
RETURN .T.

View File

@@ -527,7 +527,7 @@ FUNCTION sx_VFGet( cExpr, nLen )
* we can simply evaluate given expression */
IF Used() .AND. PCount() == 2
RETURN PadR( Eval( hb_macroBlock( cExpr ) ), nLen )
RETURN PadR( &cExpr, nLen ) /* NOTE: Macro operator! */
ENDIF
RETURN NIL