From 29a46a130233e401be39a90f34eeb1198ddaae6b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 17 Nov 2012 22:20:13 +0000 Subject: [PATCH] 2012-11-17 23:11 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/gtwvg/tests/_wvtcls.prg * contrib/gtwvg/tests/demowvg.prg * contrib/hbct/doc/en/dattime3.txt * contrib/hbct/tests/datetime.prg * contrib/hbnf/doc/en/acctadj.txt * contrib/hbnf/doc/en/acctmnth.txt * contrib/hbnf/doc/en/acctqtr.txt * contrib/hbnf/doc/en/acctweek.txt * contrib/hbnf/doc/en/acctyear.txt * contrib/hbnf/doc/en/dayofyr.txt * contrib/hbnf/doc/en/daytobow.txt * contrib/hbnf/doc/en/elapsed.txt * contrib/hbnf/doc/en/firstday.txt * contrib/hbnf/doc/en/lastday.txt * contrib/hbnf/doc/en/madd.txt * contrib/hbnf/doc/en/month.txt * contrib/hbnf/doc/en/qtr.txt * contrib/hbnf/doc/en/savearr.txt * contrib/hbnf/doc/en/setdate.txt * contrib/hbnf/doc/en/wda.txt * contrib/hbnf/doc/en/week.txt * contrib/hbnf/doc/en/workdays.txt * contrib/hbnf/doc/en/woy.txt * contrib/hbnf/doc/en/year.txt * contrib/hbnf/tests/elapsed.prg * contrib/hbnf/tests/savearr.prg * contrib/hbnf/tests/setdate.prg * contrib/hbnf/tests/wda.prg * contrib/hbnf/tests/workdays.prg * contrib/hbnf/tests/woy.prg * contrib/hbpgsql/tests/dbf2pg.prg * contrib/hbsqlit3/hdbcsqlt.prg * contrib/rddsql/tests/arrayrdd.prg * doc/en/datetime.txt * doc/en/math.txt * doc/en/string.txt * doc/hdr_tpl.txt * extras/gtwvw/tests/ebtest7.prg * extras/gtwvw/tests/wvwtest9.prg * extras/guestbk/inifiles.prg * extras/hbvpdf/core.prg * extras/httpsrv/cgifunc.prg * tests/array16.prg * tests/bldtest/bldtest.c * tests/byref.prg * tests/dates.prg * tests/gfx.prg * tests/inifiles.prg * tests/initexit.prg * tests/longdev.prg * tests/parseini.ini * tests/parseini.prg * tests/usrrdd/exarr.prg * website/samples/byref.prg.html * website/samples/initexit.prg.html * website/samples/longdev.prg.html * website/samples/mousetst.prg.html * website/samples/parseini.ini.html * website/samples/parseini.prg.html * various cleanups --- harbour/ChangeLog | 62 +++++++++++++++++++++++ harbour/contrib/gtwvg/tests/_wvtcls.prg | 2 +- harbour/contrib/gtwvg/tests/demowvg.prg | 8 +-- harbour/contrib/hbct/doc/en/dattime3.txt | 2 +- harbour/contrib/hbct/tests/datetime.prg | 56 ++++++++++---------- harbour/contrib/hbnf/doc/en/acctadj.txt | 8 +-- harbour/contrib/hbnf/doc/en/acctmnth.txt | 4 +- harbour/contrib/hbnf/doc/en/acctqtr.txt | 4 +- harbour/contrib/hbnf/doc/en/acctweek.txt | 4 +- harbour/contrib/hbnf/doc/en/acctyear.txt | 2 +- harbour/contrib/hbnf/doc/en/dayofyr.txt | 2 +- harbour/contrib/hbnf/doc/en/daytobow.txt | 2 +- harbour/contrib/hbnf/doc/en/elapsed.txt | 2 +- harbour/contrib/hbnf/doc/en/firstday.txt | 2 +- harbour/contrib/hbnf/doc/en/lastday.txt | 2 +- harbour/contrib/hbnf/doc/en/madd.txt | 4 +- harbour/contrib/hbnf/doc/en/month.txt | 4 +- harbour/contrib/hbnf/doc/en/qtr.txt | 4 +- harbour/contrib/hbnf/doc/en/savearr.txt | 4 +- harbour/contrib/hbnf/doc/en/setdate.txt | 2 +- harbour/contrib/hbnf/doc/en/wda.txt | 2 +- harbour/contrib/hbnf/doc/en/week.txt | 4 +- harbour/contrib/hbnf/doc/en/workdays.txt | 6 +-- harbour/contrib/hbnf/doc/en/woy.txt | 12 ++--- harbour/contrib/hbnf/doc/en/year.txt | 2 +- harbour/contrib/hbnf/tests/elapsed.prg | 4 +- harbour/contrib/hbnf/tests/savearr.prg | 2 +- harbour/contrib/hbnf/tests/setdate.prg | 2 +- harbour/contrib/hbnf/tests/wda.prg | 4 +- harbour/contrib/hbnf/tests/workdays.prg | 2 +- harbour/contrib/hbnf/tests/woy.prg | 2 +- harbour/contrib/hbpgsql/tests/dbf2pg.prg | 2 +- harbour/contrib/hbsqlit3/hdbcsqlt.prg | 2 +- harbour/contrib/rddsql/tests/arrayrdd.prg | 8 +-- harbour/doc/en/datetime.txt | 2 +- harbour/doc/en/math.txt | 4 +- harbour/doc/en/string.txt | 2 +- harbour/doc/hdr_tpl.txt | 8 +-- harbour/extras/gtwvw/tests/ebtest7.prg | 2 +- harbour/extras/gtwvw/tests/wvwtest9.prg | 2 +- harbour/extras/guestbk/inifiles.prg | 2 +- harbour/extras/hbvpdf/core.prg | 2 +- harbour/extras/httpsrv/cgifunc.prg | 2 +- harbour/tests/array16.prg | 2 +- harbour/tests/bldtest/bldtest.c | 1 - harbour/tests/byref.prg | 16 +++--- harbour/tests/dates.prg | 2 +- harbour/tests/gfx.prg | 17 +++---- harbour/tests/inifiles.prg | 2 +- harbour/tests/initexit.prg | 4 ++ harbour/tests/longdev.prg | 5 +- harbour/tests/parseini.ini | 4 +- harbour/tests/parseini.prg | 2 +- harbour/tests/usrrdd/exarr.prg | 4 +- harbour/website/samples/byref.prg.html | 16 +++--- harbour/website/samples/initexit.prg.html | 4 ++ harbour/website/samples/longdev.prg.html | 5 +- harbour/website/samples/mousetst.prg.html | 2 + harbour/website/samples/parseini.ini.html | 2 +- harbour/website/samples/parseini.prg.html | 2 +- 60 files changed, 211 insertions(+), 139 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index abec37b9e2..4bb5131ac5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,68 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-17 23:11 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/tests/_wvtcls.prg + * contrib/gtwvg/tests/demowvg.prg + * contrib/hbct/doc/en/dattime3.txt + * contrib/hbct/tests/datetime.prg + * contrib/hbnf/doc/en/acctadj.txt + * contrib/hbnf/doc/en/acctmnth.txt + * contrib/hbnf/doc/en/acctqtr.txt + * contrib/hbnf/doc/en/acctweek.txt + * contrib/hbnf/doc/en/acctyear.txt + * contrib/hbnf/doc/en/dayofyr.txt + * contrib/hbnf/doc/en/daytobow.txt + * contrib/hbnf/doc/en/elapsed.txt + * contrib/hbnf/doc/en/firstday.txt + * contrib/hbnf/doc/en/lastday.txt + * contrib/hbnf/doc/en/madd.txt + * contrib/hbnf/doc/en/month.txt + * contrib/hbnf/doc/en/qtr.txt + * contrib/hbnf/doc/en/savearr.txt + * contrib/hbnf/doc/en/setdate.txt + * contrib/hbnf/doc/en/wda.txt + * contrib/hbnf/doc/en/week.txt + * contrib/hbnf/doc/en/workdays.txt + * contrib/hbnf/doc/en/woy.txt + * contrib/hbnf/doc/en/year.txt + * contrib/hbnf/tests/elapsed.prg + * contrib/hbnf/tests/savearr.prg + * contrib/hbnf/tests/setdate.prg + * contrib/hbnf/tests/wda.prg + * contrib/hbnf/tests/workdays.prg + * contrib/hbnf/tests/woy.prg + * contrib/hbpgsql/tests/dbf2pg.prg + * contrib/hbsqlit3/hdbcsqlt.prg + * contrib/rddsql/tests/arrayrdd.prg + * doc/en/datetime.txt + * doc/en/math.txt + * doc/en/string.txt + * doc/hdr_tpl.txt + * extras/gtwvw/tests/ebtest7.prg + * extras/gtwvw/tests/wvwtest9.prg + * extras/guestbk/inifiles.prg + * extras/hbvpdf/core.prg + * extras/httpsrv/cgifunc.prg + * tests/array16.prg + * tests/bldtest/bldtest.c + * tests/byref.prg + * tests/dates.prg + * tests/gfx.prg + * tests/inifiles.prg + * tests/initexit.prg + * tests/longdev.prg + * tests/parseini.ini + * tests/parseini.prg + * tests/usrrdd/exarr.prg + * website/samples/byref.prg.html + * website/samples/initexit.prg.html + * website/samples/longdev.prg.html + * website/samples/mousetst.prg.html + * website/samples/parseini.ini.html + * website/samples/parseini.prg.html + * various cleanups + 2012-11-17 20:29 UTC+0100 Viktor Szakats (harbour syenar.net) * tests/mousetst.prg * website/samples/mousetst.prg.html diff --git a/harbour/contrib/gtwvg/tests/_wvtcls.prg b/harbour/contrib/gtwvg/tests/_wvtcls.prg index 106273e648..5c0db0aee8 100644 --- a/harbour/contrib/gtwvg/tests/_wvtcls.prg +++ b/harbour/contrib/gtwvg/tests/_wvtcls.prg @@ -261,7 +261,7 @@ STATIC FUNCTION MyDialogOne( oCrt ) PadR( "Ludhiana, INDIA", 30 ), ; "PB", ; PadR( "141004", 10 ), ; - SToD( "20040622" ), ; + hb_SToD( "20040622" ), ; .T., ; 48, ; 17000, ; diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index 541b9eb01a..341c48dd91 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -69,7 +69,7 @@ PROCEDURE Main() LOCAL aLastPaint, clr, scr, pGT LOCAL hPopup - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL cName := PadR( "Pritpal Bedi", 35 ) LOCAL cAdd1 := PadR( "60, New Professor Colony", 35 ) LOCAL cAdd2 := PadR( "Ludhiana, INDIA", 35 ) @@ -158,7 +158,7 @@ PROCEDURE Main() @ 12, nColGet SAY "<" + PadC( "Address", 33 ) + ">" @ 16, 61 SAY "< Salary >" - dDate := SToD( "20040401" ) + dDate := hb_SToD( "20040401" ) @ 7, nColGet GET dDate WHEN DispStatusMsg( "Date must be valid" ) VALID ClearStatusMsg() @ 10, nColGet GET cName WHEN DispStatusMsg( "Must be one of the list!" ) VALID ( VouChoice() < 7 .AND. ClearStatusMsg() ) @@ -201,7 +201,7 @@ PROCEDURE WvtConsoleGets( nMode ) PROCEDURE WvtNextGetsConsole() - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL cName := Space( 35 ) LOCAL cAdd1 := Space( 35 ) LOCAL cAdd2 := Space( 35 ) @@ -247,7 +247,7 @@ PROCEDURE WvtNextGets() PROCEDURE WvtNextGets_X() LOCAL aLastPaint, clr - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL cName := Space( 35 ) LOCAL cAdd1 := Space( 35 ) LOCAL cAdd2 := Space( 35 ) diff --git a/harbour/contrib/hbct/doc/en/dattime3.txt b/harbour/contrib/hbct/doc/en/dattime3.txt index 646efb22a9..79546d463a 100644 --- a/harbour/contrib/hbct/doc/en/dattime3.txt +++ b/harbour/contrib/hbct/doc/en/dattime3.txt @@ -193,7 +193,7 @@ // Set the system date in each case; but the hardware clock only // on an AT: - dNewDate := SToD( "19910730" ) + dNewDate := hb_SToD( "19910730" ) IF IsAt() SetDate( dNewDate, .T. ) ELSE diff --git a/harbour/contrib/hbct/tests/datetime.prg b/harbour/contrib/hbct/tests/datetime.prg index 1f04ebb486..4690d2bd36 100644 --- a/harbour/contrib/hbct/tests/datetime.prg +++ b/harbour/contrib/hbct/tests/datetime.prg @@ -166,7 +166,7 @@ FUNCTION addmtest() // This version will only accept an nMonths value of from 0 to 70 LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL mnth := 0 LOCAL nKey @@ -214,7 +214,7 @@ FUNCTION bomtest() // ============= LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -258,7 +258,7 @@ FUNCTION boqtest() // ============= LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -304,7 +304,7 @@ FUNCTION boytest() // ============= LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nkey @@ -331,7 +331,7 @@ FUNCTION boytest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -578,7 +578,7 @@ FUNCTION dmytest() // only. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL cMode := Space( 1 ) LOCAL c := .T. LOCAL nKey @@ -611,7 +611,7 @@ FUNCTION dmytest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() cMode := Space( 1 ) ENDIF @@ -633,7 +633,7 @@ FUNCTION doytest() // if dDate is invalid, returns 0 LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -660,7 +660,7 @@ FUNCTION doytest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -681,7 +681,7 @@ FUNCTION eomtest() // date. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -709,7 +709,7 @@ FUNCTION eomtest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -729,7 +729,7 @@ FUNCTION eoqtest() // Returns the last date in the quarter in which dDate falls. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -757,7 +757,7 @@ FUNCTION eoqtest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -778,7 +778,7 @@ FUNCTION eoytest() // date. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -806,7 +806,7 @@ FUNCTION eoytest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -827,7 +827,7 @@ FUNCTION isleaptest() // Leap years are exactly divisible by 4 and 1,000 but not 100. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL cResult LOCAL nKey @@ -861,7 +861,7 @@ FUNCTION isleaptest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -884,7 +884,7 @@ FUNCTION lastdayomtest() // If xDate is invalid, returns 0 LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey LOCAL cMth := " " @@ -920,7 +920,7 @@ FUNCTION lastdayomtest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() cMth := " " ENDIF @@ -943,7 +943,7 @@ FUNCTION mdytest() // This version does not observe the Nations module. English only. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -972,7 +972,7 @@ FUNCTION mdytest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -1093,7 +1093,7 @@ FUNCTION qtrtest() // the system date is used. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey @@ -1121,7 +1121,7 @@ FUNCTION qtrtest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF @@ -1136,7 +1136,7 @@ FUNCTION qtrtest() FUNCTION stodtest() // - // SToD( ansi-date) + // hb_SToD( ansi-date) // ================ // Returns a Clipper format date. If Ansi date is invalid, a // null date is returned. @@ -1165,7 +1165,7 @@ FUNCTION stodtest() c := .F. ELSE - dDate := SToD( cAnsidate ) + dDate := hb_SToD( cAnsidate ) @ 10, 10 SAY "The Clipper format date is " + ; PadR( LTrim( DToC( dDate ) ), 10 ) @@ -1216,11 +1216,11 @@ FUNCTION weektest() // nWeek := Week( dDate, lSWN ) // ============================= // Returns the calendar week as a number. If no date is specified, - // the system date is used. An empty date viz SToD() + // the system date is used. An empty date viz hb_SToD() // returns 0. LOCAL getlist := {} - LOCAL dDate := SToD() + LOCAL dDate := hb_SToD() LOCAL c := .T. LOCAL nKey LOCAL cMode := Space( 1 ) @@ -1253,7 +1253,7 @@ FUNCTION weektest() Inkey( 0 ) SET CURSOR ON - dDate := SToD() + dDate := hb_SToD() ENDIF diff --git a/harbour/contrib/hbnf/doc/en/acctadj.txt b/harbour/contrib/hbnf/doc/en/acctadj.txt index cc6441377a..1fe7152d90 100644 --- a/harbour/contrib/hbnf/doc/en/acctadj.txt +++ b/harbour/contrib/hbnf/doc/en/acctadj.txt @@ -41,18 +41,18 @@ $EXAMPLES$ Beginning of period mode (lIsEnd == .F.) - dDate := SToD( "19910131" ) // In last 3 days of work week + dDate := hb_SToD( "19910131" ) // In last 3 days of work week ? ft_AcctAdj( dDate ) // 1991.02.03 (next week's start) - dDate := SToD( "19910331" ) // Not in last 3 days of work week + dDate := hb_SToD( "19910331" ) // Not in last 3 days of work week ? ft_AcctAdj( dDate ) // 1991.03.31 (this week's start) End of period mode (lIsEnd == .T.) - dDate := SToD( "19910131" ) // In last 4 days of work week + dDate := hb_SToD( "19910131" ) // In last 4 days of work week ? ft_AcctAdj( dDate, .T. ) // 1991.02.02 (this week's end) - dDate := SToD( "19910331" ) // Not in last 4 days of work week + dDate := hb_SToD( "19910331" ) // Not in last 4 days of work week ? ft_AcctAdj( dDate, .T. ) // 1991.03.30 (prior week's end) $SEEALSO$ ft_DateCnfg() ft_DayToBoW() diff --git a/harbour/contrib/hbnf/doc/en/acctmnth.txt b/harbour/contrib/hbnf/doc/en/acctmnth.txt index bc298207b3..24b110349a 100644 --- a/harbour/contrib/hbnf/doc/en/acctmnth.txt +++ b/harbour/contrib/hbnf/doc/en/acctmnth.txt @@ -41,13 +41,13 @@ weeks. $EXAMPLES$ // get info about accounting month containing 9/15/90 - aDateInfo := ft_AcctMonth( SToD( "19900915" ) ) + aDateInfo := ft_AcctMonth( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199009 (9th month) ? aDateInfo[ 2 ] // 09/02/90 beginning of month 9 ? aDateInfo[ 3 ] // 09/29/90 end of month 9 // get info about accounting month 5 in year containing 9/15/90 - aDateInfo := ft_AcctMonth( SToD( "19900915" ), 5 ) + aDateInfo := ft_AcctMonth( hb_SToD( "19900915" ), 5 ) ? aDateInfo[ 1 ] // 199005 ? aDateInfo[ 2 ] // 04/29/89 beginning of month 5 ? aDateInfo[ 3 ] // 06/02/90 end of month 5 diff --git a/harbour/contrib/hbnf/doc/en/acctqtr.txt b/harbour/contrib/hbnf/doc/en/acctqtr.txt index a7808b41a9..44e7901b16 100644 --- a/harbour/contrib/hbnf/doc/en/acctqtr.txt +++ b/harbour/contrib/hbnf/doc/en/acctqtr.txt @@ -41,13 +41,13 @@ weeks. $EXAMPLES$ // get info about accounting month containing 9/15/90 - aDateInfo := ft_AcctQtr( SToD( "19900915" ) ) + aDateInfo := ft_AcctQtr( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199003 (3rd quarter) ? aDateInfo[ 2 ] // 07/01/90 beginning of quarter 3 ? aDateInfo[ 3 ] // 09/29/90 end of quarter 3 // get info about accounting qtr. 2 in year containing 9/15/90 - aDateInfo := ft_AcctQtr( SToD( "19900915" ), 2 ) + aDateInfo := ft_AcctQtr( hb_SToD( "19900915" ), 2 ) ? aDateInfo[ 1 ] // 199002 ? aDateInfo[ 2 ] // 04/01/89 beginning of quarter 2 ? aDateInfo[ 3 ] // 06/30/90 end of quarter 2 diff --git a/harbour/contrib/hbnf/doc/en/acctweek.txt b/harbour/contrib/hbnf/doc/en/acctweek.txt index 746c517cef..8df5d17408 100644 --- a/harbour/contrib/hbnf/doc/en/acctweek.txt +++ b/harbour/contrib/hbnf/doc/en/acctweek.txt @@ -41,13 +41,13 @@ weeks. $EXAMPLES$ // get info about accounting week containing 9/15/90 - aDateInfo := ft_AcctWeek( SToD( "19900915" ) ) + aDateInfo := ft_AcctWeek( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199037 (37th week) ? aDateInfo[ 2 ] // 09/09/90 beginning of week 37 ? aDateInfo[ 3 ] // 09/15/90 end of week 37 // get info about accounting week 25 in year containing 9/15/90 - aDateInfo := ft_AcctWeek( SToD( "19900915" ), 25 ) + aDateInfo := ft_AcctWeek( hb_SToD( "19900915" ), 25 ) ? aDateInfo[ 1 ] // 199025 ? aDateInfo[ 2 ] // 06/17/89 beginning of week 25 ? aDateInfo[ 3 ] // 06/23/90 end of week 25 diff --git a/harbour/contrib/hbnf/doc/en/acctyear.txt b/harbour/contrib/hbnf/doc/en/acctyear.txt index bc3c539379..73761d538a 100644 --- a/harbour/contrib/hbnf/doc/en/acctyear.txt +++ b/harbour/contrib/hbnf/doc/en/acctyear.txt @@ -38,7 +38,7 @@ weeks. $EXAMPLES$ // get info about accounting year containing 9/15/90 - aDateInfo := ft_AcctYear( SToD( "19900915" ) ) + aDateInfo := ft_AcctYear( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 1990 ? aDateInfo[ 2 ] // 12/31/89 beginning of year ? aDateInfo[ 3 ] // 12/29/90 end of year diff --git a/harbour/contrib/hbnf/doc/en/dayofyr.txt b/harbour/contrib/hbnf/doc/en/dayofyr.txt index 6ff82c17ac..7b5f5ae41f 100644 --- a/harbour/contrib/hbnf/doc/en/dayofyr.txt +++ b/harbour/contrib/hbnf/doc/en/dayofyr.txt @@ -43,7 +43,7 @@ The beginning of year date defaults to January 1st but may be changed with ft_DateCnfg(). $EXAMPLES$ - aDateInfo := ft_DayOfYr( SToD( "19910331" ) ) + aDateInfo := ft_DayOfYr( hb_SToD( "19910331" ) ) ? aDateInfo[ 1 ] // 1991090 (90th day of year 1991) ? aDateInfo[ 2 ] // 01/01/91 ? aDateInfo[ 3 ] // 12/31/91 diff --git a/harbour/contrib/hbnf/doc/en/daytobow.txt b/harbour/contrib/hbnf/doc/en/daytobow.txt index f347ae82cb..6febd3ec73 100644 --- a/harbour/contrib/hbnf/doc/en/daytobow.txt +++ b/harbour/contrib/hbnf/doc/en/daytobow.txt @@ -23,7 +23,7 @@ day for the beginning of the week has been changed with ft_DateCnfg(). $EXAMPLES$ - dDate := SToD( "19900915" ) + dDate := hb_SToD( "19900915" ) ? DoW( dDate ) // 7 ? CDoW( dDate ) // Saturday diff --git a/harbour/contrib/hbnf/doc/en/elapsed.txt b/harbour/contrib/hbnf/doc/en/elapsed.txt index 536007e0e1..c911d1f31d 100644 --- a/harbour/contrib/hbnf/doc/en/elapsed.txt +++ b/harbour/contrib/hbnf/doc/en/elapsed.txt @@ -34,7 +34,7 @@ aRetVal[ 3, 1 ] Integer Minutes aRetVal[ 3, 2 ] Total Minutes (nn.nnnn) aRetVal[ 4, 1 ] Integer Seconds aRetVal[ 4, 2 ] Total Seconds (nn) $EXAMPLES$ - ft_Elapsed( SToD( "19901128" ), SToD( "19901130" ), "08:00:00", "12:10:30" ) + ft_Elapsed( hb_SToD( "19901128" ), hb_SToD( "19901130" ), "08:00:00", "12:10:30" ) // will return: ? aRetVal[ 1, 1 ] // -> 2 ( Days ) aRetVal[ 1, 2 ] -> 2.1740 Days diff --git a/harbour/contrib/hbnf/doc/en/firstday.txt b/harbour/contrib/hbnf/doc/en/firstday.txt index e919c3ecbc..5c95d10192 100644 --- a/harbour/contrib/hbnf/doc/en/firstday.txt +++ b/harbour/contrib/hbnf/doc/en/firstday.txt @@ -22,7 +22,7 @@ passed, or the first day of the current month if no argument is supplied. $EXAMPLES$ - dDate := SToD( "19900915" ) + dDate := hb_SToD( "19900915" ) ? ft_FDay( dDate ) // 09/01/90 ? ft_FDay() // 03/01/91 (current month) $SEEALSO$ diff --git a/harbour/contrib/hbnf/doc/en/lastday.txt b/harbour/contrib/hbnf/doc/en/lastday.txt index ae57af638b..de9a2e7cd4 100644 --- a/harbour/contrib/hbnf/doc/en/lastday.txt +++ b/harbour/contrib/hbnf/doc/en/lastday.txt @@ -22,7 +22,7 @@ passed, or the last day of the current month if no argument is supplied. $EXAMPLES$ - dDate := SToD( "19900915" ) + dDate := hb_SToD( "19900915" ) ? ft_LDay( dDate ) // 09/30/90 ? ft_LDay() // 03/31/91 (current month) $SEEALSO$ diff --git a/harbour/contrib/hbnf/doc/en/madd.txt b/harbour/contrib/hbnf/doc/en/madd.txt index 1ed8850b4a..dbd55aa8fb 100644 --- a/harbour/contrib/hbnf/doc/en/madd.txt +++ b/harbour/contrib/hbnf/doc/en/madd.txt @@ -31,12 +31,12 @@ it will return the EOM of calculated month. Otherwise it will return the same day as the day of the passed date. $EXAMPLES$ - dDate := SToD( "19900915" ) + dDate := hb_SToD( "19900915" ) ? ft_MAdd( dDate, 1 ) // 10/15/90 ? ft_MAdd( dDate, -2 ) // 07/15/90 // force EOM - dDate := SToD( "19910430" ) + dDate := hb_SToD( "19910430" ) ? ft_MAdd( dDate, 1 ) // 05/30/91 ? ft_MAdd( dDate, 1, .T. ) // 05/31/91 <- forced EOM ? ft_MAdd( dDate, 2 ) // 06/30/91 diff --git a/harbour/contrib/hbnf/doc/en/month.txt b/harbour/contrib/hbnf/doc/en/month.txt index 63466c5250..bb4b40746f 100644 --- a/harbour/contrib/hbnf/doc/en/month.txt +++ b/harbour/contrib/hbnf/doc/en/month.txt @@ -39,13 +39,13 @@ parameters. $EXAMPLES$ // get info about month containing 9/15/90 - aDateInfo := ft_Month( SToD( "19900915" ) ) + aDateInfo := ft_Month( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199009 (9th month) ? aDateInfo[ 2 ] // 09/01/90 beginning of month 9 ? aDateInfo[ 3 ] // 09/30/90 end of week month 9 // get info about month 5 in year containing 9/15/90 - aDateInfo := ft_Month( SToD( "19900915" ), 5 ) + aDateInfo := ft_Month( hb_SToD( "19900915" ), 5 ) ? aDateInfo[ 1 ] // 199005 ? aDateInfo[ 2 ] // 05/01/90 beginning of month 5 ? aDateInfo[ 3 ] // 05/31/90 end of month 5 diff --git a/harbour/contrib/hbnf/doc/en/qtr.txt b/harbour/contrib/hbnf/doc/en/qtr.txt index deec2f1c62..20b289c938 100644 --- a/harbour/contrib/hbnf/doc/en/qtr.txt +++ b/harbour/contrib/hbnf/doc/en/qtr.txt @@ -39,13 +39,13 @@ parameters. $EXAMPLES$ // get info about quarter containing 9/15/90 - aDateInfo := ft_Qtr( SToD( "19900915" ) ) + aDateInfo := ft_Qtr( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199003 (3rd quarter) ? aDateInfo[ 2 ] // 07/01/90 beginning of quarter 3 ? aDateInfo[ 3 ] // 09/30/90 end of week quarter 3 // get info about quarter 2 in year containing 9/15/90 - aDateInfo := ft_Qtr( SToD( "19900915" ), 2 ) + aDateInfo := ft_Qtr( hb_SToD( "19900915" ), 2 ) ? aDateInfo[ 1 ] // 199002 ? aDateInfo[ 2 ] // 04/01/90 beginning of quarter 2 ? aDateInfo[ 3 ] // 06/30/90 end of quarter 2 diff --git a/harbour/contrib/hbnf/doc/en/savearr.txt b/harbour/contrib/hbnf/doc/en/savearr.txt index 786a2fa042..2268b15294 100644 --- a/harbour/contrib/hbnf/doc/en/savearr.txt +++ b/harbour/contrib/hbnf/doc/en/savearr.txt @@ -39,7 +39,7 @@ $EXAMPLES$ aArray := { ; - { "Invoice 1", SToD( "19910415" ), 1234.32, .T. }, ; + { "Invoice 1", hb_SToD( "19910415" ), 1234.32, .T. }, ; { "Invoice 2", Date(), 234.98, .F. }, ; { "Invoice 3", Date() + 1, 0, .T. } } nErrorCode := 0 @@ -86,7 +86,7 @@ $EXAMPLES$ aArray := { ; - { "Invoice 1", SToD( "19910415" ), 1234.32, .T. }, ; + { "Invoice 1", hb_SToD( "19910415" ), 1234.32, .T. }, ; { "Invoice 2", Date(), 234.98, .F. }, ; { "Invoice 3", Date() + 1, 0, .T. } } nErrorCode := 0 diff --git a/harbour/contrib/hbnf/doc/en/setdate.txt b/harbour/contrib/hbnf/doc/en/setdate.txt index e9c14a3416..e9b20783ff 100644 --- a/harbour/contrib/hbnf/doc/en/setdate.txt +++ b/harbour/contrib/hbnf/doc/en/setdate.txt @@ -35,7 +35,7 @@ cDate := iif( cDate == NIL, DToS( Date() ), cDate ) ? "Setting date to: " + cDate + "... " - ft_SetDate( SToD( cDate ) ) + ft_SetDate( hb_SToD( cDate ) ) ? "Today is now: " + DToC( Date() ) RETURN diff --git a/harbour/contrib/hbnf/doc/en/wda.txt b/harbour/contrib/hbnf/doc/en/wda.txt index f2d010e7d1..27057dbe70 100644 --- a/harbour/contrib/hbnf/doc/en/wda.txt +++ b/harbour/contrib/hbnf/doc/en/wda.txt @@ -36,7 +36,7 @@ $EXAMPLES$ // Postdate 5 working days from the first of January - dPost := SToD( "19910101" ) + dPost := hb_SToD( "19910101" ) dPost += ft_AddWkDy( dPost, 5 ) // returns 7 true days ? dPost // 01/08/91 $SEEALSO$ diff --git a/harbour/contrib/hbnf/doc/en/week.txt b/harbour/contrib/hbnf/doc/en/week.txt index 80ee2df769..2ef58f957e 100644 --- a/harbour/contrib/hbnf/doc/en/week.txt +++ b/harbour/contrib/hbnf/doc/en/week.txt @@ -39,13 +39,13 @@ parameters. $EXAMPLES$ // get info about week containing 9/15/90 - aDateInfo := ft_Week( SToD( "19900915" ) ) + aDateInfo := ft_Week( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 199037 (37th week) ? aDateInfo[ 2 ] // 09/09/90 beginning of week 37 ? aDateInfo[ 3 ] // 09/15/90 end of week 37 // get info about week 25 in year containing 9/15/90 - aDateInfo := ft_Week( SToD( "19900915" ), 25 ) + aDateInfo := ft_Week( hb_SToD( "19900915" ), 25 ) ? aDateInfo[ 1 ] // 199025 ? aDateInfo[ 2 ] // 06/17/90 beginning of week 25 ? aDateInfo[ 3 ] // 06/23/90 end of week 25 diff --git a/harbour/contrib/hbnf/doc/en/workdays.txt b/harbour/contrib/hbnf/doc/en/workdays.txt index 58463b93a2..c431db6895 100644 --- a/harbour/contrib/hbnf/doc/en/workdays.txt +++ b/harbour/contrib/hbnf/doc/en/workdays.txt @@ -25,9 +25,9 @@ (The five day work week none of us Clipper programmers have.) $EXAMPLES$ - ? ft_Workdays( SToD( "19910516" ), SToD( "19910520" ) ) // 3 (Th - Mo) - ? ft_Workdays( SToD( "19910518" ), SToD( "19910519" ) ) // 0 (Sa - Su) - ? ft_Workdays( SToD( "19910517" ), SToD( "19910517" ) ) // 1 (Fr - Fr) + ? ft_Workdays( hb_SToD( "19910516" ), hb_SToD( "19910520" ) ) // 3 (Th - Mo) + ? ft_Workdays( hb_SToD( "19910518" ), hb_SToD( "19910519" ) ) // 0 (Sa - Su) + ? ft_Workdays( hb_SToD( "19910517" ), hb_SToD( "19910517" ) ) // 1 (Fr - Fr) $SEEALSO$ $END$ diff --git a/harbour/contrib/hbnf/doc/en/woy.txt b/harbour/contrib/hbnf/doc/en/woy.txt index 5cd1f573f7..98a6506e52 100644 --- a/harbour/contrib/hbnf/doc/en/woy.txt +++ b/harbour/contrib/hbnf/doc/en/woy.txt @@ -27,20 +27,20 @@ // These code fragments find the week number, given a date. // literal character date - dDate := SToD( "19910101" ) + dDate := hb_SToD( "19910101" ) nWkNum := ft_WoY( dDate ) // result: 1 // presume DOS date to be 01/06/91 nWkNum := ft_WoY( Date() ) // result: 2 // date input - dDate := SToD( "" ) + dDate := hb_SToD() @ 4, 10 GET cDate // input 1991/07/04 READ nWkNum := ft_WoY( dDate ) // result: 27 // last day of year - nWkNum := ft_WoY( SToD( "19911231" ) ) // result: 53 + nWkNum := ft_WoY( hb_SToD( "19911231" ) ) // result: 53 $END$ */ @@ -66,20 +66,20 @@ // These code fragments find the day number, given a date. // literal character date - dDate := SToD( "19910101" ) + dDate := hb_SToD( "19910101" ) nDayNum := ft_DoY( dDate ) // result: 1 // presume DOS date to be 01/06/91 nDayNum := ft_DoY( Date() ) // result: 6 // date input - dDate := SToD( "" ) + dDate := hb_SToD() @ 4, 10 GET cDate // input 1991/07/04 READ nDayNum := ft_DoY( dDate ) // result: 185 // last day of year - nDayNum := ft_DoY( SToD( "19911231" ) ) // result: 365 + nDayNum := ft_DoY( hb_SToD( "19911231" ) ) // result: 365 // For a demonstration of this function, compile and link the // program woy.prg in the Nanforum Toolkit source code. diff --git a/harbour/contrib/hbnf/doc/en/year.txt b/harbour/contrib/hbnf/doc/en/year.txt index f19c51bd84..c6c1e772ae 100644 --- a/harbour/contrib/hbnf/doc/en/year.txt +++ b/harbour/contrib/hbnf/doc/en/year.txt @@ -36,7 +36,7 @@ $EXAMPLES$ // Get info about year containing 9/15/90, assuming default // beginning of year is January 1st. - aDateInfo := ft_Year( SToD( "19900915" ) ) + aDateInfo := ft_Year( hb_SToD( "19900915" ) ) ? aDateInfo[ 1 ] // 1990 ? aDateInfo[ 2 ] // 01/01/90 beginning of year ? aDateInfo[ 3 ] // 12/31/90 end of year diff --git a/harbour/contrib/hbnf/tests/elapsed.prg b/harbour/contrib/hbnf/tests/elapsed.prg index 399f9eccaa..75754b82f7 100644 --- a/harbour/contrib/hbnf/tests/elapsed.prg +++ b/harbour/contrib/hbnf/tests/elapsed.prg @@ -8,8 +8,8 @@ PROCEDURE Main() LOCAL dStart, dEnd, cTimeStart, cTimeEnd, n, aDataTest - dStart := SToD( "19901128" ) - dEnd := SToD( "19901130" ) + dStart := hb_SToD( "19901128" ) + dEnd := hb_SToD( "19901130" ) cTimeStart := "08:00:00" cTimeEnd := "12:10:30" diff --git a/harbour/contrib/hbnf/tests/savearr.prg b/harbour/contrib/hbnf/tests/savearr.prg index a39f2bcea1..25663510bf 100644 --- a/harbour/contrib/hbnf/tests/savearr.prg +++ b/harbour/contrib/hbnf/tests/savearr.prg @@ -7,7 +7,7 @@ PROCEDURE Main() LOCAL aArray := { ; - { "Invoice 1", SToD( "19910415" ), 1234.32, .T. }, ; + { "Invoice 1", hb_SToD( "19910415" ), 1234.32, .T. }, ; { "Invoice 2", Date(), 234.98, .F. }, ; { "Invoice 3", Date() + 1, 0, .T. } }, aSave LOCAL nErrorCode := 0 diff --git a/harbour/contrib/hbnf/tests/setdate.prg b/harbour/contrib/hbnf/tests/setdate.prg index 1aa8fec130..02e91f8a03 100644 --- a/harbour/contrib/hbnf/tests/setdate.prg +++ b/harbour/contrib/hbnf/tests/setdate.prg @@ -11,7 +11,7 @@ PROCEDURE Main( cDate ) cDate := iif( cDate == NIL, DToS( Date() ), cDate ) ? "Setting date to: " + cDate + "... " - ft_SetDate( SToD( cDate ) ) + ft_SetDate( hb_SToD( cDate ) ) ? "Today is now: " + DToC( Date() ) RETURN diff --git a/harbour/contrib/hbnf/tests/wda.prg b/harbour/contrib/hbnf/tests/wda.prg index 6d0482800a..9cba24b665 100644 --- a/harbour/contrib/hbnf/tests/wda.prg +++ b/harbour/contrib/hbnf/tests/wda.prg @@ -6,9 +6,9 @@ PROCEDURE Main( cDate, cDays ) - LOCAL nDays := ft_AddWkDy( SToD( cDate ), Val( cDays ) ) + LOCAL nDays := ft_AddWkDy( hb_SToD( cDate ), Val( cDays ) ) ? "Num days to add: " + Str( nDays ) - ? "New date: " + DToC( SToD( cDate ) + nDays ) + ? "New date: " + DToC( hb_SToD( cDate ) + nDays ) RETURN diff --git a/harbour/contrib/hbnf/tests/workdays.prg b/harbour/contrib/hbnf/tests/workdays.prg index 6343a57804..e05fb372f7 100644 --- a/harbour/contrib/hbnf/tests/workdays.prg +++ b/harbour/contrib/hbnf/tests/workdays.prg @@ -6,6 +6,6 @@ PROCEDURE Main( cStart, cStop ) - ? ft_Workdays( SToD( cStart ), SToD( cStop ) ) + ? ft_Workdays( hb_SToD( cStart ), hb_SToD( cStop ) ) RETURN diff --git a/harbour/contrib/hbnf/tests/woy.prg b/harbour/contrib/hbnf/tests/woy.prg index 0a4f5197a0..c4df7c881d 100644 --- a/harbour/contrib/hbnf/tests/woy.prg +++ b/harbour/contrib/hbnf/tests/woy.prg @@ -16,7 +16,7 @@ PROCEDURE Main() @ 2, 10 SAY "Date to Test" - dDate := SToD( "" ) + dDate := hb_SToD() @ 2, 24 GET dDate READ diff --git a/harbour/contrib/hbpgsql/tests/dbf2pg.prg b/harbour/contrib/hbpgsql/tests/dbf2pg.prg index 82e4718c42..7477d42b2b 100644 --- a/harbour/contrib/hbpgsql/tests/dbf2pg.prg +++ b/harbour/contrib/hbpgsql/tests/dbf2pg.prg @@ -244,7 +244,7 @@ PROCEDURE Main( ... ) cValue := CToD( cValue ) ELSEIF dType == "D" .AND. sType == "N" - cValue := SToD( Str( cValue ) ) + cValue := hb_SToD( Str( cValue ) ) ELSEIF dType == "L" .AND. sType == "N" cValue := ! Empty( cValue ) diff --git a/harbour/contrib/hbsqlit3/hdbcsqlt.prg b/harbour/contrib/hbsqlit3/hdbcsqlt.prg index 96acad6285..b23cc59a35 100644 --- a/harbour/contrib/hbsqlit3/hdbcsqlt.prg +++ b/harbour/contrib/hbsqlit3/hdbcsqlt.prg @@ -329,7 +329,7 @@ CREATE CLASS hdbcSQLTResultSet METHOD getString( nField ) METHOD getNumber( nField ) INLINE Val( ::getString( nField ) ) - METHOD getDate( nField ) INLINE SToD( StrTran( ::getString( nField ), "-" ) ) + METHOD getDate( nField ) INLINE hb_SToD( StrTran( ::getString( nField ), "-" ) ) METHOD getBoolean( nField ) INLINE ( ::getString( nField ) == "t" ) METHOD getMetaData() diff --git a/harbour/contrib/rddsql/tests/arrayrdd.prg b/harbour/contrib/rddsql/tests/arrayrdd.prg index dc2305db13..fb74ff1c7b 100644 --- a/harbour/contrib/rddsql/tests/arrayrdd.prg +++ b/harbour/contrib/rddsql/tests/arrayrdd.prg @@ -18,10 +18,10 @@ PROCEDURE Main() rddSetDefault( "SQLMIX" ) dbCreate( "persons", { { "NAME", "C", 20, 0 }, { "FAMILYNAME", "C", 20, 0 }, { "BIRTH", "D", 8, 0 }, { "AMOUNT", "N", 9, 2 } }, , .T., "persons" ) - dbAppend(); AEval( { PadR( "Bil", 20 ), PadR( "Gatwick", 20 ), SToD( "19650124" ), 123456.78 }, {| X, Y | FieldPut( Y, X ) } ) - dbAppend(); AEval( { PadR( "Tom", 20 ), PadR( "Heathrow", 20 ), SToD( "19870512" ), 9086.54 }, {| X, Y | FieldPut( Y, X ) } ) - dbAppend(); AEval( { PadR( "John", 20 ), PadR( "Weber", 20 ), SToD( "19750306" ), 2975.45 }, {| X, Y | FieldPut( Y, X ) } ) - dbAppend(); AEval( { PadR( "Sim", 20 ), PadR( "Simsom", 20 ), SToD( "19930705" ), 32975.37 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "Bil", 20 ), PadR( "Gatwick", 20 ), hb_SToD( "19650124" ), 123456.78 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "Tom", 20 ), PadR( "Heathrow", 20 ), hb_SToD( "19870512" ), 9086.54 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "John", 20 ), PadR( "Weber", 20 ), hb_SToD( "19750306" ), 2975.45 }, {| X, Y | FieldPut( Y, X ) } ) + dbAppend(); AEval( { PadR( "Sim", 20 ), PadR( "Simsom", 20 ), hb_SToD( "19930705" ), 32975.37 }, {| X, Y | FieldPut( Y, X ) } ) dbGoTop() Browse() diff --git a/harbour/doc/en/datetime.txt b/harbour/doc/en/datetime.txt index 0b6be6bb98..94b40096d6 100644 --- a/harbour/doc/en/datetime.txt +++ b/harbour/doc/en/datetime.txt @@ -565,7 +565,7 @@ a zero value. $EXAMPLES$ ? Year( Date() ) - ? Year( SToD( "32510125" ) ) + ? Year( hb_SToD( "32510125" ) ) $STATUS$ R $COMPLIANCE$ diff --git a/harbour/doc/en/math.txt b/harbour/doc/en/math.txt index 39efe352df..0ece6d2a40 100644 --- a/harbour/doc/en/math.txt +++ b/harbour/doc/en/math.txt @@ -201,7 +201,7 @@ well. It will be the later of the two dates passed to it. $EXAMPLES$ ? Max( 214514214, 6251242142 ) - ? Max( SToD( "20001111" ), SToD( "20140621" ) ) + ? Max( hb_SToD( "20001111" ), hb_SToD( "20140621" ) ) $STATUS$ R $COMPLIANCE$ @@ -240,7 +240,7 @@ smaller number is returned. If dates, the earlier date is returned. $EXAMPLES$ ? Min( 214514214, 6251242142 ) - ? Min( SToD( "20001111" ), SToD( "20140621" ) ) + ? Min( hb_SToD( "20001111" ), hb_SToD( "20140621" ) ) $STATUS$ R $COMPLIANCE$ diff --git a/harbour/doc/en/string.txt b/harbour/doc/en/string.txt index b23b3c0439..fe24b9f0b2 100644 --- a/harbour/doc/en/string.txt +++ b/harbour/doc/en/string.txt @@ -694,7 +694,7 @@ ? hb_ValToStr( 4 ) == " 4" ? hb_ValToStr( 4.0 / 2 ) == " 2.00" ? hb_ValToStr( "String" ) == "String" - ? hb_ValToStr( SToD( "20010101" ) ) == "01/01/01" + ? hb_ValToStr( hb_SToD( "20010101" ) ) == "01/01/01" ? hb_ValToStr( NIL ) == "NIL" ? hb_ValToStr( .F. ) == ".F." ? hb_ValToStr( .T. ) == ".T." diff --git a/harbour/doc/hdr_tpl.txt b/harbour/doc/hdr_tpl.txt index e2a466c491..c6c2c6e678 100644 --- a/harbour/doc/hdr_tpl.txt +++ b/harbour/doc/hdr_tpl.txt @@ -139,11 +139,11 @@ HEADER EXAMPLES ENDIF $TESTS$ ValType( IsLeapYr( Date() ) ) == "L" - ValType( IsLeapYr( SToD() ) ) == "L" + ValType( IsLeapYr( hb_SToD() ) ) == "L" ValType( IsLeapYr() ) == "L" - IsLeapYr( SToD( "20000101" ) ) - !IsLeapYr( SToD( "19000101" ) ) - IsLeapYr( SToD( "19841231" ) ) + IsLeapYr( hb_SToD( "20000101" ) ) + ! IsLeapYr( hb_SToD( "19000101" ) ) + IsLeapYr( hb_SToD( "19841231" ) ) !IsLeapYr() $STATUS$ C diff --git a/harbour/extras/gtwvw/tests/ebtest7.prg b/harbour/extras/gtwvw/tests/ebtest7.prg index 512a89923d..2abdf81724 100644 --- a/harbour/extras/gtwvw/tests/ebtest7.prg +++ b/harbour/extras/gtwvw/tests/ebtest7.prg @@ -139,7 +139,7 @@ PROCEDURE GetSession() LOCAL aEBGets := {} LOCAL cName := Space( 30 ) LOCAL cNickName := Space( 10 ) - LOCAL dBirthdate := SToD() + LOCAL dBirthdate := hb_SToD() LOCAL nBudget := 125000 LOCAL cRemark := "Some notes" + hb_eol() + ; "about this person" diff --git a/harbour/extras/gtwvw/tests/wvwtest9.prg b/harbour/extras/gtwvw/tests/wvwtest9.prg index 3fd08d5551..478191541a 100644 --- a/harbour/extras/gtwvw/tests/wvwtest9.prg +++ b/harbour/extras/gtwvw/tests/wvwtest9.prg @@ -431,7 +431,7 @@ PROCEDURE Demo_Get() LOCAL nBottom := 21 LOCAL nRight := 75 LOCAL nColGet := 8 - LOCAL get_1 := SToD() + LOCAL get_1 := hb_SToD() LOCAL get_2 := PadR( "Pritpal Bedi", 35 ) LOCAL get_3 := PadR( "60, New Professor Colony", 35 ) LOCAL get_4 := PadR( "Ludhiana, INDIA", 35 ) diff --git a/harbour/extras/guestbk/inifiles.prg b/harbour/extras/guestbk/inifiles.prg index a31948aa98..ec1f14a7fb 100644 --- a/harbour/extras/guestbk/inifiles.prg +++ b/harbour/extras/guestbk/inifiles.prg @@ -182,7 +182,7 @@ METHOD PROCEDURE WriteNumber( cSection, cIdent, nNumber ) CLASS TIniFile METHOD ReadDate( cSection, cIdent, dDefault ) CLASS TIniFile - RETURN SToD( ::ReadString( cSection, cIdent, DToS( dDefault ) ) ) + RETURN hb_SToD( ::ReadString( cSection, cIdent, DToS( dDefault ) ) ) METHOD PROCEDURE WriteDate( cSection, cIdent, dDate ) CLASS TIniFile diff --git a/harbour/extras/hbvpdf/core.prg b/harbour/extras/hbvpdf/core.prg index a54ba0cdd2..d76cce7087 100644 --- a/harbour/extras/hbvpdf/core.prg +++ b/harbour/extras/hbvpdf/core.prg @@ -2576,7 +2576,7 @@ STATIC FUNCTION File2Array( cFile, nLen, hFile ) ELSEIF cType == "N" aRay[ nDepth ] := Val( cData ) ELSEIF cType == "D" - aRay[ nDepth ] := CToD( Left( cData, 4 ) + "/" + SubStr( cData, 5, 2 ) + "/" + SubStr( cData, 7, 2 ) ) // SToD(cData) + aRay[ nDepth ] := hb_SToD( cData ) ELSEIF cType == "L" aRay[ nDepth ] := ( cData == "T" ) ELSEIF cType == "A" diff --git a/harbour/extras/httpsrv/cgifunc.prg b/harbour/extras/httpsrv/cgifunc.prg index 37ca66e190..f465552158 100644 --- a/harbour/extras/httpsrv/cgifunc.prg +++ b/harbour/extras/httpsrv/cgifunc.prg @@ -691,7 +691,7 @@ FUNCTION uhttpd_CStrToVal( cExp, cType ) CASE "D" IF cExp[ 3 ] >= "0" .AND. cExp[ 3 ] <= "9" .AND. cExp[ 5 ] >= "0" .AND. cExp[ 5 ] <= "9" - RETURN SToD( cExp ) + RETURN hb_SToD( cExp ) ELSE RETURN CToD( cExp ) ENDIF diff --git a/harbour/tests/array16.prg b/harbour/tests/array16.prg index f382e837d9..0d8134e40c 100644 --- a/harbour/tests/array16.prg +++ b/harbour/tests/array16.prg @@ -7,7 +7,7 @@ PROCEDURE Main() LOCAL a := { 100, 200, "Third" } - LOCAL b := Array( 8832 ) // 8832 elements !!! Maximum for 16 Bit !!! + LOCAL b := Array( 8832 ) ? ValType( a ) ? ValType( { "A" } ) diff --git a/harbour/tests/bldtest/bldtest.c b/harbour/tests/bldtest/bldtest.c index 41b4f0d5e4..03d5523edd 100644 --- a/harbour/tests/bldtest/bldtest.c +++ b/harbour/tests/bldtest/bldtest.c @@ -84,7 +84,6 @@ int main( void ) if( ! f ) iRet = 1; printf( "HB_GET_LE_UINT16(%x,%x) = %x -> %s\n", buf[ l ], buf[ l + 1 ], n, - f ? "OK" : "BAD" ); } diff --git a/harbour/tests/byref.prg b/harbour/tests/byref.prg index 6b88969103..e092e4a2a3 100644 --- a/harbour/tests/byref.prg +++ b/harbour/tests/byref.prg @@ -23,25 +23,25 @@ PROCEDURE Main() RETURN -FUNCTION ref1( x ) +PROCEDURE ref1( x ) x++ ? " In ref1 before ref2 =", x Ref2( @x ) ? " In ref1 after ref2 =", x - RETURN NIL + RETURN -FUNCTION ref2( x ) +PROCEDURE ref2( x ) x++ ? " In ref2 before ref3 =", x Ref3( @x ) ? " In ref2 after ref3 =", x - RETURN NIL + RETURN -FUNCTION ref3( x ) +PROCEDURE ref3( x ) STATIC s_a @@ -51,11 +51,11 @@ FUNCTION ref3( x ) Ref4( @s_a ) ? " In ref3 after ref4 =", x - RETURN NIL + RETURN -FUNCTION ref4( a ) +PROCEDURE ref4( a ) a[ 1 ]++ ? " In ref4 =", a[ 1 ] - RETURN NIL + RETURN diff --git a/harbour/tests/dates.prg b/harbour/tests/dates.prg index f6688cfb6f..f2cce05757 100644 --- a/harbour/tests/dates.prg +++ b/harbour/tests/dates.prg @@ -33,7 +33,7 @@ PROCEDURE Main() ? ? dDate, DToS( dDate ) - ? "19990429", SToD( "19990429" ) + ? "19990429", hb_SToD( "19990429" ) ? Set( _SET_EPOCH, 1950 ) diff --git a/harbour/tests/gfx.prg b/harbour/tests/gfx.prg index 8074cd3311..7f8b4fccfc 100644 --- a/harbour/tests/gfx.prg +++ b/harbour/tests/gfx.prg @@ -5,12 +5,11 @@ #include "hbgtinfo.ch" #include "hbgfx.ch" -#define WELCOME "Welcome to the World of Harbour multiplatform Graphics!" - PROCEDURE Main() LOCAL nFontHeight, nFontWidth LOCAL nTop, nLeft, nHeight, nWidth, nColor, nSec := Seconds() + LOCAL cWelcome #if defined( __HBSCRIPT__HBSHELL ) # if defined( __PLATFORM__WINDOWS ) @@ -34,17 +33,19 @@ PROCEDURE Main() nFontHeight := hb_gtInfo( HB_GTI_FONTSIZE ) nFontWidth := hb_gtInfo( HB_GTI_FONTWIDTH ) + cWelcome := "Welcome to the World of Harbour multiplatform Graphics!" + " (" + hb_gtVersion( 0 ) + ")" + SetColor( "n/w" ) @ 0, 0 SAY Space( MaxCol() + 1 ) - @ 1, 0 SAY PadC( WELCOME + " (" + hb_gtVersion( 0 ) + ")", MaxCol() + 1 ) + @ 1, 0 SAY PadC( cWelcome, MaxCol() + 1 ) @ 2, 0 SAY Space( MaxCol() + 1 ) hb_gtInfo( HB_GTI_WINTITLE, "Cross-GT, multiplatform graphics demo" ) PutFrame( nFontHeight / 2, ; - MaxCol() / 2 * nFontWidth - Len( WELCOME ) / 2 * nFontWidth - nFontWidth, ; + MaxCol() / 2 * nFontWidth - Len( cWelcome ) / 2 * nFontWidth - nFontWidth, ; nFontHeight * 2 + nFontHeight / 2, ; - nFontWidth + MaxCol() / 2 * nFontWidth + Len( WELCOME ) / 2 * nFontWidth, ; + nFontWidth + MaxCol() / 2 * nFontWidth + Len( cWelcome ) / 2 * nFontWidth, ; hb_gfxMakeColor( 0, 0, 0 ), hb_gfxMakeColor( 255, 255, 255 ) ) DO WHILE Inkey() == 0 @@ -98,11 +99,9 @@ PROCEDURE Main() FUNCTION PutFrame( nTop, nLeft, nBottom, nRight, nColor1, nColor2 ) - hb_gfxRect( ntop, nLeft, nBottom, nRight, nColor1 ) - hb_gfxRect( ntop + 1, nLeft + 1, nBottom - 1, nRight - 1, nColor2 ) -#if 0 + hb_gfxRect( nTop, nLeft, nBottom, nRight, nColor1 ) + hb_gfxRect( nTop + 1, nLeft + 1, nBottom - 1, nRight - 1, nColor2 ) hb_gfxLine( nTop + 1, nLeft + 1, nTop + 1, nRight - 1, nColor2 ) hb_gfxLine( nTop + 2, nLeft + 1, nBottom - 1, nLeft + 1, nColor2 ) -#endif RETURN NIL diff --git a/harbour/tests/inifiles.prg b/harbour/tests/inifiles.prg index 2e9542fa93..8bdbb0f0b0 100644 --- a/harbour/tests/inifiles.prg +++ b/harbour/tests/inifiles.prg @@ -211,7 +211,7 @@ METHOD PROCEDURE WriteNumber( cSection, cIdent, nNumber ) CLASS TIniFile METHOD ReadDate( cSection, cIdent, dDefault ) CLASS TIniFile - RETURN SToD( ::ReadString( cSection, cIdent, DToS( dDefault ) ) ) + RETURN hb_SToD( ::ReadString( cSection, cIdent, DToS( dDefault ) ) ) METHOD PROCEDURE WriteDate( cSection, cIdent, dDate ) CLASS TIniFile diff --git a/harbour/tests/initexit.prg b/harbour/tests/initexit.prg index 76599b2125..2b90fc0e6c 100644 --- a/harbour/tests/initexit.prg +++ b/harbour/tests/initexit.prg @@ -22,6 +22,7 @@ PROCEDURE Main() RETURN INIT FUNCTION SecondOne() + STATIC s_static_var := "SECOND()" ? "Hello from:", s_static_var @@ -31,6 +32,7 @@ INIT FUNCTION SecondOne() RETURN NIL INIT FUNCTION Third() + STATIC s_static_var := "THIRD()" ? "Hello from:", s_static_var @@ -40,6 +42,7 @@ INIT FUNCTION Third() RETURN NIL EXIT FUNCTION Fifth() + STATIC s_static_var := "FIFTH()" ? "Hello from:", s_static_var @@ -49,6 +52,7 @@ EXIT FUNCTION Fifth() RETURN NIL EXIT FUNCTION Sixth() + STATIC s_static_var := "SIXTH()" ? "Hello from:", s_static_var diff --git a/harbour/tests/longdev.prg b/harbour/tests/longdev.prg index 92a6a4da5f..d5ed29e706 100644 --- a/harbour/tests/longdev.prg +++ b/harbour/tests/longdev.prg @@ -3,10 +3,11 @@ */ // Testing Harbour long string handling with device output. + /* Harbour Project source code http://harbour-project.org/ - Donated to the public domain on 2001-03-08 by David G. Holm -*/ + Donated to the public domain on 2001-03-08 by David G. Holm + */ PROCEDURE Main() diff --git a/harbour/tests/parseini.ini b/harbour/tests/parseini.ini index 337211f519..f5b6cc18d9 100644 --- a/harbour/tests/parseini.ini +++ b/harbour/tests/parseini.ini @@ -4,7 +4,7 @@ ; Demo INI file ; -; Copyright 2003 Giancarlo Niccolai (gian@niccolai.ws) +; Copyright 2003 Giancarlo Niccolai (gian niccolai ws) ; (showing another style of comment here ) # This is the MAIN section @@ -23,7 +23,7 @@ Long= A Data || Spreading || On varius lines || here. - + [Printers] LPT1 = \\HEAD\Lexmark diff --git a/harbour/tests/parseini.prg b/harbour/tests/parseini.prg index 24abb05572..b204cfbad4 100644 --- a/harbour/tests/parseini.prg +++ b/harbour/tests/parseini.prg @@ -15,7 +15,7 @@ PROCEDURE Main( cName ) LOCAL cKey LOCAL nRow := 1 - SET COLOR TO w +/ b + SET COLOR TO w+/b CLS @ nRow++, 20 SAY "H A R B O U R - .ini file parser test" @ nRow++, 5 SAY "Call from command line using a .ini filename as the only parameter" diff --git a/harbour/tests/usrrdd/exarr.prg b/harbour/tests/usrrdd/exarr.prg index ae206589c9..6703152ede 100644 --- a/harbour/tests/usrrdd/exarr.prg +++ b/harbour/tests/usrrdd/exarr.prg @@ -100,7 +100,7 @@ PROCEDURE Main() dbAppend() field->name := "Giudice Francesco Saverio" field->address := "Main Street 10" - field->birthday := SToD( "19670103" ) + field->birthday := hb_SToD( "19670103" ) field->age := 39 ? RecNo(), '"' + FIELD->NAME + '"' @@ -108,7 +108,7 @@ PROCEDURE Main() dbAppend() field->name := "Mouse Mickey" field->address := "Main Street 20" - field->birthday := SToD( "19400101" ) + field->birthday := hb_SToD( "19400101" ) field->age := 66 WHILE ! Eof() diff --git a/harbour/website/samples/byref.prg.html b/harbour/website/samples/byref.prg.html index e48b21c9c5..473477eea4 100644 --- a/harbour/website/samples/byref.prg.html +++ b/harbour/website/samples/byref.prg.html @@ -35,25 +35,25 @@ PROCEDURE Main() RETURN -FUNCTION ref1( x ) +PROCEDURE ref1( x ) x++ ? " In ref1 before ref2 =", x Ref2( @x ) ? " In ref1 after ref2 =", x - RETURN NIL + RETURN -FUNCTION ref2( x ) +PROCEDURE ref2( x ) x++ ? " In ref2 before ref3 =", x Ref3( @x ) ? " In ref2 after ref3 =", x - RETURN NIL + RETURN -FUNCTION ref3( x ) +PROCEDURE ref3( x ) STATIC s_a @@ -63,14 +63,14 @@ FUNCTION ref3( x ) Ref4( @s_a ) ? " In ref3 after ref4 =", x - RETURN NIL + RETURN -FUNCTION ref4( a ) +PROCEDURE ref4( a ) a[ 1 ]++ ? " In ref4 =", a[ 1 ] - RETURN NIL + RETURN ]]> diff --git a/harbour/website/samples/initexit.prg.html b/harbour/website/samples/initexit.prg.html index b356348ac2..7983c25248 100644 --- a/harbour/website/samples/initexit.prg.html +++ b/harbour/website/samples/initexit.prg.html @@ -34,6 +34,7 @@ PROCEDURE Main() RETURN INIT FUNCTION SecondOne() + STATIC s_static_var := "SECOND()" ? "Hello from:", s_static_var @@ -43,6 +44,7 @@ INIT FUNCTION SecondOne() RETURN NIL INIT FUNCTION Third() + STATIC s_static_var := "THIRD()" ? "Hello from:", s_static_var @@ -52,6 +54,7 @@ INIT FUNCTION Third() RETURN NIL EXIT FUNCTION Fifth() + STATIC s_static_var := "FIFTH()" ? "Hello from:", s_static_var @@ -61,6 +64,7 @@ EXIT FUNCTION Fifth() RETURN NIL EXIT FUNCTION Sixth() + STATIC s_static_var := "SIXTH()" ? "Hello from:", s_static_var diff --git a/harbour/website/samples/longdev.prg.html b/harbour/website/samples/longdev.prg.html index 23cf8d2539..ad30dd137d 100644 --- a/harbour/website/samples/longdev.prg.html +++ b/harbour/website/samples/longdev.prg.html @@ -15,10 +15,11 @@