* 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.
162 lines
4.7 KiB
C
162 lines
4.7 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* HB_VALTOSTR() function
|
|
*
|
|
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapiitm.h"
|
|
|
|
HB_FUNC( HB_VALTOSTR )
|
|
{
|
|
ULONG ulLen;
|
|
BOOL bFreeReq;
|
|
char * buffer = hb_itemString( hb_param( 1, HB_IT_ANY ), &ulLen, &bFreeReq );
|
|
|
|
if( bFreeReq )
|
|
hb_retclen_buffer( buffer, ulLen );
|
|
else
|
|
hb_retclen( buffer, ulLen );
|
|
}
|
|
|
|
HB_FUNC( HB_STRTOEXP )
|
|
{
|
|
const char * pszString = hb_parc( 1 );
|
|
|
|
if( pszString )
|
|
{
|
|
ULONG ulLen = hb_parclen( 1 ), ulRet, ul, uQ = 0;
|
|
int iType = 0;
|
|
char ch, * pDst, * pszResult;
|
|
|
|
for( ul = 0; ul < ulLen; ++ul )
|
|
{
|
|
switch( pszString[ ul ] )
|
|
{
|
|
case '\\':
|
|
++uQ;
|
|
break;
|
|
case '"':
|
|
++uQ;
|
|
iType |= 1;
|
|
break;
|
|
case '\'':
|
|
iType |= 2;
|
|
break;
|
|
case ']':
|
|
iType |= 4;
|
|
break;
|
|
case '\r':
|
|
case '\n':
|
|
iType |= 7;
|
|
++uQ;
|
|
break;
|
|
case '\0':
|
|
iType |= 7;
|
|
uQ += 3;
|
|
break;
|
|
}
|
|
}
|
|
if( iType == 7 )
|
|
{
|
|
ulRet = ulLen + 3 + uQ;
|
|
pDst = pszResult = ( char * ) hb_xgrab( ulRet + 1 );
|
|
*pDst++ = 'e';
|
|
*pDst++ = '"';
|
|
for( ul = 0; ul < ulLen; ++ul )
|
|
{
|
|
ch = pszString[ ul ];
|
|
switch( ch )
|
|
{
|
|
case '\r':
|
|
*pDst++ = '\\';
|
|
*pDst++ = 'r';
|
|
break;
|
|
case '\n':
|
|
*pDst++ = '\\';
|
|
*pDst++ = 'n';
|
|
break;
|
|
case '\0':
|
|
*pDst++ = '\\';
|
|
*pDst++ = '0';
|
|
*pDst++ = '0' + ( ch >> 3 );
|
|
*pDst++ = '0' + ( ch & 7 );
|
|
break;
|
|
case '\\':
|
|
case '"':
|
|
*pDst++ = '\\';
|
|
default:
|
|
*pDst++ = ch;
|
|
break;
|
|
}
|
|
}
|
|
*pDst++ = '"';
|
|
}
|
|
else
|
|
{
|
|
ulRet = ulLen + 2;
|
|
pDst = pszResult = ( char * ) hb_xgrab( ulRet + 1 );
|
|
if( ( iType & 1 ) == 0 )
|
|
*pDst++ = ch = '"';
|
|
else if( ( iType & 2 ) == 0 )
|
|
*pDst++ = ch = '\'';
|
|
else
|
|
{
|
|
*pDst++ = '[';
|
|
ch = ']';
|
|
}
|
|
memcpy( pDst, pszString, ulLen );
|
|
pDst += ulLen;
|
|
*pDst++ = ch;
|
|
}
|
|
*pDst = '\0';
|
|
hb_retclen_buffer( pszResult, ulRet );
|
|
}
|
|
}
|