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

2011-05-19 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/valtoexp.prg
    * formatted HB_CSTR()
  * src/debug/debugger.prg
    ! __dbgCStr() synced with HB_CSTR()
This commit is contained in:
Viktor Szakats
2011-05-19 15:32:49 +00:00
parent 955e90fe59
commit e43c00de24
3 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -16,6 +16,12 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-19 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/valtoexp.prg
* formatted HB_CSTR()
* src/debug/debugger.prg
! __dbgCStr() synced with HB_CSTR()
2011-05-19 17:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/arc4.c
! fixed for watcom (getpid)

41
harbour/src/debug/debugger.prg
View File

@@ -3398,31 +3398,22 @@ FUNCTION __dbgCStr( xVal )
LOCAL v := ValType( xVal )
SWITCH v
CASE "C"
CASE "M"
RETURN xVal
CASE "N"
RETURN Str( xVal )
CASE "D"
RETURN iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) )
CASE "L"
RETURN iif( xVal, ".T.", ".F." )
CASE "S"
RETURN "@" + xVal:name + "()"
CASE "B"
RETURN "{|| ... }"
CASE "O"
RETURN "{ " + xVal:className + " Object }"
CASE "A"
RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "H"
RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "P"
RETURN "<pointer>"
OTHERWISE
IF xVal == NIL
RETURN "NIL"
ENDIF
CASE "C"
CASE "M" ; RETURN xVal
CASE "N" ; RETURN Str( xVal )
CASE "D" ; RETURN iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) )
CASE "T" ; RETURN 't"' + hb_TSToStr( xVal, .T. ) + '"'
CASE "L" ; RETURN iif( xVal, ".T.", ".F." )
CASE "S" ; RETURN "@" + xVal:name + "()"
CASE "B" ; RETURN "{||...}"
CASE "O" ; RETURN "{ " + xVal:className + " Object }"
CASE "A" ; RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "H" ; RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "P" ; RETURN "<pointer>"
OTHERWISE
IF xVal == NIL
RETURN "NIL"
ENDIF
ENDSWITCH
RETURN "???:" + v

43
harbour/src/rtl/valtoexp.prg
View File

@@ -122,33 +122,22 @@ FUNCTION hb_CStr( xVal )
LOCAL v := ValType( xVal )
SWITCH v
CASE "C"
CASE "M"
RETURN xVal
CASE "N"
RETURN Str( xVal )
CASE "D"
RETURN iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) )
CASE "T"
RETURN 't"' + hb_TSToStr( xVal, .T. ) + '"'
CASE "L"
RETURN iif( xVal, ".T.", ".F." )
CASE "S"
RETURN "@" + xVal:name + "()"
CASE "B"
RETURN "{||...}"
CASE "O"
RETURN "{ " + xVal:className + " Object }"
CASE "A"
RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "H"
RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "P"
RETURN "<pointer>"
OTHERWISE
IF xVal == NIL
RETURN "NIL"
ENDIF
CASE "C"
CASE "M" ; RETURN xVal
CASE "N" ; RETURN Str( xVal )
CASE "D" ; RETURN iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) )
CASE "T" ; RETURN 't"' + hb_TSToStr( xVal, .T. ) + '"'
CASE "L" ; RETURN iif( xVal, ".T.", ".F." )
CASE "S" ; RETURN "@" + xVal:name + "()"
CASE "B" ; RETURN "{||...}"
CASE "O" ; RETURN "{ " + xVal:className + " Object }"
CASE "A" ; RETURN "{ Array of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "H" ; RETURN "{ Hash of " + hb_NToS( Len( xVal ) ) + " Items }"
CASE "P" ; RETURN "<pointer>"
OTHERWISE
IF xVal == NIL
RETURN "NIL"
ENDIF
ENDSWITCH
RETURN "???:" + v