From 8da2b1390d1b7e9e46a893336a400f56736b91e5 Mon Sep 17 00:00:00 2001 From: Jean-Francois Lefebvre Date: Mon, 4 Feb 2002 22:28:55 +0000 Subject: [PATCH] 2002-02-04 23:10 UTC+0100 JFL (mafact) --- harbour/ChangeLog | 9 +++++++++ harbour/source/vm/classes.c | 5 ++--- harbour/source/vm/hvm.c | 6 +++--- harbour/source/vm/runner.c | 14 +++++++------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ced92b96ee..3ac7c2f0a0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,15 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + + columns' width get evaluated just before first TBrowse ::Stabilize() + + little changes to optimize speed + * source/rtl/tbcolumn.prg + ! more clipper compatible (cannot set column width to nil) + +2002-02-05 13:39 UTC+0000 Dave Pearson + * include/hbapi.h + * include/hbapiitm.h + * Added final EOLs to file. GCC warns if they're not there. 2002-02-05 02:04 UTC-0300 Horacio Roldan * source/rdd/dbf1.c diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c index 6337684d78..02be691a06 100644 --- a/harbour/source/vm/classes.c +++ b/harbour/source/vm/classes.c @@ -113,8 +113,7 @@ "/" = __OpDivide "%" = __OpMod "^" = __OpPower - "**" = __OpMod (currently it's different from "^", but this is not in sync, - with Clipper syntax, where these two are synonims) + "**" = __OpPower "++" = __OpInc "--" = __OpDec "==" = __OpEqual @@ -985,7 +984,7 @@ HB_FUNC( __CLSADDMSG ) else if (strcmp("^",hb_parc(2)) == 0) pMessage = hb_dynsymGet( "__OpPower") ; else if (strcmp("**",hb_parc(2)) == 0) - pMessage = hb_dynsymGet( "__OpMod" ) ; + pMessage = hb_dynsymGet( "__OpPower" ) ; else if (strcmp("++",hb_parc(2)) == 0) pMessage = hb_dynsymGet( "__OpInc" ) ; else if (strcmp("--",hb_parc(2)) == 0) diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 4678c5812a..89242e134c 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -1958,8 +1958,8 @@ static void hb_vmPower( void ) else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "__OpPower" ) ) hb_vmOperatorCall( pItem1, pItem2, "__OPPOWER" ); - else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "__OpMod" ) ) - hb_vmOperatorCall( pItem1, pItem2, "__OPMOD" ); + /* else if( HB_IS_OBJECT( pItem1 ) && hb_objHasMsg( pItem1, "__OpMod" ) ) + hb_vmOperatorCall( pItem1, pItem2, "__OPMOD" ); JFL 02/2002 */ else { PHB_ITEM pResult = hb_errRT_BASE_Subst( EG_ARG, 1088, NULL, "^", 2, pItem1, pItem2 ); @@ -4862,4 +4862,4 @@ HB_FUNC( __OPGETPRF ) /* profiler: It returns an array with an opcode called and hb_stornl( hb_ulOpcodesCalls[ ulOpcode ], -1, 1 ); hb_stornl( hb_ulOpcodesTime[ ulOpcode ], -1, 2 ); } -} \ No newline at end of file +} diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c index a21918953e..c2e2af2cfb 100644 --- a/harbour/source/vm/runner.c +++ b/harbour/source/vm/runner.c @@ -50,7 +50,7 @@ * */ /* - * The following functions are added Feb 01,2002 by + * The following functions are added Feb 01,2002 by * Alexander Kresin * * __HRBLOAD() @@ -257,7 +257,7 @@ HB_FUNC( __HRBDOFU ) hb_vmPushNil(); for( i = 0; i < argc-1; i++ ) /* Push other params */ hb_vmPush( hb_param( i + 2, HB_IT_ANY ) ); - + hb_vmSend( argc-1 ); /* Run function */ } else @@ -320,8 +320,8 @@ PHRB_BODY hb_hrbLoad( char* szHrb ) pSymRead[ ul ].pFunPtr = ( PHB_FUNC ) ( ULONG ) hb_hrbFileReadByte( file, szFileName ); pSymRead[ ul ].pDynSym = NULL; - if ( pHrbBody->ulSymStart == -1 && - pSymRead[ ul ].cScope & HB_FS_FIRST && + if ( pHrbBody->ulSymStart == -1 && + pSymRead[ ul ].cScope & HB_FS_FIRST && ! ( pSymRead[ ul ].cScope & HB_FS_INITEXIT ) ) pHrbBody->ulSymStart = ul; } @@ -423,7 +423,7 @@ void hb_hrbDo( PHRB_BODY pHrbBody, int argc, char * argv[] ) hb_vmPushNil(); for( i = 0; i < argc; i++ ) /* Push other cmdline params*/ hb_vmPushString( argv[i],strlen(argv[i]) ); - + hb_vmSend( argc ); /* Run init function */ } } @@ -512,8 +512,8 @@ static int hb_hrbFileReadHead( FILE * file, char * szFileName ) HB_TRACE(HB_TR_DEBUG, ("hb_hrbFileReadHead(%p)", file )); - hb_hrbFileRead( file, szFileName, szBuf, 1, 4 ); - if( strncmp( szHead,szBuf,4 ) ) + hb_hrbFileRead( file, szFileName, (char *) szBuf, 1, 4 ); + if( strncmp( (char *) szHead, (char *) szBuf, 4 ) ) { hb_errRT_BASE_Ext1( EG_CORRUPTION, 9999, NULL, szFileName, 0, EF_CANDEFAULT, 1, hb_paramError( 1 ) ); return 0;