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

2004-05-11 15:10 UTC+0100 Ryszard Glab <rglab@imid.med.pl>

Browse Source 
* CVSROOT/avail
      * restored write access to the entire repository for
      all developers

   * doc/codestyl.txt
      * small corrections (use 3 spaces instead of Tab)

   * include/hbcomp.h
   * source/compiler/cmdcheck.c
   * source/compiler/harbour.c
   * source/compiler/hbusage.c
      + added posibility to specify the output PPO file with -p
      e.g.
      -pppo/myfile.ppo
      (thanks to Larry Sevilla)

   * source/rtl/tget.prg
      * fixed positioning of cursor when the first pressed key
      was a digit during editing of numeric value

   * source/compiler/hbfix.c
   * source/rdd/dbcmd.c
   * source/rdd/dbf1.c
   * source/rdd/dbfcdx/dbfcdx1.c
   * source/rdd/dbffpt/dbffpt1.c
   * source/rdd/dbfntx/dbfntx1.c
   * source/rtl/dates.c
   * source/rtl/filesys.c
   * source/rtl/inkey.c
   * source/rtl/isprint.c
   * source/rtl/math.c
   * source/rtl/philes.c
   * source/vm/classes.c
   * source/vm/hvm.c
      * removed '//' comments
This commit is contained in:
Ryszard Glab
2004-05-11 13:28:15 +00:00
parent 9df7e88a73
commit b8d0f3a098
8 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/source/rtl/filesys.c
View File

@@ -2007,23 +2007,24 @@ static HANDLE DostoWinHandle( FHANDLE fHandle)
#endif
BYTE HB_EXPORT * hb_fileNameConv(char *str) {
// Convert file and dir case. The allowed SET options are:
// LOWER - Convert all caracters of file to lower
// UPPER - Convert all caracters of file to upper
// MIXED - Leave as is
// The allowed environment options are:
// FILECASE - define the case of file
// DIRCASE - define the case of path
// DIRSEPARATOR - define separator of path (Ex. "/")
/*
Convert file and dir case. The allowed SET options are:
LOWER - Convert all caracters of file to lower
UPPER - Convert all caracters of file to upper
MIXED - Leave as is
The allowed environment options are:
FILECASE - define the case of file
DIRCASE - define the case of path
DIRSEPARATOR - define separator of path (Ex. "/")
*/
size_t a;
char *filename;
char *dirname=str;
size_t dirlen;
/* char * szFileTrim =str; */
// Look for filename (Last "\" or DIRSEPARATOR)
/* Look for filename (Last "\" or DIRSEPARATOR) */
if( hb_set.HB_SET_DIRSEPARATOR != '\\' ) {
for(a=0;a<strlen(str);a++)
if( str[a] == '\\' )
@@ -2035,13 +2036,13 @@ BYTE HB_EXPORT * hb_fileNameConv(char *str) {
filename=str;
dirlen=filename-str;
// FILECASE
/* FILECASE */
if( hb_set.HB_SET_FILECASE == HB_SET_CASE_LOWER )
hb_strLower( filename, strlen(filename) );
else if( hb_set.HB_SET_FILECASE == HB_SET_CASE_UPPER )
hb_strUpper( filename, strlen(filename) );
// DIRCASE
/* DIRCASE */
if( hb_set.HB_SET_DIRCASE == HB_SET_CASE_LOWER )
hb_strLower(dirname,dirlen);
else if( hb_set.HB_SET_DIRCASE == HB_SET_CASE_UPPER )

12
harbour/source/rtl/inkey.c
View File

@@ -204,12 +204,13 @@ int hb_inkeyNext( HB_inkey_enum event_mask ) /* Return the next key without
void hb_inkeyPoll( void ) /* Poll the console keyboard to stuff the Harbour buffer */
{
// static double dbLast;
/* static double dbLast; */
HB_TRACE(HB_TR_DEBUG, ("hb_inkeyPoll()"));
// if( dbLast != hb_dateSeconds() )
// {
/* if( dbLast != hb_dateSeconds() )
* {
*/
if( hb_set.HB_SET_TYPEAHEAD || s_inkeyPoll )
{
int ch = hb_gt_ReadKey( s_eventmask );
@@ -238,8 +239,9 @@ void hb_inkeyPoll( void ) /* Poll the console keyboard to stuff the Harbour
hb_inkeyPut( ch );
}
// dbLast = hb_dateSeconds();
// }
/* dbLast = hb_dateSeconds();
* }
*/
}
void hb_inkeyReset( BOOL allocate ) /* Reset the keyboard buffer */

2
harbour/source/rtl/isprint.c
View File

@@ -69,7 +69,7 @@
#if defined(HB_OS_WIN_32) && !defined(__RSXNT__)
#include <stdio.h>
/// #include <malloc.h>
/* #include <malloc.h> */
#include <winspool.h>
static BOOL IsPrinterError(HANDLE hPrinter);

2
harbour/source/rtl/math.c
View File

@@ -173,7 +173,7 @@ int matherr (struct exception * err)
}; break;
}
s_hb_exc.funcname = (char *)err->name; // (char *) Avoid warning in DJGPP
s_hb_exc.funcname = (char *)err->name; /* (char *) Avoid warning in DJGPP */
s_hb_exc.arg1 = err->arg1;
s_hb_exc.arg2 = err->arg2;
s_hb_exc.retval = err->retval;

6
harbour/source/rtl/philes.c
View File

@@ -98,8 +98,10 @@ HB_FUNC( FREAD )
if( pItem->item.asString.bStatic ||
( * pItem->item.asString.u.pulHolders ) > 1 )
// Warning: Don't use hb_itemPutC() here, as it fails if 1 byte buffer used
// cause 1 byte length strings optimization
/*
* Warning: Don't use hb_itemPutC() here, as it fails if 1 byte buffer used
* cause 1 byte length strings optimization
*/
hb_itemPutCPtr( pItem, hb_strdup( hb_parc( 2 ) ), hb_parclen( 2 ) );
ulRead = hb_parnl( 3 );

2
harbour/source/rtl/tget.prg
View File

@@ -369,7 +369,7 @@ METHOD Display( lForced ) CLASS Get
::picture := ::cPicture
endif
xBuffer := ::PutMask( ::VarGet(), .f. )
xBuffer := ::buffer //::PutMask( ::VarGet(), .f. )
if ! ::lMinusPrinted .and. ! Empty( ::DecPos ) .and. ::minus .and. substr( xBuffer, ::DecPos-1, 1 ) == "0"
xBuffer := substr( xBuffer, 1, ::DecPos - 2 ) + "-." + substr( xBuffer, ::DecPos + 1 )

28
harbour/source/vm/classes.c
View File

@@ -1611,7 +1611,7 @@ static PHB_ITEM hb_clsInst( USHORT uiClass )
HB_ITEM init;
PHB_ITEM pInit;
( &init )->type = HB_IT_NIL; // hb_itemInit( &init );
( &init )->type = HB_IT_NIL; /* hb_itemInit( &init ); */
hb_arrayGet( pClass->pClassDatas, pMeth->uiData, &init );
@@ -1925,7 +1925,7 @@ HB_FUNC( __CLSINSTSUPER )
hb_vmPushNil();
hb_vmFunction( 0 ); /* Execute super class */
if( HB_IS_OBJECT( hb_stackItemFromTop( -1 ) ) ) // &hb_stack.Return
if( HB_IS_OBJECT( hb_stackItemFromTop( -1 ) ) ) /* &hb_stack.Return */
{
for( uiClass = 0; ! bFound && uiClass < s_uiClasses; uiClass++ )
{ /* Locate the entry */
@@ -2322,7 +2322,7 @@ static HARBOUR hb___msgEvalInline( void )
USHORT uiParam;
USHORT uiPCount=hb_pcount();
( &block )->type = HB_IT_NIL; // hb_itemInit( &block );
( &block )->type = HB_IT_NIL; /* hb_itemInit( &block ); */
hb_arrayGet( s_pClasses[ uiClass - 1 ].pInlines, s_pMethod->uiData, &block );
@@ -2369,20 +2369,22 @@ static HARBOUR hb___msgEval( void )
*
* Internal function to return a superobject
*/
//static HARBOUR hb___msgSuper( void )
//{
// PHB_ITEM pObject = hb_stackSelfItem();
//
// pObject->item.asArray.value->uiPrevCls = pObject->item.asArray.value->uiClass; /* backup of actual handel */
// pObject->item.asArray.value->uiClass = s_pMethod->uiSprClass; /* superclass handel casting */
//
// hb_itemReturn( pObject );
//}
/*
static HARBOUR hb___msgSuper( void )
{
PHB_ITEM pObject = hb_stackSelfItem();
pObject->item.asArray.value->uiPrevCls = pObject->item.asArray.value->uiClass; / * backup of actual handel * /
pObject->item.asArray.value->uiClass = s_pMethod->uiSprClass; / * superclass handel casting * /
hb_itemReturn( pObject );
}
*/
static HARBOUR hb___msgSuper( void )
{
PHB_ITEM pObject = hb_stackSelfItem();
//ULONG ulLen = pObject->item.asArray.value->ulLen;
/*ULONG ulLen = pObject->item.asArray.value->ulLen; */
PHB_ITEM pCopy = hb_itemArrayNew(1);
/* Now save the Self object as the 1st elem. */

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

@@ -3327,7 +3327,7 @@ void HB_EXPORT hb_vmDo( USHORT uiParams )
uiClass=pSelfBase->uiClass;
pRealSelf = hb_itemNew( NULL ) ;
hb_itemCopy(pRealSelf ,pSelf->item.asArray.value->pItems) ; // hb_arrayGetItemPtr(pSelf,1) ;
hb_itemCopy(pRealSelf ,pSelf->item.asArray.value->pItems) ; /* hb_arrayGetItemPtr(pSelf,1) ; */
/* and take back the good pSelfBase */
pSelfBase = pRealSelf->item.asArray.value;
/* Now I should exchnage it with the current stacked value */
@@ -3494,7 +3494,7 @@ void HB_EXPORT hb_vmSend( USHORT uiParams )
bDebugPrevState = s_bDebugging;
s_bDebugging = FALSE;
//printf( "Symbol: '%s'\n", pSym->szName );
/* printf( "Symbol: '%s'\n", pSym->szName ); */
if( HB_IS_NIL( pSelf ) ) /* are we sending a message ? */
{
@@ -3583,7 +3583,7 @@ void HB_EXPORT hb_vmSend( USHORT uiParams )
uiClass = pSelfBase->uiClass;
pRealSelf = hb_itemNew( NULL ) ;
hb_itemCopy( pRealSelf, pSelf->item.asArray.value->pItems ) ; // hb_arrayGetItemPtr(pSelf,1) ;
hb_itemCopy( pRealSelf, pSelf->item.asArray.value->pItems ) ; /* hb_arrayGetItemPtr(pSelf,1) ; */
/* and take back the good pSelfBase */
pSelfBase = pRealSelf->item.asArray.value;
/* Now I should exchnage it with the current stacked value */