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

2011-10-20 23:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/compiler/hbmain.c
    ! take starting line number from PP to eliminate possible
      synchronization problem

  * harbour/src/compiler/hbcmplib.c
    ! minor fix in meta filename detecting
This commit is contained in:
Przemyslaw Czerpak
2011-10-20 21:06:32 +00:00
parent 9ec8317887
commit a874a061ef
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-10-20 23:06 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/compiler/hbmain.c
! take starting line number from PP to eliminate possible
synchronization problem
* harbour/src/compiler/hbcmplib.c
! minor fix in meta filename detecting
2011-10-20 22:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbpp.h
* harbour/include/hbcomp.h

2
harbour/src/compiler/hbcmplib.c
View File

@@ -67,7 +67,7 @@ static void s_pp_msg( void * cargo, int iErrorFmt, int iLine,
PHB_ITEM pError;
hb_snprintf( szMsgBuf, sizeof( szMsgBuf ), szText, szPar1, szPar2 );
if( !szModule || *szModule == 0 || strcmp( szModule, "{SOURCE}" ) == 0 )
if( !szModule || *szModule == 0 || strcmp( szModule, "{SOURCE}.prg" ) == 0 )
hb_snprintf( szLine, sizeof( szLine ),
"line:%i", iLine );
else

2
harbour/src/compiler/hbmain.c
View File

@@ -4170,7 +4170,7 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, const char * szBuff
#endif
HB_COMP_PARAM->iModulesCount = 1;
HB_COMP_PARAM->currLine = 1;
HB_COMP_PARAM->currLine = hb_pp_line( HB_COMP_PARAM->pLex->pPP ) + 1;
HB_COMP_PARAM->currModule = hb_compIdentifierNew(
HB_COMP_PARAM, szFileName, HB_IDENT_COPY );
if( HB_COMP_PARAM->szFile == NULL )