From a2385b1c55c07540fe4279bcb4aea7b698bf15bf Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 19 Oct 2008 07:02:22 +0000 Subject: [PATCH] 2008-10-19 09:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch * include/assert.ch * common.mak * source/rtl/Makefile - source/rtl/strtrim.c + source/rtl/hbntos.c * contrib/xhb/hbcompat.ch * source/debug/dbgthsh.prg * source/debug/tbrwtext.prg * source/debug/dbgwa.prg * source/debug/debugger.prg * source/debug/dbgtarr.prg * source/rtl/errorsys.prg * source/rtl/valtoexp.prg * source/rtl/getsys.prg * source/rtl/tgetlist.prg * source/rtl/browse.prg * source/rtl/alert.prg * source/rtl/tclass.prg * source/rtl/tsymbol.prg * source/rtl/tscalar.prg * source/rtl/tpersist.prg * utils/hbmake/hbmake.prg * utils/hbrun/hbrun.prg * Renamed hb_N2S() to hb_NToS() which feels more natural in Clipper. --- harbour/ChangeLog | 28 ++++++++++++++++++++++ harbour/common.mak | 2 +- harbour/contrib/xhb/hbcompat.ch | 2 +- harbour/include/assert.ch | 2 +- harbour/include/hbextern.ch | 2 +- harbour/source/debug/dbgtarr.prg | 8 +++---- harbour/source/debug/dbgthsh.prg | 6 ++--- harbour/source/debug/dbgwa.prg | 16 ++++++------- harbour/source/debug/debugger.prg | 24 +++++++++---------- harbour/source/debug/tbrwtext.prg | 2 +- harbour/source/rtl/Makefile | 2 +- harbour/source/rtl/alert.prg | 2 +- harbour/source/rtl/browse.prg | 4 ++-- harbour/source/rtl/errorsys.prg | 6 ++--- harbour/source/rtl/getsys.prg | 2 +- harbour/source/rtl/{strtrim.c => hbntos.c} | 4 ++-- harbour/source/rtl/tclass.prg | 4 ++-- harbour/source/rtl/tgetlist.prg | 2 +- harbour/source/rtl/tpersist.prg | 10 ++++---- harbour/source/rtl/tscalar.prg | 4 ++-- harbour/source/rtl/tsymbol.prg | 2 +- harbour/source/rtl/valtoexp.prg | 6 ++--- harbour/utils/hbmake/hbmake.prg | 8 +++---- harbour/utils/hbrun/hbrun.prg | 4 ++-- 24 files changed, 90 insertions(+), 62 deletions(-) rename harbour/source/rtl/{strtrim.c => hbntos.c} (98%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b0ab38928a..4e41a8f6ab 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,34 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-19 09:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/hbextern.ch + * include/assert.ch + * common.mak + * source/rtl/Makefile + - source/rtl/strtrim.c + + source/rtl/hbntos.c + * contrib/xhb/hbcompat.ch + * source/debug/dbgthsh.prg + * source/debug/tbrwtext.prg + * source/debug/dbgwa.prg + * source/debug/debugger.prg + * source/debug/dbgtarr.prg + * source/rtl/errorsys.prg + * source/rtl/valtoexp.prg + * source/rtl/getsys.prg + * source/rtl/tgetlist.prg + * source/rtl/browse.prg + * source/rtl/alert.prg + * source/rtl/tclass.prg + * source/rtl/tsymbol.prg + * source/rtl/tscalar.prg + * source/rtl/tpersist.prg + * utils/hbmake/hbmake.prg + * utils/hbrun/hbrun.prg + * Renamed hb_N2S() to hb_NToS() which feels more + natural in Clipper. + 2008-10-19 00:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/assert.ch * contrib/xhb/hbcompat.ch diff --git a/harbour/common.mak b/harbour/common.mak index 3b5366c54a..830c09efa7 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -517,6 +517,7 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\hbcrc$(OBJEXT) \ $(OBJ_DIR)\hbhex$(OBJEXT) \ $(OBJ_DIR)\hbmd5$(OBJEXT) \ + $(OBJ_DIR)\hbntos$(OBJEXT) \ $(OBJ_DIR)\hbffind$(OBJEXT) \ $(OBJ_DIR)\hbfile$(OBJEXT) \ $(OBJ_DIR)\hbgtcore$(OBJEXT) \ @@ -588,7 +589,6 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\strcase$(OBJEXT) \ $(OBJ_DIR)\strmatch$(OBJEXT) \ $(OBJ_DIR)\strtran$(OBJEXT) \ - $(OBJ_DIR)\strtrim$(OBJEXT) \ $(OBJ_DIR)\strzero$(OBJEXT) \ $(OBJ_DIR)\stuff$(OBJEXT) \ $(OBJ_DIR)\substr$(OBJEXT) \ diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index d7ef7e0702..43947a545d 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -192,7 +192,7 @@ #xtranslate hb_ReadIni([]) => hb_IniRead() #xtranslate hb_WriteIni([]) => hb_IniWrite() - #xtranslate Str(,[],[],)=> iif(, hb_n2s(), Str()) + #xtranslate Str(,[],[],)=> iif(, hb_NToS(), Str()) #xtranslate hb_CMDARGARGV([])=> hb_ARGV(0) /* Hash item functions */ diff --git a/harbour/include/assert.ch b/harbour/include/assert.ch index 6bd86527c8..c04a095c26 100644 --- a/harbour/include/assert.ch +++ b/harbour/include/assert.ch @@ -65,7 +65,7 @@ IF !( ) ; ; OutStd( ; hb_OSNewLine() + ProcName( 0 ) + ; - "(" + hb_N2S( ProcLine() ) + ")" + ; + "(" + hb_NToS( ProcLine() ) + ")" + ; " Assertion failed: " + ; iif( <.msg.>, , <"exp"> ) ; ) ; diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index b2246be3a6..65e23318b3 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -1118,7 +1118,7 @@ EXTERNAL HB_TOKENPTR EXTERNAL HB_ATOKENS EXTERNAL HB_STRSHRINK EXTERNAL HB_MEMOWRIT -EXTERNAL HB_N2S +EXTERNAL HB_NTOS EXTERNAL HB_HASH EXTERNAL HB_HHASKEY diff --git a/harbour/source/debug/dbgtarr.prg b/harbour/source/debug/dbgtarr.prg index 606637d63c..8b4fff3dfc 100644 --- a/harbour/source/debug/dbgtarr.prg +++ b/harbour/source/debug/dbgtarr.prg @@ -225,9 +225,9 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, aArray ) CLASS HBDbArray IF ::lEditable oBrwSets:RefreshCurrent() IF ISOBJECT( aArray[ nSet ] ) - __DbgObject( aArray[ nSet ], cName + "[" + hb_N2S( nSet ) + "]" ) + __DbgObject( aArray[ nSet ], cName + "[" + hb_NToS( nSet ) + "]" ) ELSEIF hb_isHash( aArray[ nSet ] ) - __DbgHashes( aArray[ nSet ], cName + "[" + hb_N2S( nSet ) + "]" ) + __DbgHashes( aArray[ nSet ], cName + "[" + hb_NToS( nSet ) + "]" ) ELSE ::doGet( oBrwsets, aArray, nSet ) ENDIF @@ -242,8 +242,8 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, aArray ) CLASS HBDbArray RefreshVarsS( oBrwSets ) - ::aWindows[ ::nCurWindow ]:SetCaption( cName + "[" + hb_N2S( oBrwSets:cargo[ 1 ] ) + ".." + ; - hb_N2S( Len( aArray ) ) + "]" ) + ::aWindows[ ::nCurWindow ]:SetCaption( cName + "[" + hb_NToS( oBrwSets:cargo[ 1 ] ) + ".." + ; + hb_NToS( Len( aArray ) ) + "]" ) RETURN self diff --git a/harbour/source/debug/dbgthsh.prg b/harbour/source/debug/dbgthsh.prg index e082365665..42a105d78e 100644 --- a/harbour/source/debug/dbgthsh.prg +++ b/harbour/source/debug/dbgthsh.prg @@ -253,8 +253,8 @@ METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash ) CLASS HBDbHash RefreshVarsS( oBrwSets ) - ::aWindows[ ::nCurwindow ]:SetCaption( cName + "[" + hb_N2S( oBrwSets:cargo[ 1 ] ) + ".." + ; - hb_N2S( Len( hHash ) ) + "]" ) + ::aWindows[ ::nCurwindow ]:SetCaption( cName + "[" + hb_NToS( oBrwSets:cargo[ 1 ] ) + ".." + ; + hb_NToS( Len( hHash ) ) + "]" ) RETURN self @@ -296,7 +296,7 @@ STATIC FUNCTION HashKeyString( hHash, nAt ) DO CASE CASE cType == "C" ; RETURN '"' + xVal + '"' CASE cType == "D" ; RETURN '"' + DToC( xVal ) + '"' - CASE cType == "N" ; RETURN hb_N2S( xVal ) + CASE cType == "N" ; RETURN hb_NToS( xVal ) ENDCASE RETURN AllTrim( __dbgCStr( xVal ) ) diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg index b95e871c78..f66cba2af5 100644 --- a/harbour/source/debug/dbgwa.prg +++ b/harbour/source/debug/dbgwa.prg @@ -308,16 +308,16 @@ STATIC FUNCTION DbfInfo( aInfo ) aInfo := {} - AAdd( aInfo, "[" + hb_N2S( Select( Alias() ) ) + "] " + Alias() ) + AAdd( aInfo, "[" + hb_NToS( Select( Alias() ) ) + "] " + Alias() ) AAdd( aInfo, Space( 4 ) + "Current Driver" ) AAdd( aInfo, Space( 8 ) + rddName() ) AAdd( aInfo, Space( 4 ) + "Workarea Information" ) - AAdd( aInfo, Space( 8 ) + "Select Area: " + hb_N2S( Select() ) ) - AAdd( aInfo, Space( 8 ) + "Record Size: " + hb_N2S( Recsize() ) ) - AAdd( aInfo, Space( 8 ) + "Header Size: " + hb_N2S( Header() ) ) - AAdd( aInfo, Space( 8 ) + "Field Count: " + hb_N2S( FCount() ) ) + AAdd( aInfo, Space( 8 ) + "Select Area: " + hb_NToS( Select() ) ) + AAdd( aInfo, Space( 8 ) + "Record Size: " + hb_NToS( Recsize() ) ) + AAdd( aInfo, Space( 8 ) + "Header Size: " + hb_NToS( Header() ) ) + AAdd( aInfo, Space( 8 ) + "Field Count: " + hb_NToS( FCount() ) ) AAdd( aInfo, Space( 8 ) + "Last Update: " + DToC( lUpdate() ) ) - AAdd( aInfo, Space( 8 ) + "Index order: " + hb_N2S( IndexOrd() ) ) + AAdd( aInfo, Space( 8 ) + "Index order: " + hb_NToS( IndexOrd() ) ) AAdd( aInfo, Space( 4 ) + "Current Record" ) FOR nFor := 1 TO FCount() @@ -327,7 +327,7 @@ STATIC FUNCTION DbfInfo( aInfo ) DO CASE CASE xType $ "CM" ; cValue := xValue - CASE xType == "N" ; cValue := hb_N2S( xValue ) + CASE xType == "N" ; cValue := hb_NToS( xValue ) CASE xType == "D" ; cValue := DToC( xValue ) CASE xType == "L" ; cValue := iif( xValue, ".T.", ".F." ) CASE xType == "A" ; cValue := "Array" @@ -354,7 +354,7 @@ STATIC PROCEDURE UpdateInfo( oDlg, cAlias ) hb_dispOutAt( oDlg:nTop + 1, oDlg:nLeft + 20, PadR( cAlias, 11 ), oDlg:cColor ) hb_dispOutAt( oDlg:nTop + 1, oDlg:nLeft + 42,; - PadR( hb_N2S( RecNo() ) + "/" + hb_N2S( LastRec() ), 9 ),; + PadR( hb_NToS( RecNo() ) + "/" + hb_NToS( LastRec() ), 9 ),; oDlg:cColor ) hb_dispOutAt( oDlg:nTop + 2, oDlg:nLeft + 21, iif( Bof(), "Yes", "No " ), oDlg:cColor ) diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg index bc28ecc8ca..94921d54e6 100644 --- a/harbour/source/debug/debugger.prg +++ b/harbour/source/debug/debugger.prg @@ -1658,7 +1658,7 @@ METHOD LoadCallStack() CLASS HBDebugger // a procedure with debug info ::aProcStack[ i - nDebugLevel + 1 ] := ::aCallStack[ nPos ] ELSE - ::aProcStack[ i - nDebugLevel + 1 ] := { , ProcName( i ) + "(" + hb_N2S( ProcLine( i ) ) + ")", , nLevel, , } + ::aProcStack[ i - nDebugLevel + 1 ] := { , ProcName( i ) + "(" + hb_NToS( ProcLine( i ) ) + ")", , nLevel, , } ENDIF NEXT @@ -2297,11 +2297,11 @@ METHOD SaveSettings() CLASS HBDebugger ENDIF IF ::nSpeed != 0 - cInfo += "Run Speed " + hb_N2S( ::nSpeed ) + hb_OSNewLine() + cInfo += "Run Speed " + hb_NToS( ::nSpeed ) + hb_OSNewLine() ENDIF IF ::nTabWidth != 4 - cInfo += "Options Tab " + hb_N2S( ::nTabWidth ) + hb_OSNewLine() + cInfo += "Options Tab " + hb_NToS( ::nTabWidth ) + hb_OSNewLine() ENDIF IF ::lShowStatics @@ -2338,7 +2338,7 @@ METHOD SaveSettings() CLASS HBDebugger IF ! Empty( ::aBreakPoints ) FOR n := 1 TO Len( ::aBreakPoints ) - cInfo += "BP " + hb_N2S( ::aBreakPoints[ n ][ 1 ] ) + " " + ; + cInfo += "BP " + hb_NToS( ::aBreakPoints[ n ][ 1 ] ) + " " + ; AllTrim( ::aBreakPoints[ n ][ 2 ] ) + hb_OSNewLine() NEXT ENDIF @@ -2346,10 +2346,10 @@ METHOD SaveSettings() CLASS HBDebugger /* This part of the script must be executed after all windows are created */ FOR n := 1 TO Len( ::aWindows ) oWnd := ::aWindows[ n ] - cInfo += "Window Size " + hb_N2S( oWnd:nBottom - oWnd:nTop + 1 ) + " " - cInfo += hb_N2S( oWnd:nRight - oWnd:nLeft + 1 ) + hb_OSNewLine() - cInfo += "Window Move " + hb_N2S( oWnd:nTop ) + " " - cInfo += hb_N2S( oWnd:nLeft ) + hb_OSNewLine() + cInfo += "Window Size " + hb_NToS( oWnd:nBottom - oWnd:nTop + 1 ) + " " + cInfo += hb_NToS( oWnd:nRight - oWnd:nLeft + 1 ) + hb_OSNewLine() + cInfo += "Window Move " + hb_NToS( oWnd:nTop ) + " " + cInfo += hb_NToS( oWnd:nLeft ) + hb_OSNewLine() cInfo += "Window Next" + hb_OSNewLine() NEXT @@ -2632,7 +2632,7 @@ METHOD ShowVars() CLASS HBDebugger nWidth := ::oWndVars:nWidth() - 1 oCol := HBDbColumnNew( "", ; - { || PadR( hb_N2S( ::oBrwVars:Cargo[ 1 ] - 1 ) + ") " + ; + { || PadR( hb_NToS( ::oBrwVars:Cargo[ 1 ] - 1 ) + ") " + ; ::VarGetInfo( ::aVars[ Max( ::oBrwVars:Cargo[ 1 ], 1 ) ] ), ; ::oWndVars:nWidth() - 2 ) } ) ::oBrwVars:AddColumn( oCol ) @@ -3098,7 +3098,7 @@ METHOD WatchpointsShow() CLASS HBDebugger nWidth := ::oWndPnt:nWidth() - 1 oCol := HBDbColumnNew( "", ; { || PadR( iif( Len( ::aWatch ) > 0, ; - hb_N2S( ::oBrwPnt:Cargo[ 1 ] - 1 ) + ") " + ; + hb_NToS( ::oBrwPnt:Cargo[ 1 ] - 1 ) + ") " + ; ::WatchGetInfo( Max( ::oBrwPnt:Cargo[ 1 ], 1 ) ), ; " " ), ; ::oWndPnt:nWidth() - 2 ) } ) @@ -3425,9 +3425,9 @@ FUNCTION __dbgCStr( xVal ) CASE "O" RETURN "{ " + xVal:className + " Object }" CASE "A" - RETURN "{ Array of " + hb_N2S( Len( xVal ) ) + " Items }" + RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }" CASE "H" - RETURN "{ Hash of " + hb_N2S( Len( xVal ) ) + " Items }" + RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }" CASE "P" RETURN "" OTHERWISE diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg index bc55dbf621..2220e35951 100644 --- a/harbour/source/debug/tbrwtext.prg +++ b/harbour/source/debug/tbrwtext.prg @@ -170,7 +170,7 @@ METHOD SetActiveLine( n ) CLASS HBBrwText METHOD GetLine() CLASS HBBrwText - RETURN PadR( hb_N2S( ::nRow ) + ": " + SubStr( ; + RETURN PadR( hb_NToS( ::nRow ) + ": " + SubStr( ; MemoLine( ::aRows[ ::nRow ], ::nWidth + ::nLineOffset, 1, ::nTabWidth, .f. ),; ::nLineOffset ), ::nWidth ) diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index f8d567a3b3..276c6654dd 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -59,6 +59,7 @@ C_SOURCES=\ hbcrc.c \ hbhex.c \ hbmd5.c \ + hbntos.c \ hbffind.c \ hbfile.c \ hbgtcore.c \ @@ -130,7 +131,6 @@ C_SOURCES=\ strmatch.c \ strpeek.c \ strtran.c \ - strtrim.c \ strzero.c \ stuff.c \ substr.c \ diff --git a/harbour/source/rtl/alert.prg b/harbour/source/rtl/alert.prg index 89d6ad73dd..856c66973e 100644 --- a/harbour/source/rtl/alert.prg +++ b/harbour/source/rtl/alert.prg @@ -87,7 +87,7 @@ FUNCTION Alert( xMessage, aOptions, cColorNorm, nDelay ) DO CASE CASE ValType( xMessage ) $ "CM" ; cMessage := StrTran( xMessage, ";", Chr( 10 ) ) - CASE hb_isNumeric( xMessage ) ; cMessage := hb_N2S( xMessage ) + CASE hb_isNumeric( xMessage ) ; cMessage := hb_NToS( xMessage ) CASE hb_isDate( xMessage ) ; cMessage := DToC( xMessage ) CASE hb_isLogical( xMessage ) ; cMessage := iif( xMessage, ".T.", ".F." ) CASE hb_isObject( xMessage ) ; cMessage := xMessage:className + " Object" diff --git a/harbour/source/rtl/browse.prg b/harbour/source/rtl/browse.prg index e93b6b9bdc..b8dae62a1f 100644 --- a/harbour/source/rtl/browse.prg +++ b/harbour/source/rtl/browse.prg @@ -302,8 +302,8 @@ STATIC PROCEDURE StatLine( oBrw, lAppend ) hb_dispOutAt( nTop, nRight - 20, " " ) ELSE hb_dispOutAt( nTop, nRight - 40, iif( Deleted(), "", " " ) ) - hb_dispOutAt( nTop, nRight - 20, PadR( hb_N2S( RecNo() ) + "/" + ; - hb_N2S( LastRec() ), 16 ) + ; + hb_dispOutAt( nTop, nRight - 20, PadR( hb_NToS( RecNo() ) + "/" + ; + hb_NToS( LastRec() ), 16 ) + ; iif( oBrw:HitTop(), "", " " ) ) ENDIF diff --git a/harbour/source/rtl/errorsys.prg b/harbour/source/rtl/errorsys.prg index c9dbf0c69e..ba0ec20364 100644 --- a/harbour/source/rtl/errorsys.prg +++ b/harbour/source/rtl/errorsys.prg @@ -98,7 +98,7 @@ STATIC FUNCTION DefError( oError ) cMessage := ErrorMessage( oError ) IF ! Empty( oError:osCode ) - cDOSError := "(DOS Error " + hb_N2S( oError:osCode ) + ")" + cDOSError := "(DOS Error " + hb_NToS( oError:osCode ) + ")" ENDIF // Build buttons @@ -153,7 +153,7 @@ STATIC FUNCTION DefError( oError ) OutErr( hb_OSNewLine() ) OutErr( "Called from " + ProcName( n ) + ; - "(" + hb_N2S( ProcLine( n ) ) + ") " ) + "(" + hb_NToS( ProcLine( n ) ) + ") " ) ENDDO @@ -176,7 +176,7 @@ STATIC FUNCTION ErrorMessage( oError ) // add subsystem's error code if available IF ISNUMBER( oError:subCode ) - cMessage += "/" + hb_N2S( oError:subCode ) + cMessage += "/" + hb_NToS( oError:subCode ) ELSE cMessage += "/???" ENDIF diff --git a/harbour/source/rtl/getsys.prg b/harbour/source/rtl/getsys.prg index f7fabf611c..c0ef10031e 100644 --- a/harbour/source/rtl/getsys.prg +++ b/harbour/source/rtl/getsys.prg @@ -319,7 +319,7 @@ FUNCTION hb_GetReadVar( oGet ) IF oGet:subScript != NIL FOR n := 1 TO Len( oGet:subScript ) - cName += "[" + hb_N2S( oGet:subScript[ n ] ) + "]" + cName += "[" + hb_NToS( oGet:subScript[ n ] ) + "]" NEXT ENDIF diff --git a/harbour/source/rtl/strtrim.c b/harbour/source/rtl/hbntos.c similarity index 98% rename from harbour/source/rtl/strtrim.c rename to harbour/source/rtl/hbntos.c index 12a48a7342..89d1f2e815 100644 --- a/harbour/source/rtl/strtrim.c +++ b/harbour/source/rtl/hbntos.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * HB_N2S() function + * HB_NTOS() function * * Copyright 2008 Viktor Szakats * www - http://www.harbour-project.org @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapiitm.h" -HB_FUNC( HB_N2S ) +HB_FUNC( HB_NTOS ) { PHB_ITEM pNumber = hb_param( 1, HB_IT_NUMERIC ); diff --git a/harbour/source/rtl/tclass.prg b/harbour/source/rtl/tclass.prg index 48ddfe1dd5..7151870dc2 100644 --- a/harbour/source/rtl/tclass.prg +++ b/harbour/source/rtl/tclass.prg @@ -175,7 +175,7 @@ STATIC FUNCTION New( cClassName, xSuper, sClassFunc, lModuleFriendly ) IF Empty( xSuper ) ::asSuper := {} ELSEIF ISCHARACTER( xSuper ) - ::asSuper := { __DynsN2Sym( xSuper ) } + ::asSuper := { __DynsNToSym( xSuper ) } ELSEIF hb_isSymbol( xSuper ) ::asSuper := { xSuper } ELSEIF ISARRAY( xSuper ) @@ -184,7 +184,7 @@ STATIC FUNCTION New( cClassName, xSuper, sClassFunc, lModuleFriendly ) FOR i := 1 TO nSuper IF !Empty( xSuper[ i ] ) IF ISCHARACTER( xSuper[ i ] ) - AAdd( ::asSuper, __DynsN2Sym( xSuper[ i ] ) ) + AAdd( ::asSuper, __DynsNToSym( xSuper[ i ] ) ) ELSEIF hb_isSymbol( xSuper[ i ] ) AAdd( ::asSuper, xSuper[ i ] ) ENDIF diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg index 9d62dbdf19..8f471d6deb 100644 --- a/harbour/source/rtl/tgetlist.prg +++ b/harbour/source/rtl/tgetlist.prg @@ -754,7 +754,7 @@ METHOD GetReadVar() CLASS HBGetList IF oGet:Subscript != NIL FOR n := 1 TO Len( oGet:Subscript ) - cName += "[" + hb_N2S( oGet:Subscript[ n ] ) + "]" + cName += "[" + hb_NToS( oGet:Subscript[ n ] ) + "]" NEXT ENDIF diff --git a/harbour/source/rtl/tpersist.prg b/harbour/source/rtl/tpersist.prg index a3a8234f27..26cef2a6d5 100644 --- a/harbour/source/rtl/tpersist.prg +++ b/harbour/source/rtl/tpersist.prg @@ -177,7 +177,7 @@ METHOD SaveToText( cObjectName, nIndent ) CLASS HBPersistent STATIC FUNCTION ArrayToText( aArray, cName, nIndent ) LOCAL cArray := hb_OSNewLine() + Space( nIndent ) + "ARRAY ::" + cName + ; - " LEN " + hb_N2S( Len( aArray ) ) + hb_OSNewLine() + " LEN " + hb_NToS( Len( aArray ) ) + hb_OSNewLine() LOCAL n LOCAL uValue LOCAL cType @@ -190,12 +190,12 @@ STATIC FUNCTION ArrayToText( aArray, cName, nIndent ) CASE cType == "A" nIndent += 3 cArray += ArrayToText( uValue, cName + "[ " + ; - hb_N2S( n ) + " ]", nIndent ) + hb_OSNewLine() + hb_NToS( n ) + " ]", nIndent ) + hb_OSNewLine() nIndent -= 3 CASE cType == "O" IF __objDerivedFrom( uValue, "HBPERSISTENT" ) - cArray += uValue:SaveToText( cName + "[ " + hb_N2S( n ) + ; + cArray += uValue:SaveToText( cName + "[ " + hb_NToS( n ) + ; " ]", nIndent ) ENDIF @@ -204,7 +204,7 @@ STATIC FUNCTION ArrayToText( aArray, cName, nIndent ) cArray += hb_OSNewLine() ENDIF cArray += Space( nIndent ) + " ::" + cName + ; - + "[ " + hb_N2S( n ) + " ]" + " = " + ; + + "[ " + hb_NToS( n ) + " ]" + " = " + ; ValToText( uValue ) + hb_OSNewLine() ENDCASE NEXT @@ -223,7 +223,7 @@ STATIC FUNCTION ValToText( uValue ) cText := hb_StrToExp( uValue ) CASE cType == "N" - cText := hb_N2S( uValue ) + cText := hb_NToS( uValue ) CASE cType == "D" cText := DToS( uValue ) diff --git a/harbour/source/rtl/tscalar.prg b/harbour/source/rtl/tscalar.prg index 1a9f4b5a22..cbe05c7a69 100644 --- a/harbour/source/rtl/tscalar.prg +++ b/harbour/source/rtl/tscalar.prg @@ -84,7 +84,7 @@ METHOD AsString() CLASS ScalarObject CASE "D" ; RETURN DToC( Self ) CASE "H" ; RETURN "{ ... => ... }" CASE "L" ; RETURN iif( Self, ".T.", ".F." ) - CASE "N" ; RETURN hb_N2S( Self ) + CASE "N" ; RETURN hb_NToS( Self ) CASE "S" ; RETURN "@" + Self:name + "()" CASE "P" ; RETURN "<0x...>" CASE "U" ; RETURN "NIL" @@ -324,7 +324,7 @@ CREATE CLASS Numeric INHERIT HBScalar FUNCTION __HBNumeric ENDCLASS METHOD AsString() CLASS Numeric - RETURN hb_N2S( Self ) + RETURN hb_NToS( Self ) /* -------------------------------------------- */ diff --git a/harbour/source/rtl/tsymbol.prg b/harbour/source/rtl/tsymbol.prg index f0bdd72fda..cf157bc45f 100644 --- a/harbour/source/rtl/tsymbol.prg +++ b/harbour/source/rtl/tsymbol.prg @@ -68,7 +68,7 @@ CREATE CLASS Symbol ENDCLASS METHOD New( cSymName ) CLASS Symbol - ::nSym := __DynSN2Sym( cSymName ) + ::nSym := __DynSNToSym( cSymName ) RETURN Self METHOD name() CLASS Symbol diff --git a/harbour/source/rtl/valtoexp.prg b/harbour/source/rtl/valtoexp.prg index 60691fd85e..7aae897725 100644 --- a/harbour/source/rtl/valtoexp.prg +++ b/harbour/source/rtl/valtoexp.prg @@ -60,7 +60,7 @@ FUNCTION hb_VALTOEXP( xVal ) cVal := hb_StrToExp( xVal ) EXIT CASE "N" - cVal := hb_N2S( xVal ) + cVal := hb_NToS( xVal ) EXIT CASE "D" cVal := iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) ) @@ -127,9 +127,9 @@ FUNCTION hb_CStr( xVal ) CASE "O" RETURN "{ " + xVal:className + " Object }" CASE "A" - RETURN "{ Array of " + hb_N2S( Len( xVal ) ) + " Items }" + RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }" CASE "H" - RETURN "{ Hash of " + hb_N2S( Len( xVal ) ) + " Items }" + RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }" CASE "P" RETURN "" OTHERWISE diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 7237bdab3d..48e90fa862 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -1581,7 +1581,7 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile ) cAlertMsg := "<"+cFile + "> cannot be openned for edition." ENDIF - ALERT( cAlertMsg + " FERROR (" + hb_N2S( FERROR() ) + ")" ) + ALERT( cAlertMsg + " FERROR (" + hb_NToS( FERROR() ) + ")" ) RESTSCREEN( ,,,, cOldScreen ) RETURN RET_ERR @@ -2321,8 +2321,8 @@ Endif // Create and compile "COMPRESS = " + IIF( s_lCompress, "YES", "NO" ) + s_cEOL +; "CONTRIBS = " + IIF( s_lContribLib, "YES", "NO" ) + s_cEOL +; "XFWH = " + IIF( s_lxFwh, "YES", "NO" ) + s_cEOL +; - "FILESTOADD = " + hb_N2S( s_nFilesToAdd ) + s_cEOL +; - "WARNINGLEVEL = " + hb_N2S( s_nWarningLevel ) + s_cEOL +; + "FILESTOADD = " + hb_NToS( s_nFilesToAdd ) + s_cEOL +; + "WARNINGLEVEL = " + hb_NToS( s_nWarningLevel ) + s_cEOL +; "USERDEFINE = " + ALLTRIM(s_cUserDefine) + s_cEOL +; "USERINCLUDE = " + ALLTRIM(s_cUserInclude) + s_cEOL +; "USERLIBS = " + ALLTRIM(s_cUserLibs) + s_cEOL +; @@ -5644,7 +5644,7 @@ FUNCTION PRB_INT( SOMENUMBER, length, NUM_DECIMALS ) SOMENUMBER += .0000000000000005 - SOMESTRING := hb_N2S( SOMENUMBER ) + SOMESTRING := hb_NToS( SOMENUMBER ) dotat := AT( ".", somestring ) diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index 1890029931..9c1d8cf2fe 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -139,7 +139,7 @@ PROCEDURE _APPMAIN( cFile, ... ) nMaxCol := MaxCol() @ nMaxRow, 0 SAY HB_PROMPT @ nMaxRow, Col() GET cLine ; - PICTURE "@KS" + hb_N2S( nMaxCol - Col() + 1 ) + PICTURE "@KS" + hb_NToS( nMaxCol - Col() + 1 ) SetCursor( IIF( ReadInsert(), SC_INSERT, SC_NORMAL ) ) @@ -256,7 +256,7 @@ STATIC PROCEDURE HB_DotErr( oErr, cCommand ) ELSEIF ISCHARACTER( oErr ) cMessage += oErr ENDIF - cMessage += ";;" + ProcName( 2 ) + "(" + hb_N2S( ProcLine( 2 ) ) + ")" + cMessage += ";;" + ProcName( 2 ) + "(" + hb_NToS( ProcLine( 2 ) ) + ")" Alert( cMessage )