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

2015-10-12 13:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/mlcfunc.c
    * execute hb_MLEval() codeblock for last empty line if passed string
      ends with EOL
This commit is contained in:
Przemysław Czerpak
2015-10-12 13:32:24 +02:00
parent f7b7e30c36
commit 3abb37f67e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-10-12 13:32 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/mlcfunc.c
* execute hb_MLEval() codeblock for last empty line if passed string
ends with EOL
2015-10-12 12:56 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/hbsocket.c
! added casting to 2-nd parameter of inet_ntop() as workaround for

8
src/rtl/mlcfunc.c
View File

@@ -564,7 +564,7 @@ HB_FUNC( HB_MLEVAL )
HB_BOOL fWordWrap = hb_parldef( 5, 1 );
PHB_CODEPAGE cdp = hb_vmCDP();
PHB_ITEM pLineItem = NULL, pSoftItem = NULL;
HB_BOOL fSoftCR;
HB_BOOL fSoftCR, fEOL;
char * pszLine;
if( ! HB_CDP_ISCHARIDX( cdp ) )
@@ -588,7 +588,7 @@ HB_FUNC( HB_MLEVAL )
{
HB_SIZE nBlankCol = 0, nBlankPos = 0, nBlankDst = 0, nCol = 0, nDst = 0;
fSoftCR = HB_FALSE;
fSoftCR = fEOL = HB_FALSE;
++nLines;
do
{
@@ -608,6 +608,7 @@ HB_FUNC( HB_MLEVAL )
++nOffset;
if( pszString[ nOffset ] == HB_CHAR_LF )
++nOffset;
fEOL = HB_TRUE;
break;
}
else if( pszString[ nOffset ] == HB_CHAR_LF )
@@ -615,6 +616,7 @@ HB_FUNC( HB_MLEVAL )
++nOffset;
if( pszString[ nOffset ] == HB_CHAR_CR )
++nOffset;
fEOL = HB_TRUE;
break;
}
@@ -685,7 +687,7 @@ HB_FUNC( HB_MLEVAL )
nColPos = 0;
}
if( fSoftCR )
if( fSoftCR || fEOL )
{
pLineItem = hb_itemPutC( pLineItem, NULL );
pSoftItem = hb_itemPutL( pSoftItem, HB_FALSE );