5721fcf996
* harbour/source/common/hbstr.c
! added missing call to va_end() in hb_snprintf()
* harbour/source/vm/classes.c
+ added internal helper function __objSetClass()
* harbour/source/rtl/valtoexp.prg
* set class in expressions serialized by hb_valToExp()
* harbour/source/rtl/valtostr.c
% optimized hb_strToExp()
* harbour/contrib/xhb/hbcompat.ch
! removed unnecessary conversion for HB_ISPOINTER() in xHarbour part.
148 lines
4.4 KiB
Plaintext
148 lines
4.4 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* HB_VALTOEXP(), HB_CSTR()
|
|
*
|
|
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
FUNCTION hb_VALTOEXP( xVal )
|
|
LOCAL cVal
|
|
LOCAL v := ValType( xVal )
|
|
|
|
SWITCH v
|
|
CASE "C"
|
|
CASE "M"
|
|
cVal := hb_StrToExp( xVal )
|
|
EXIT
|
|
CASE "N"
|
|
cVal := hb_NToS( xVal )
|
|
EXIT
|
|
CASE "D"
|
|
cVal := iif( Empty( xVal ), "0d00000000", "0d" + DToS( xVal ) )
|
|
EXIT
|
|
CASE "L"
|
|
cVal := iif( xVal, ".T.", ".F." )
|
|
EXIT
|
|
CASE "S"
|
|
cVal := "@" + xVal:name + "()"
|
|
EXIT
|
|
CASE "A"
|
|
cVal := "{"
|
|
FOR EACH v IN xVal
|
|
cVal += iif( v:__enumIndex() == 1, "", ", " ) + hb_ValToExp( v )
|
|
NEXT
|
|
cVal += "}"
|
|
EXIT
|
|
CASE "O"
|
|
cVal := "__objSetClass( {"
|
|
FOR EACH v IN xVal
|
|
cVal += iif( v:__enumIndex() == 1, "", ", " ) + hb_ValToExp( v )
|
|
NEXT
|
|
cVal += "}, '" + xVal:className() + "')"
|
|
EXIT
|
|
CASE "H"
|
|
IF Empty( xVal )
|
|
cVal := "{=>}"
|
|
ELSE
|
|
cVal := "{"
|
|
FOR EACH v IN xVal
|
|
cVal += iif( v:__enumIndex() == 1, "", ", " ) + ;
|
|
hb_ValToExp( v:__enumKey() ) + "=>" + hb_ValToExp( v )
|
|
NEXT
|
|
cVal += "}"
|
|
ENDIF
|
|
EXIT
|
|
CASE "P"
|
|
cVal := "<pointer>"
|
|
EXIT
|
|
CASE "B"
|
|
cVal := "{|| ... }"
|
|
EXIT
|
|
OTHERWISE
|
|
IF xVal == NIL
|
|
cVal := "NIL"
|
|
ELSE
|
|
cVal := "???:" + v
|
|
ENDIF
|
|
ENDSWITCH
|
|
|
|
RETURN cVal
|
|
|
|
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 "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
|