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

2001-01-22 00:50 UTC-0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* contrib/dot/pp.prg
   * source/pp/ppcore.c
     ! Fixed processing of & with stringify.
This commit is contained in:
Ron Pinkas
2001-01-22 08:53:35 +00:00
parent c7ff5eeec1
commit 99c5bb3d1f
3 changed files with 116 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -1,3 +1,8 @@
2001-01-22 00:50 UTC-0800 Ron Pinkas <ron@profit-master.com>
* contrib/dot/pp.prg
* source/pp/ppcore.c
! Fixed processing of & with stringify.
2001-01-21 15:40 UTC-0800 Ron Pinkas <ron@profit-master.com>
* source/compiler/harbour.slx
* Minor correction.

92
harbour/contrib/dot/pp.prg
View File

@@ -2805,6 +2805,8 @@ FUNCTION PPOut( aResults, aMarkers )
FOR nMatch := 1 TO nMatches
IF Left( xValue[nMatch], 1 ) $ '"['
sResult += '[' + RTrim( xValue[nMatch] ) + ']'
ELSEIF Left( xValue[nMatch], 1 ) == '&'
sResult += RTrim( SubStr( xValue[nMatch], 2 ) )
ELSE
sResult += '"' + RTrim( xValue[nMatch] ) + '"'
ENDIF
@@ -2817,6 +2819,8 @@ FUNCTION PPOut( aResults, aMarkers )
IF ! ( xValue == NIL )
IF Left( xValue, 1 ) $ '"['
sResult += '[' + RTrim( xValue ) + ']'
ELSEIF Left( xValue, 1 ) == '&'
sResult += RTrim( SubStr( xValue, 2 ) )
ELSE
sResult += '"' + RTrim( xValue ) + '"'
ENDIF
@@ -2831,11 +2835,13 @@ FUNCTION PPOut( aResults, aMarkers )
IF Left( xValue[nMatch], 1 ) == '('
sResult += xValue[nMatch]
ELSE
IF Left( xValue[nMatch], 1 ) $ '"['
sResult += '[' + RTrim( xValue[nMatch] ) + ']'
ELSE
sResult += '"' + RTrim( xValue[nMatch] ) + '"'
ENDIF
IF Left( xValue[nMatch], 1 ) $ '"['
sResult += '[' + RTrim( xValue[nMatch] ) + ']'
ELSEIF Left( xValue[nMatch], 1 ) == '&'
sResult += RTrim( SubStr( xValue[nMatch], 2 ) )
ELSE
sResult += '"' + RTrim( xValue[nMatch] ) + '"'
ENDIF
ENDIF
IF nMatch < nMatches
@@ -2849,6 +2855,8 @@ FUNCTION PPOut( aResults, aMarkers )
ELSE
IF Left( xValue, 1 ) $ '"['
sResult += '[' + RTrim( xValue ) + ']'
ELSEIF Left( xValue, 1 ) == '&'
sResult += RTrim( SubStr( xValue, 2 ) )
ELSE
sResult += '"' + RTrim( xValue ) + '"'
ENDIF
@@ -4148,29 +4156,91 @@ RETURN sWS
FUNCTION DropTrailingWS( sLine, sWS )
LOCAL nLen := Len( sLine ), cChar
#ifdef __HARBOUR__
/* Tabs are converted to spaces at ProcessFile() */
HB_INLINE( @sLine, @sWs )
{
extern PHB_ITEM hb_stackItemFromBase( int );
extern PHB_ITEM hb_itemUnRef( PHB_ITEM );
extern PHB_ITEM hb_itemClear( PHB_ITEM );
sWS := ''
PHB_ITEM pItem1 = hb_itemUnRef( hb_stackItemFromBase( 1 ) );
PHB_ITEM pItem2 = hb_itemUnRef( hb_stackItemFromBase( 2 ) );
size_t iLen = pItem1->item.asString.length, i = iLen - 1;
while( pItem1->item.asString.value[i] == ' ' )
{
i--;
}
if( ++i < iLen )
{
pItem1->item.asString.length = i;
pItem1->item.asString.value[i] = '\0';
}
if( pItem2 )
{
hb_itemClear( pItem2 );
pItem2->type = HB_IT_STRING;
pItem2->item.asString.length = ( iLen - i );
pItem2->item.asString.value = ( char * ) hb_xgrab( pItem2->item.asString.length + 1 );
memset( pItem2->item.asString.value, ' ', pItem2->item.asString.length );
pItem2->item.asString.value[ pItem2->item.asString.length ] = '\0';
}
}
#else
LOCAL nLenSource, nLen := Len( sLine ), cChar
nLenSource := nLen
//? "Before Drop: '" + sLine + "'"
/* Tabs are converted to spaces at ProcessFile() */
WHILE nLen > 0 .AND. ( cChar := SubStr( sLine, nLen, 1 ) ) == ' ' //$ ( ' ' + Chr(9) ) // Tabs converted to spaces
sWS := cChar + sWs
nLen--
ENDDO
sLine := Left( sLine, nLen )
sWS := Space( nLenSource - nLen )
//? "After Drop: '" + sLine + "'"
#endif
RETURN sLine
FUNCTION DropExtraTrailingWS( sLine )
LOCAL nLen := Len( sLine )
#ifdef __HARBOUR__
HB_INLINE( @sLine )
{
extern PHB_ITEM hb_stackItemFromBase( int );
extern PHB_ITEM hb_itemUnRef( PHB_ITEM );
PHB_ITEM pItem = hb_itemUnRef( hb_stackItemFromBase( 1 ) );
size_t iLen = pItem->item.asString.length, i = iLen - 1;
while( i > 1 && pItem->item.asString.value[i] == ' ' && pItem->item.asString.value[i - 1] == ' ' )
{
i--;
}
if( ++i < iLen )
{
pItem->item.asString.length = i;
pItem->item.asString.value[i] = '\0';
}
}
#else
LOCAL nLen := Len( sLine )
/* Tabs are converted to spaces at ProcessFile() */
//? "Before Extra: '" + sLine + "'"
@@ -4182,7 +4252,7 @@ FUNCTION DropExtraTrailingWS( sLine )
sLine := Left( sLine, nLen )
//? "After Extra: '" + sLine + "'"
#endif
RETURN sLine

38
harbour/source/pp/ppcore.c
View File

@@ -2476,10 +2476,23 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
lenitem = (ifou)? ifou-1:lenreal;
if( *expreal != '\0' )
{
i = (ifou)? 3:2;
pp_rQuotes( expreal, sQuotes );
hb_pp_Stuff( sQuotes, ptro, i, 0, lenres );
hb_pp_Stuff( expreal, ptro+1, lenitem, 0, lenres+i );
/* Ron Pinkas added 2000-01-21 */
if( *expreal == '&' )
{
i = 0;
if( ! ifou )
{
lenitem--;
}
hb_pp_Stuff( expreal + 1, ptro, lenitem, 0, lenres );
}
else /* END Ron Pinkas 2000-01-21 */
{
i = (ifou)? 3:2;
pp_rQuotes( expreal, sQuotes );
hb_pp_Stuff( sQuotes, ptro, i, 0, lenres );
hb_pp_Stuff( expreal, ptro+1, lenitem, 0, lenres+i );
}
ptro += i + lenitem;
rmlen += i + lenitem;
}
@@ -2490,10 +2503,19 @@ static int ReplacePattern( char patttype, char * expreal, int lenreal, char * pt
}
else
{
pp_rQuotes( expreal, sQuotes );
hb_pp_Stuff( sQuotes, ptro, 2, 4, lenres );
hb_pp_Stuff( expreal, ptro+1, lenreal, 0, lenres );
rmlen = lenreal + 2;
/* Ron Pinkas added 2000-01-21 */
if( *expreal == '&' )
{
rmlen--;
hb_pp_Stuff( expreal + 1, ptro, lenreal - 1, 4, lenres );
}
else /* END Ron Pinkas 2000-01-21 */
{
pp_rQuotes( expreal, sQuotes );
hb_pp_Stuff( sQuotes, ptro, 2, 4, lenres );
hb_pp_Stuff( expreal, ptro+1, lenreal, 0, lenres );
rmlen = lenreal + 2;
}
}
break;
case '3': /* Smart stringify result marker */