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

20000404-13:00 GMT+1 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-04-04 10:44:09 +00:00
parent 0d6331bd82
commit c899c8d85f
4 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -1,3 +1,15 @@
20000404-13:00 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/rdd/dbstrux.prg
% Some more optimization. Thanks to Chen Kedem.
* source/rtl/getsys.prg
% __GetListActive() calls optimized out.
* source/vm/cmdarg.c
* Change wording to "compatible" when talking about the other commercial
products.
20000404-12:13 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/pp/ppcore.c

9
harbour/source/rdd/dbstrux.prg
View File

@@ -89,7 +89,7 @@ FUNCTION __dbCreate( cFileName, cFileFrom, cRDDName, lNew, cAlias )
DEFAULT lNew TO .F.
IF Used() .AND. !lNew
IF Used() .AND. ! lNew
dbCloseArea()
ENDIF
@@ -106,11 +106,8 @@ FUNCTION __dbCreate( cFileName, cFileFrom, cRDDName, lNew, cAlias )
ELSE
IF lNew
USE ( cFileFrom ) NEW
ELSE
USE ( cFileFrom )
ENDIF
dbUseArea( lNew,, cFileFrom )
dbEval( {|| aAdd( aStruct, { FIELD->FIELD_NAME ,;
FIELD->FIELD_TYPE ,;
FIELD->FIELD_LEN ,;

82
harbour/source/rtl/getsys.prg
View File

@@ -36,7 +36,6 @@
#include "common.ch"
FUNCTION ReadModal( GetList, nPos )
LOCAL oGetList
IF Empty( GetList )
@@ -80,57 +79,62 @@ PROCEDURE GetReader( oGet )
RETURN
FUNCTION GetActive( oGet )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF PCount() > 0
RETURN __GetListActive():GetActive( oGet )
IF oGetList != NIL
IF PCount() >= 1
RETURN oGetList:GetActive( oGet )
ELSE
RETURN __GetListActive():GetActive()
RETURN oGetList:GetActive()
ENDIF
ENDIF
RETURN NIL
PROCEDURE GetDoSetKey( keyBlock, oGet )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF oGetList != NIL
IF oGet != NIL
__GetListActive():oGet := oGet
oGetList:oGet := oGet
ENDIF
__GetListActive():GetDoSetKey( keyBlock )
oGetList:GetDoSetKey( keyBlock )
ENDIF
RETURN
PROCEDURE GetApplyKey( oGet, nKey )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
__GetListActive():oGet := oGet
__GetListActive():GetApplyKey( nKey )
IF oGetList != NIL
oGetList:oGet := oGet
oGetList:GetApplyKey( nKey )
ENDIF
RETURN
FUNCTION GetPreValidate( oGet )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF oGetList != NIL
IF oGet != NIL
__GetListActive():oGet := oGet
oGetList:oGet := oGet
ENDIF
RETURN __GetListActive():GetPreValidate()
RETURN oGetList:GetPreValidate()
ENDIF
RETURN .F.
FUNCTION GetPostValidate( oGet )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF oGetList != NIL
IF oGet != NIL
__GetListActive():oGet := oGet
oGetList:oGet := oGet
ENDIF
RETURN __GetListActive():GetPostValidate()
RETURN oGetList:GetPostValidate()
ENDIF
RETURN .F.
@@ -142,64 +146,70 @@ FUNCTION ReadInsert( lInsert )
RETURN Set( _SET_INSERT, lInsert )
FUNCTION ReadUpdated( lUpdated )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF PCount() > 0
RETURN __GetListActive():ReadUpdated( lUpdated )
IF oGetList != NIL
IF PCount() >= 1
RETURN oGetList:ReadUpdated( lUpdated )
ELSE
RETURN __GetListActive():ReadUpdated()
RETURN oGetList:ReadUpdated()
ENDIF
ENDIF
RETURN .F.
FUNCTION Updated()
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
RETURN __GetListActive():lUpdated
IF oGetList != NIL
RETURN oGetList:lUpdated
ENDIF
RETURN .F.
FUNCTION ReadKill( lKill )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF PCount() > 0
RETURN __GetListActive():KillRead( lKill )
IF oGetList != NIL
IF PCount() >= 1
RETURN oGetList:KillRead( lKill )
ELSE
RETURN __GetListActive():KillRead()
RETURN oGetList:KillRead()
ENDIF
ENDIF
RETURN .F.
PROCEDURE __KillRead()
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
__GetListActive():KillRead( .T. )
IF oGetList != NIL
oGetList:KillRead( .T. )
ENDIF
RETURN
PROCEDURE __SetFormat( bFormat )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF oGetList != NIL
IF ISBLOCK( bFormat )
__GetListActive():SetFormat( bFormat )
oGetList:SetFormat( bFormat )
ELSE
__GetListActive():SetFormat()
oGetList:SetFormat()
ENDIF
ENDIF
RETURN
FUNCTION ReadFormat( bFormat )
LOCAL oGetList := __GetListActive()
IF __GetListActive() != NIL
IF PCount() > 0
RETURN __GetListActive():SetFormat( bFormat )
IF oGetList != NIL
IF PCount() >= 1
RETURN oGetList:SetFormat( bFormat )
ELSE
RETURN __GetListActive():SetFormat()
RETURN oGetList:SetFormat()
ENDIF
ENDIF

6
harbour/source/vm/cmdarg.c
View File

@@ -323,7 +323,7 @@ void hb_cmdargProcessVM( void )
#endif
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "CA-Clipper 5.3x extensions: ", 0 );
hb_conOutErr( "CA-Clipper 5.3x compatible extensions: ", 0 );
#if defined( HB_COMPAT_C53 )
hb_conOutErr( "Yes", 0 );
#else
@@ -331,7 +331,7 @@ void hb_cmdargProcessVM( void )
#endif
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "Alaska Xbase++ extensions: ", 0 );
hb_conOutErr( "Alaska Xbase++ compatible extensions: ", 0 );
#if defined( HB_COMPAT_XPP )
hb_conOutErr( "Yes", 0 );
#else
@@ -339,7 +339,7 @@ void hb_cmdargProcessVM( void )
#endif
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "CA-Visual Objects extensions: ", 0 );
hb_conOutErr( "CA-Visual Objects compatible extensions: ", 0 );
#if defined( HB_COMPAT_VO )
hb_conOutErr( "Yes", 0 );
#else