diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9bd009e772..663d54f247 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +2000-06-26 08:55 UTC+0300 Chen Kedem + + * source/rdd/dblist.prg + ! fixed to handle cToFileName that contain "." in the path + + * source/rtl/right.c + ! typo in the header LEFT() --> RIGHT() + + * doc/en/terminal.txt + + Documentation for OUTSTD() + + Documentation for OUTERR() + ! typo in ALERT() $SEEALSO$ STDOUT() --> OUTSTD() + 2000-06-25 22:24 UTC+0800 Brian Hays *doc/en/command.txt *began updating OOPs commands docs; This is a work in progress @@ -22,7 +35,6 @@ ! Rewrote (again) rules for STRING1 STRING2 STRING3 INDEX. Rules for strings much simpler. /* Flex had some problem with $ that caused output of strings. */ ->>>>>>> 1.2363 2000-06-25 23:58 UTC+0100 Ryszard Glab *source/vm/garbage.c diff --git a/harbour/doc/en/terminal.txt b/harbour/doc/en/terminal.txt index 08dbeb5229..42dfef181c 100644 --- a/harbour/doc/en/terminal.txt +++ b/harbour/doc/en/terminal.txt @@ -12,10 +12,10 @@ * Copyright 1999 Jose Lalin * Documentation for: __WAIT(), __INPUT() * - * Copyright 1999 Chen Kedem - * Documentation for: ALERT(), __NONOALERT(), __XSaveScreen(), SAVE SCREEN - * __XRestScreen(), RESTORE SCREEN, __TextSave(), - * __TextRestore() + * Copyright 1999-2000 Chen Kedem + * Documentation for: ALERT(), __NONOALERT(), OUTSTD(), OUTERR(), + * __XSaveScreen(), SAVE SCREEN, __XRestScreen(), + * RESTORE SCREEN, __TextSave(), __TextRestore() * * Copyright 1999 David G. Holm * Documentation for: DEVOUTPICT() @@ -294,7 +294,7 @@ * $FILES$ * Library is rtl * $SEEALSO$ - * @...PROMPT,MENU TO,STDOUT(),__NONOALERT() + * @...PROMPT,MENU TO,OUTSTD(),__NONOALERT() * $END$ */ @@ -579,3 +579,96 @@ * __ACCEPT(),__INPUT() * $END$ */ + +/* $DOC$ + * $FUNCNAME$ + * OUTSTD() + * $CATEGORY$ + * Data input and output + * $ONELINER$ + * Write a list of values to the standard output device + * $SYNTAX$ + * OUTSTD( ) --> NIL + * $ARGUMENTS$ + * is a list of expressions to display. Expressions are any + * mixture of Harbour data types. + * $RETURNS$ + * OUTSTD() always returns NIL. + * $DESCRIPTION$ + * OUTSTD() write one or more values into the standard output device. + * Character and Memo values are printed as is, Dates are printed + * according to the SET DATE FORMAT, Numeric values are converted to + * strings, Logical values are printed as .T. or .F., NIL are printed + * as NIL, values of any other kind are printed as empty string. There + * is one space separating each two values. Note that Numeric value can + * take varying length when converted into string depending on its + * source (see STR() for detail). + * + * OUTSTD() is similar to QQOUT() with the different that QQOUT() send + * its output to the Harbour console stream, which can or can not be + * redirected according with the screen driver, and OUTSTD() send its + * output to the standard output device (STDOUT) and can be redirected. + * $EXAMPLES$ + * OUTSTD( "Hello" ) // Result: Hello + * + * OUTSTD( 1, .T., NIL, "A" ) + * OUTSTD( "B" ) // Result: 1 .T. NIL AB + * $TESTS$ + * $STATUS$ + * R + * $COMPLIANCE$ + * OUTSTD() works exactly as in CA-Clipper + * $PLATFORMS$ + * $FILES$ + * Library is rtl + * $SEEALSO$ + * ?,??,DEVOUT(),DEVOUTPICT(),DISPOUT(),DISPOUTAT(),OUTERR(),QOUT(),QQOUT(),STR() + * $END$ + */ + +/* $DOC$ + * $FUNCNAME$ + * OUTERR() + * $CATEGORY$ + * Data input and output + * $ONELINER$ + * Write a list of values to the standard error device + * $SYNTAX$ + * OUTERR( ) --> NIL + * $ARGUMENTS$ + * is a list of expressions to display. Expressions are any + * mixture of Harbour data types. + * $RETURNS$ + * OUTERR() always returns NIL. + * $DESCRIPTION$ + * OUTERR() write one or more values into the standard error device. + * Character and Memo values are printed as is, Dates are printed + * according to the SET DATE FORMAT, Numeric values are converted to + * strings, Logical values are printed as .T. or .F., NIL are printed + * as NIL, values of any other kind are printed as empty string. There + * is one space separating each two values. Note that Numeric value can + * take varying length when converted into string depending on its + * source (see STR() for detail). + * + * There is an undocumented CA-Clipper command line switch //STDERR + * which can set the file handle to write output from OUTERR(). If not + * specified the default STDERR is used, //STDERR or //STDERR:0 set + * OUTERR() to output to the same file handle as OUTSTD(), //STDERR:n + * set output to file handle n. Like other undocumented features this + * switch is available only if source/rtl/console.c was compiled with + * the HB_C52_UNDOC flag. + * $EXAMPLES$ + * // write error log information + * OUTERR( DATE(), TIME(), "Core meltdown detected" ) + * $TESTS$ + * $STATUS$ + * R + * $COMPLIANCE$ + * OUTERR() works exactly as in CA-Clipper + * $PLATFORMS$ + * $FILES$ + * Library is rtl + * $SEEALSO$ + * ?,??,DEVOUT(),DEVOUTPICT(),DISPOUT(),DISPOUTAT(),OUTSTD(),QOUT(),QQOUT(),STR() + * $END$ + */ diff --git a/harbour/source/rdd/dblist.prg b/harbour/source/rdd/dblist.prg index 16e8547aa3..ad46ac66bb 100644 --- a/harbour/source/rdd/dblist.prg +++ b/harbour/source/rdd/dblist.prg @@ -33,13 +33,16 @@ * */ -/* NOTE: lAll is basically a dummy parameter, nothing really depends on it. +/* NOTE: lAll is basically a dummy parameter, nothing really depends on it. [vszakats] */ FUNCTION __dbList( lOff, abEval, lAll, bFor, bWhile, nNext, nRecord, lRest, lToPrint, cToFileName ) LOCAL lOldPrinter LOCAL lOldExtra LOCAL cOldExtraFile + LOCAL cPath + LOCAL cName + LOCAL cExt LOCAL oError @@ -61,11 +64,12 @@ FUNCTION __dbList( lOff, abEval, lAll, bFor, bWhile, nNext, nRecord, lRest, lToP lOldPrinter := Set(_SET_PRINTER, .T. ) ENDIF IF !Empty( cToFileName ) - IF At( ".", cToFileName ) == 0 - cToFileName := cToFileName + ".txt" + hb_FNameSplit( cToFileName, @cPath, @cName, @cExt ) + IF Empty( cExt ) + cExt := ".txt" ENDIF lOldExtra := Set( _SET_EXTRA, .T. ) - cOldExtraFile := Set( _SET_EXTRAFILE, cToFileName ) + cOldExtraFile := Set( _SET_EXTRAFILE, hb_FNameMerge( @cPath, @cName, @cExt ) ) ENDIF /* Do the job */ @@ -104,3 +108,4 @@ FUNCTION __dbList( lOff, abEval, lAll, bFor, bWhile, nNext, nRecord, lRest, lToP ENDIF RETURN NIL + diff --git a/harbour/source/rtl/right.c b/harbour/source/rtl/right.c index e7c5f84f59..c8e7af1024 100644 --- a/harbour/source/rtl/right.c +++ b/harbour/source/rtl/right.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * LEFT() function + * RIGHT() function * * Copyright 1999 Antonio Linares * www - http://www.harbour-project.org