diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c2dd645397..f1e4d8bf7b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-05-11 18:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * harbour/source/compiler/hbmain.c + * harbour/source/compiler/harbour.yyc + ! Fixed error message text when unclosed multiline codeblock + was detected (said: <||...> instead of {||...}). + (two more places) + 2007-05-11 18:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/source/compiler/harbour.y ! Fixed error message text when unclosed multiline codeblock diff --git a/harbour/source/compiler/harbour.yyc b/harbour/source/compiler/harbour.yyc index 642ebfba95..043c4a4839 100644 --- a/harbour/source/compiler/harbour.yyc +++ b/harbour/source/compiler/harbour.yyc @@ -7959,7 +7959,7 @@ BOOL hb_compCheckUnclosedStru( HB_COMP_DECL ) else if( HB_COMP_PARAM->functions.pLast && ( HB_COMP_PARAM->functions.pLast->bFlags & FUN_EXTBLOCK ) ) { - hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_UNCLOSED_STRU, "<||...>", NULL ); + hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'E', HB_COMP_ERR_UNCLOSED_STRU, "{||...}", NULL ); } else fUnclosed = FALSE; diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c index 29d6e0ad1a..25c2e4acef 100644 --- a/harbour/source/compiler/hbmain.c +++ b/harbour/source/compiler/hbmain.c @@ -3829,7 +3829,7 @@ void hb_compCodeBlockEnd( HB_COMP_DECL ) { if( HB_COMP_PARAM->iWarnings >= 1 ) hb_compGenWarning( HB_COMP_PARAM, hb_comp_szWarnings, 'W', HB_COMP_WARN_FUN_WITH_NO_RETURN, - "<||...>", NULL ); + "{||...}", NULL ); /* finish the codeblock without popping the return value from HVM stack */ hb_compGenPCode1( HB_P_ENDPROC, HB_COMP_PARAM ); } @@ -3951,7 +3951,7 @@ void hb_compCodeBlockEnd( HB_COMP_DECL ) while( pVar ) { if( HB_COMP_PARAM->iWarnings && pFunc->szName && pVar->szName && ! ( pVar->iUsed & VU_USED ) ) - hb_compGenWarning( HB_COMP_PARAM, hb_comp_szWarnings, 'W', HB_COMP_WARN_VAR_NOT_USED, pVar->szName, "<||...>" ); + hb_compGenWarning( HB_COMP_PARAM, hb_comp_szWarnings, 'W', HB_COMP_WARN_VAR_NOT_USED, pVar->szName, "{||...}" ); pVar = pVar->pNext; } }