From e43c00de240e77155157cedebbb6f5a02736a0c6 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 19 May 2011 15:32:49 +0000
Subject: [PATCH] 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()

---
 harbour/ChangeLog              |  6 +++++
 harbour/src/debug/debugger.prg | 41 +++++++++++++-------------------
 harbour/src/rtl/valtoexp.prg   | 43 +++++++++++++---------------------
 3 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fcac368e3b..302b564a25 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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)
diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg
index 5cb27a6485..98ae0ee29f 100644
--- a/harbour/src/debug/debugger.prg
+++ b/harbour/src/debug/debugger.prg
@@ -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
diff --git a/harbour/src/rtl/valtoexp.prg b/harbour/src/rtl/valtoexp.prg
index 12a82f998a..55dcb97e06 100644
--- a/harbour/src/rtl/valtoexp.prg
+++ b/harbour/src/rtl/valtoexp.prg
@@ -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