From ecd79ebe24ef70c34c82ac5f7605c6e301b7be07 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 31 Jul 1999 12:58:04 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 12 + harbour/funclist.txt | 752 ++++++++++++++++++++++--------- harbour/include/fm.api | 1 - harbour/source/hbpp/buildgcc.bat | 1 - harbour/source/rtl/alert.prg | 4 +- harbour/source/rtl/extend.c | 2 +- harbour/source/tools/hb_f.c | 2 +- harbour/tests/working/extend2.c | 2 +- 8 files changed, 549 insertions(+), 227 deletions(-) delete mode 100644 harbour/source/hbpp/buildgcc.bat diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7dee947aff..dbcfd2f4e8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +19990731-14:44 CET Victor Szel + ! source/rtl/alert.prg - Handling of "*" in color string is + made compatible with Clipper. + - source/hbpp/buildgcc.bat - Removed. Use GNU Make instead. + - include/fm.api - _xrealloc removed, since it was not there + in Clipper. + ! source/rtl/extend.c - "item.api" -> "itemapi.h" + ! source/tools/hb_f.c - "filesys.api" -> "filesys.h" + * tests/working/extend2.c - #include -> "x" + + funclist.txt - Extended with a huge amount of new functions, method + and class variables. Please review it for your functions. + 19990731-14:50 Alexander Kresin * source\hbpp\hbpp.c * source\hbpp\table.c diff --git a/harbour/funclist.txt b/harbour/funclist.txt index 401914eff1..12ac6f49fb 100644 --- a/harbour/funclist.txt +++ b/harbour/funclist.txt @@ -1,7 +1,7 @@ ; ; The Harbour Project ; funclist.txt - Function Status List -; +; ; Syntax: ; ;; ; @@ -12,222 +12,534 @@ ; ; Please review the following function status ; -AADD ;R; -ABS ;R; -ACHOICE ;N; -ACLONE ;R; -ACOPY ;R; -ADEL ;R; -ADIR ;N; -AEVAL ;R; -AFIELDS ;N; -AFILL ;R; -AINS ;R; -ALERT ;N; -ALIAS ;N; -ALLTRIM ;R; -ALTD ;N; -ARRAY ;R; -ASC ;R; -ASCAN ;R; -ASIZE ;R; -ASORT ;R; -AT ;R; -ATAIL ;R; -BIN2I ;R; -BIN2L ;R; -BIN2W ;R; -BOF ;N; -BREAK ;N; -BROWSE ;N; -CDOW ;R; -CHR ;R; -CMONTH ;R; -COL ;R; -COLORSELECT ;N; -CTOD ;R; -CURDIR ;N; -DATE ;R; -DAY ;R; -DBAPPEND ;S; -DBCLEARFILTER ;S; -DBCLEARINDEX ;S; -DBCLEARRELATION ;S; -DBCLOSEALL ;S; -DBCLOSEAREA ;S; -DBCOMMIT ;S; -DBCOMMITALL ;S; -DBCREATE ;S; -DBCREATEIND ;S; -DBDELETE ;S; -DBEDIT ;N; -DBEVAL ;S; -DBF ;N; -DBFILTER ;S; -DBGOBOTTOM ;S; -DBGOTO ;S; -DBGOTOP ;S; -DBRECALL ;S; -DBREINDEX ;S; -DBRELATION ;S; -DBRSELECT ;S; -DBSEEK ;S; -DBSELECTAREA ;S; -DBSETDRIVER ;S; -DBSETFILTER ;S; -DBSETINDEX ;S; -DBSETORDER ;S; -DBSETRELATION ;S; -DBSKIP ;S; -DBSTRUCT ;S; -DBUNLOCK ;S; -DBUNLOCKALL ;S; -DBUSEAREA ;S; -DELETED ;N; -DESCEND ;R; -DEVOUT ;R; -DEVOUTPICT ;R; -DEVPOS ;R; -DIRECTORY ;R; -DISKSPACE ;N; -DISPBEGIN ;N; -DISPBOX ;R; -DISPCOUNT ;N; -DISPEND ;N; -DISPOUT ;R; -DOSERROR ;N; -DOW ;R; -DTOC ;R; -DTOS ;R; -EMPTY ;R; -EOF ;N; -ERRORBLOCK ;R; -ERRORLEVEL ;R; -EVAL ;R; -EXP ;R; -FCLOSE ;R; -FCOUNT ;S; -FCREATE ;R; -FERASE ;R; -FERROR ;R; -FIELDBLOCK ;N; -FIELDGET ;S; -FIELDNAME ;S; -FIELDPOS ;S; -FIELDPUT ;S; -FIELDWBLOCK ;N; -FILE ;R; -FKLABEL ;N; -FKMAX ;N; -FLOCK ;N; -FOPEN ;R; -FOUND ;N; -FREAD ;R; -FREADSTR ;R; -FRENAME ;R; -FSEEK ;R; -FWRITE ;R; -GETENV ;R; -HARDCR ;R; -HEADER ;N; -I2BIN ;R; -IF ;R; -INDEXEXT ;N; -INDEXKEY ;N; -INDEXORD ;N; -INKEY ;S; -INT ;R; -ISALPHA ;R; -ISCOLOR ;N; -ISDIGIT ;R; -ISLOWER ;R; -ISPRINTER ;N; -ISUPPER ;R; -L2BIN ;R; -LASTKEY ;S; -LASTREC ;N; -LEFT ;R; -LEN ;R; -LOG ;R; -LOWER ;R; -LTRIM ;R; -LUPDATE ;N; -MAX ;R; -MAXCOL ;R; -MAXROW ;R; -MEMOEDIT ;N; -MEMOLINE ;N; -MEMOREAD ;N; -MEMORY ;N; -MEMOTRAN ;R; -MEMOWRIT ;N; -MEMVARBLOCK ;N; -MIN ;R; -MLCOUNT ;N; -MLCTOPOS ;N; -MLPOS ;N; -MOD ;R; -MONTH ;R; -MPOSTOLC ;N; -NETERR ;N; -NETNAME ;N; -NEXTKEY ;S; -NOSNOW ;N; -OS ;S; -OUTERR ;R; -OUTSTD ;R; -PAD ;R; -PCOL ;R; -PCOUNT ;R; -PROCLINE ;R; -PROCNAME ;R; -PROW ;R; -QOUT ;R; -RAT ;R; -READEXIT ;N; -READINSERT ;N; -READKEY ;N; -READMODAL ;N; -READVAR ;N; -RECCOUNT ;N; -RECNO ;N; -RECSIZE ;N; -REPLICATE ;R; -RESTSCREEN ;N; -RIGHT ;R; -RLOCK ;N; -ROUND ;R; -ROW ;R; -RTRIM ;R; -SAVESCREEN ;N; -SCROLL ;R; -SECONDS ;R; -SELECT ;S; -SET ;R; -SETBLINK ;N; -SETCANCEL ;N; -SETCOLOR ;S; -SETCURSOR ;N; -SETKEY ;N; -SETMODE ;N; -SETPOS ;R; -SETPRC ;R; -SOUNDEX ;S; -SPACE ;R; -SQRT ;R; -STR ;R; -STRTRAN ;R; -STUFF ;R; -SUBSTR ;R; -TIME ;R; -TONE ;N; -TRANSFORM ;R; -TYPE ;N; -UPDATED ;N; -UPPER ;R; -USED ;N; -VAL ;R; -VALTYPE ;R; -VERSION ;S; -WORD ;N; -YEAR ;R; +AADD ;R; +ABS ;R; +ACHOICE ;N; +ACLONE ;R; +ACOPY ;R; +ADEL ;R; +ADIR ;N; +AEVAL ;R; +AFIELDS ;N; +AFILL ;R; +AINS ;R; +ALERT ;N; +ALIAS ;N; +ALLTRIM ;R; +ALTD ;N; +ARRAY ;R; +ASC ;R; +ASCAN ;R; +ASIZE ;R; +ASORT ;R; +AT ;R; +ATAIL ;R; +BIN2I ;R; +BIN2L ;R; +BIN2W ;R; +BOF ;N; +BREAK ;N; +BROWSE ;N; +CDOW ;R; +CHR ;R; +CMONTH ;R; +COL ;R; +COLORSELECT ;N; +CTOD ;R; +CURDIR ;N; +DATE ;R; +DAY ;R; +DBAPPEND ;S; +DBCLEARFILTER ;S; +DBCLEARINDEX ;S; +DBCLEARRELATION ;S; +DBCLOSEALL ;S; +DBCLOSEAREA ;S; +DBCOMMIT ;S; +DBCOMMITALL ;S; +DBCREATE ;S; +DBCREATEIND ;S; +DBDELETE ;S; +DBEDIT ;N; +DBEVAL ;S; +DBF ;N; +DBFILTER ;S; +DBGOBOTTOM ;S; +DBGOTO ;S; +DBGOTOP ;S; +DBRECALL ;S; +DBREINDEX ;S; +DBRELATION ;S; +DBRSELECT ;S; +DBSEEK ;S; +DBSELECTAREA ;S; +DBSETDRIVER ;S; +DBSETFILTER ;S; +DBSETINDEX ;S; +DBSETORDER ;S; +DBSETRELATION ;S; +DBSKIP ;S; +DBSTRUCT ;S; +DBUNLOCK ;S; +DBUNLOCKALL ;S; +DBUSEAREA ;S; +DELETED ;N; +DESCEND ;R; +DEVOUT ;R; +DEVOUTPICT ;R; +DEVPOS ;R; +DIRECTORY ;R; +DISKSPACE ;N; +DISPBEGIN ;N; +DISPBOX ;R; +DISPCOUNT ;N; +DISPEND ;N; +DISPOUT ;R; +DOSERROR ;N; +DOW ;R; +DTOC ;R; +DTOS ;R; +EMPTY ;R; +EOF ;N; +ERRORBLOCK ;R; +ERRORLEVEL ;R; +EVAL ;R; +EXP ;R; +FCLOSE ;R; +FCOUNT ;S; +FCREATE ;R; +FERASE ;R; +FERROR ;R; +FIELDBLOCK ;N; +FIELDGET ;S; +FIELDNAME ;S; +FIELDPOS ;S; +FIELDPUT ;S; +FIELDWBLOCK ;N; +FILE ;R; +FKLABEL ;N; +FKMAX ;N; +FLOCK ;N; +FOPEN ;R; +FOUND ;N; +FREAD ;R; +FREADSTR ;R; +FRENAME ;R; +FSEEK ;R; +FWRITE ;R; +GETENV ;R; +HARDCR ;R; +HEADER ;N; +I2BIN ;R; +IF ;R; +INDEXEXT ;N; +INDEXKEY ;N; +INDEXORD ;N; +INKEY ;S; +INT ;R; +ISALPHA ;R; +ISCOLOR ;N; +ISDIGIT ;R; +ISLOWER ;R; +ISPRINTER ;N; +ISUPPER ;R; +L2BIN ;R; +LASTKEY ;S; +LASTREC ;N; +LEFT ;R; +LEN ;R; +LOG ;R; +LOWER ;R; +LTRIM ;R; +LUPDATE ;N; +MAX ;R; +MAXCOL ;R; +MAXROW ;R; +MEMOEDIT ;N; +MEMOLINE ;N; +MEMOREAD ;N; +MEMORY ;N; +MEMOTRAN ;R; +MEMOWRIT ;N; +MEMVARBLOCK ;N; +MIN ;R; +MLCOUNT ;N; +MLCTOPOS ;N; +MLPOS ;N; +MOD ;R; +MONTH ;R; +MPOSTOLC ;N; +NETERR ;N; +NETNAME ;N; +NEXTKEY ;S; +NOSNOW ;N; +OS ;S; +OUTERR ;R; +OUTSTD ;R; +PAD ;R; +PCOL ;R; +PCOUNT ;R; +PROCLINE ;R; +PROCNAME ;R; +PROW ;R; +QOUT ;R; +RAT ;R; +READEXIT ;N; +READINSERT ;N; +READKEY ;N; +READMODAL ;N; +READVAR ;N; +RECCOUNT ;N; +RECNO ;N; +RECSIZE ;N; +REPLICATE ;R; +RESTSCREEN ;N; +RIGHT ;R; +RLOCK ;N; +ROUND ;R; +ROW ;R; +RTRIM ;R; +SAVESCREEN ;N; +SCROLL ;R; +SECONDS ;R; +SELECT ;S; +SET ;R; +SETBLINK ;N; +SETCANCEL ;N; +SETCOLOR ;S; +SETCURSOR ;N; +SETKEY ;N; +SETMODE ;N; +SETPOS ;R; +SETPRC ;R; +SOUNDEX ;S; +SPACE ;R; +SQRT ;R; +STR ;R; +STRTRAN ;R; +STUFF ;R; +SUBSTR ;R; +TIME ;R; +TONE ;N; +TRANSFORM ;R; +TYPE ;N; +UPDATED ;N; +UPPER ;R; +USED ;N; +VAL ;R; +VALTYPE ;R; +VERSION ;S; +WORD ;N; +YEAR ;R; +; RDD DRIVER SYSTEM +DBRLOCK ;N; +DBRLOCKLIST ;N; +DBRUNLOCK ;N; +ORDBAGEXT ;N; +ORDBAGNAME ;N; +ORDCREATE ;N; +ORDDESTROY ;N; +ORDFOR ;N; +ORDKEY ;N; +ORDLISTADD ;N; +ORDLISTCLEAR ;N; +ORDLISTREBUI ;N; +ORDNAME ;N; +ORDNUMBER ;N; +ORDSETFOCUS ;N; +RDDLIST ;N; +RDDNAME ;N; +RDDSETDEFAULT ;N; +; GET SYSTEM +GETACTIVE ;N; +GETAPPLYKEY ;N; +GETDOSETKEY ;N; +GETPOSTVALIDATE ;N; +GETPREVALIDATE ;N; +GETREADER ;N; +READFORMAT ;N; +READKILL ;N; +READUPDATED ;N; +; ERROR OBJECT +ErrorNew ;N; +:Args ;N; +:CanDefault ;N; +:CanRetry ;N; +:CanSubstitute ;N; +:Cargo ;N; +:Description ;N; +:FileName ;N; +:GenCode ;N; +:Operation ;N; +:OsCode ;N; +:Severity ;N; +:SubCode ;N; +:SubSystem ;N; +:Tries ;N; +; GET OBJECT +GetNew ;N; +:BadDate ;N; +:Block ;N; +:Buffer ;N; +:Cargo ;N; +:Changed ;N; +:Clear ;N; +:Col ;N; +:ColorSpec ;N; +:DecPos ;N; +:ExitState ;N; +:HasFocus ;N; +:Minus ;N; +:Name ;N; +:Original ;N; +:Picture ;N; +:Pos ;N; +:PostBlock ;N; +:PreBlock ;N; +:Reader ;N; +:Rejected ;N; +:Row ;N; +:SubScript ;N; +:Type ;N; +:TypeOut ;N; +:Assign ;N; +:ColorDisp ;N; +:Display ;N; +:killFocus ;N; +:Reset ;N; +:SetFocus ;N; +:Undo ;N; +:UnTransform ;N; +:UpDateBuffer ;N; +:VarGet ;N; +:VarPut ;N; +:End ;N; +:Home ;N; +:Left ;N; +:Right ;N; +:ToDecPos ;N; +:WordLeft ;N; +:WordRight ;N; +:BackSpace ;N; +:Delete ;N; +:DelEnd ;N; +:DelLeft ;N; +:DelRight ;N; +:DelWordLeft ;N; +:DelWordRight ;N; +:Insert ;N; +:OverStrike ;N; +; TBROWSE OBJECT +TBrowseNew ;N; +TBrowseDB ;N; +:AutoLite ;N; +:Cargo ;N; +:ColCount ;N; +:ColorSpec ;N; +:ColPos ;N; +:ColSep ;N; +:FootSep ;N; +:Freeze ;N; +:GoBottomBlock ;N; +:GoTopBlock ;N; +:HeadSep ;N; +:HitBottom ;N; +:HitTop ;N; +:LeftVisible ;N; +:nBottom ;N; +:nLeft ;N; +:nRight ;N; +:nTop ;N; +:RightVisible ;N; +:RowCount ;N; +:RowPos ;N; +:SkipBlock ;N; +:Stable ;N; +:Down ;N; +:end ;N; +:GoBottom ;N; +:GoTop ;N; +:Home ;N; +:Left ;N; +:PageDown ;N; +:PageUp ;N; +:PanEnd ;N; +:PanHome ;N; +:PanLeft ;N; +:PanRight ;N; +:Right ;N; +:Up ;N; +:AddColumn ;N; +:ColorRect ;N; +:ColWidth ;N; +:Configure ;N; +:DeHilite ;N; +:DelColumn ;N; +:ForceStable ;N; +:GetColumn ;N; +:Hilite ;N; +:InsColumn ;N; +:Invalidate ;N; +:RefreshAll ;N; +:RefreshCurrent ;N; +:SetColumn ;N; +:Stabilize ;N; +; TBCOLUMN OBJECT +TBColumnNew ;N; +:Block ;N; +:Cargo ;N; +:ColorBlock ;N; +:ColSep ;N; +:DefColor ;N; +:Footing ;N; +:FootSep ;N; +:Heading ;N; +:HeadSep ;N; +:Picture ;N; +:Width ;N; +; EXTEND API +_parc ;R; +_parclen ;R; +_parcsiz ;R; +_pards ;R; +_parinfa ;R; +_parinfo ;R; +_parl ;R; +_parnd ;R; +_parni ;R; +_parnl ;R; +_ret ;R; +_retc ;R; +_retclen ;R; +_retds ;R; +_retl ;R; +_retnd ;R; +_retni ;R; +_retnl ;R; +_storc ;R; +_storclen ;R; +_stords ;R; +_storl ;R; +_stornd ;R; +_storni ;R; +_stornl ;R; +; ITEM API +_evalLaunch ;R; +_evalNew ;R; +_evalPutParam ;R; +_evalRelease ;R; +_itemArrayGet ;R; +_itemArrayNew ;R; +_itemArrayPut ;R; +_itemCopyC ;R; +_itemFreeC ;R; +_itemGetC ;R; +_itemGetDS ;R; +_itemGetL ;R; +_itemGetND ;R; +_itemGetNL ;R; +_itemNew ;R; +_itemParam ;R; +_itemPutC ;R; +_itemPutCL ;R; +_itemPutDS ;R; +_itemPutL ;R; +_itemPutND ;R; +_itemPutNL ;R; +_itemRelease ;R; +_itemReturn ;R; +_itemSize ;R; +_itemType ;R; +; FIXED MEMORY API +_xalloc ;R; +_xfree ;R; +_xgrab ;R; +; VIRTUAL MEMORY API +_xvalloc ;R; +_xvfree ;R; +_xvheapalloc ;R; +_xvheapdestroy ;R; +_xvheapfree ;R; +_xvheaplock ;R; +_xvheapnew ;R; +_xvheapresize ;R; +_xvheapunlock ;R; +_xvlock ;R; +_xvlockcount ;R; +_xvrealloc ;R; +_xvsize ;R; +_xvunlock ;R; +_xvunwire ;R; +_xvwire ;R; +: ERROR API +_errGetDescrip ;R; +_errGetFileName ;R; +_errGetFlags ;R; +_errGetGenCode ;R; +_errGetOperation ;R; +_errGetOsCode ;R; +_errGetSeverity ;R; +_errGetSubCode ;R; +_errGetSubSystem ;R; +_errGetTries ;R; +_errLaunch ;R; +_errNew ;R; +_errPutDescrip ;R; +_errPutFileName ;R; +_errPutFlags ;R; +_errPutGenCode ;R; +_errPutOperation ;R; +_errPutOsCode ;R; +_errPutSeverity ;R; +_errPutSubCode ;R; +_errPutSubSystem ;R; +_errPutTries ;R; +_errRelease ;R; +; FILESYS API +_fsClose ;R; +_fsCommit ;R; +_fsCreate ;R; +_fsDelete ;R; +_fsError ;R; +_fsExtOpen ;R; +_fsLock ;R; +_fsOpen ;R; +_fsRead ;R; +_fsRename ;R; +_fsSeek ;R; +_fsWrite ;R; +; GT API +_gtBox ;S; +_gtBoxD ;S; +_gtBoxS ;S; +_gtColorSelect ;S; +_gtDispBegin ;S; +_gtDispCount ;S; +_gtDispEnd ;S; +_gtGetColorStr ;S; +_gtGetCursor ;S; +_gtGetPos ;S; +_gtIsColor ;S; +_gtMaxCol ;S; +_gtMaxRow ;S; +_gtPostExt ;S; +_gtPreExt ;S; +_gtRectSize ;S; +_gtRepChar ;S; +_gtRest ;S; +_gtSave ;S; +_gtScrDim ;S; +_gtScroll ;S; +_gtSetBlink ;S; +_gtSetColorStr ;S; +_gtSetCursor ;S; +_gtSetMode ;S; +_gtSetPos ;S; +_gtSetSnowFlag ;S; +_gtWrite ;S; +_gtWriteAt ;S; +_gtWriteCon ;S; +; RDD +; TODO: +; UNDOCUMENTED +; TODO: diff --git a/harbour/include/fm.api b/harbour/include/fm.api index d64371cc0e..65752df8b3 100644 --- a/harbour/include/fm.api +++ b/harbour/include/fm.api @@ -12,7 +12,6 @@ #define _xalloc hb_xalloc #define _xgrab hb_xgrab -#define _xrealloc hb_xrealloc #define _xfree hb_xfree #endif /* HB_FM_API_ */ diff --git a/harbour/source/hbpp/buildgcc.bat b/harbour/source/hbpp/buildgcc.bat deleted file mode 100644 index afc8432036..0000000000 --- a/harbour/source/hbpp/buildgcc.bat +++ /dev/null @@ -1 +0,0 @@ -gcc hbppmain.c hbpp.c table.c -I..\..\include -o hbpp.exe diff --git a/harbour/source/rtl/alert.prg b/harbour/source/rtl/alert.prg index 3913e15e9c..5dafe41d4b 100644 --- a/harbour/source/rtl/alert.prg +++ b/harbour/source/rtl/alert.prg @@ -51,8 +51,8 @@ FUNCTION Alert(cMessage, aOptions, cColorNorm, nDelay) cColorNorm := 'w+/r' cColorHigh := 'w+/b' ELSE - cColorHigh := StrTran(iif(At("/", cColorNorm) == 0, "N", SubStr(cColorNorm, At("/", cColorNorm) + 1)) + "/" +; - iif(At("/", cColorNorm) == 0, cColorNorm, Left(cColorNorm, At("/", cColorNorm) - 1)), "+", "") + cColorHigh := StrTran(StrTran(iif(At("/", cColorNorm) == 0, "N", SubStr(cColorNorm, At("/", cColorNorm) + 1)) + "/" +; + iif(At("/", cColorNorm) == 0, cColorNorm, Left(cColorNorm, At("/", cColorNorm) - 1)), "+", ""), "*", "") ENDIF IF nDelay == NIL diff --git a/harbour/source/rtl/extend.c b/harbour/source/rtl/extend.c index 0d0509b70c..54236843ee 100644 --- a/harbour/source/rtl/extend.c +++ b/harbour/source/rtl/extend.c @@ -26,7 +26,7 @@ #include "set.h" #include "extend.h" #include "dates.h" -#include "item.api" +#include "itemapi.h" PHB_ITEM hb_param( int iParam, WORD wMask ) { diff --git a/harbour/source/tools/hb_f.c b/harbour/source/tools/hb_f.c index b76100c39b..b49aeae643 100644 --- a/harbour/source/tools/hb_f.c +++ b/harbour/source/tools/hb_f.c @@ -24,7 +24,7 @@ /* please run $(HARBOUR)\tests\working\testhbf.prg for testing */ -#include "filesys.api" +#include "filesys.h" #define b_size 1024 #define c_size 4096 diff --git a/harbour/tests/working/extend2.c b/harbour/tests/working/extend2.c index 075803300c..38e0547c6c 100644 --- a/harbour/tests/working/extend2.c +++ b/harbour/tests/working/extend2.c @@ -8,8 +8,8 @@ * NOTE: compile extend1.prg and extend2.c and link both files */ -#include #include +#include "extend.api" HARBOUR HB_STRINGS1() {