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

2001-07-19 12:40 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2001-07-19 08:37:30 +00:00
parent 3928d386a1
commit fea0787cd7
2 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -1,3 +1,7 @@
2001-07-19 12:40 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
* source/rtl/transfrm.c
* added some code for proper handling of numeric parameters
2001-07-18 16:10 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/vm/macro.c
* source/vm/hvm.c

70
harbour/source/rtl/transfrm.c
View File

@@ -395,50 +395,56 @@ HB_FUNC( TRANSFORM )
szStr[ i ] = byParamL;
}
for( i = 0; i < ulPicLen; i++ )
{
cPic = szPic[ i ];
if( cPic == '9' || cPic == '#' )
szResult[ i ] = szStr[ iCount++ ]; /* Just copy */
else if( cPic == '.' )
if( ulPicLen )
for( i = 0; i < ulPicLen; i++ )
{
if( uiPicFlags & PF_NUMDATE ) /* Dot in date */
szResult[ i ] = cPic;
else /* Dot in number */
cPic = szPic[ i ];
if( cPic == '9' || cPic == '#' )
szResult[ i ] = szStr[ iCount++ ]; /* Just copy */
else if( cPic == '.' )
{
if( uiPicFlags & PF_EXCHANG ) /* Exchange . and , */
if( uiPicFlags & PF_NUMDATE ) /* Dot in date */
szResult[ i ] = cPic;
else /* Dot in number */
{
szResult[ i ] = ',';
if( uiPicFlags & PF_EXCHANG ) /* Exchange . and , */
{
szResult[ i ] = ',';
iCount++;
}
else
szResult[ i ] = szStr[ iCount++ ];
}
}
else if( cPic == '$' || cPic == '*' )
{
if( szStr[ iCount ] == ' ' )
{
szResult[ i ] = cPic;
iCount++;
}
else
szResult[ i ] = szStr[ iCount++ ];
}
}
else if( cPic == '$' || cPic == '*' )
{
if( szStr[ iCount ] == ' ' )
else if( cPic == ',' ) /* Comma */
{
szResult[ i ] = cPic;
iCount++;
}
else
szResult[ i ] = szStr[ iCount++ ];
}
else if( cPic == ',' ) /* Comma */
{
if( iCount && isdigit( ( int ) szStr[ iCount - 1 ] ) )
{ /* May we place it */
if( uiPicFlags & PF_EXCHANG )
szResult[ i ] = '.';
if( iCount && isdigit( ( int ) szStr[ iCount - 1 ] ) )
{ /* May we place it */
if( uiPicFlags & PF_EXCHANG )
szResult[ i ] = '.';
else
szResult[ i ] = ',';
}
else
szResult[ i ] = ',';
szResult[ i ] = ' ';
}
else
szResult[ i ] = ' ';
szResult[ i ] = cPic;
}
else
szResult[ i ] = cPic;
else
{
strcpy( szResult, szStr );
i = strlen( szStr );
}
if( ( uiPicFlags & PF_PARNEG ) && dValue < 0 )
@@ -475,7 +481,9 @@ HB_FUNC( TRANSFORM )
hb_xfree( szStr );
}
else
{
ulResultPos = 0;
}
}
/* ======================================================= */