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

2000-08-02 19:50 UTC+0800 Ron Pinkas <ron@profit-master.com>

Browse Source 
* include/hberrors.h
     * Changed #define HB_PP_ERR_INCLUDE_SELF to HB_PP_ERR_INCLUDE_CYCLIC

   * source/pp/ppcore.c
     * Changed "Can\'t #include self \'%s\'" to "Cyclic #include not allowed: \'%s\'"
     * Changed self refernce #include detection, to detect any #include of an already opened file.
This commit is contained in:
Ron Pinkas
2000-08-03 02:53:33 +00:00
parent 1a7632b428
commit a04e873b2e
3 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
2000-08-02 19:50 UTC+0800 Ron Pinkas <ron@profit-master.com>
* include/hberrors.h
* Changed #define HB_PP_ERR_INCLUDE_SELF to HB_PP_ERR_INCLUDE_CYCLIC
* source/pp/ppcore.c
* Changed "Can\'t #include self \'%s\'" to "Cyclic #include not allowed: \'%s\'"
* Changed self refernce #include detection, to detect any #include of an already opened file.
2000-08-02 14:10 UTC+0800 Ron Pinkas <ron@profit-master.com>
* source/compiler/harbour.l
* Changed USUAL to ANYTYPE

2
harbour/include/hberrors.h
View File

@@ -138,7 +138,7 @@ extern "C" {
#define HB_PP_ERR_PRAGMA_BAD_VALUE 14
#define HB_PP_ERR_CANNOT_OPEN_RULES 15
#define HB_PP_ERR_BAD_RULES_FILE_NAME 16
#define HB_PP_ERR_INCLUDE_SELF 17
#define HB_PP_ERR_INCLUDE_CYCLIC 17
#define HB_PP_WARN_DEFINE_REDEF 1
#define HB_PP_WARN_NO_DIRECTIVES 2

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

@@ -172,7 +172,7 @@ char * hb_pp_szErrors[] =
"Value out of range in #pragma directive",
"Can\'t open command definitions file: \'%s\'",
"Invalid command definitions file name: \'%s\'",
"Can\'t #include self \'%s\'"
"Cyclic #include not allowed: \'%s\'"
};
/* Table with warnings */
@@ -2908,85 +2908,65 @@ static BOOL OpenInclude( char * szFileName, PATHNAMES * pSearch, PHB_FNAME pMain
HB_TRACE(HB_TR_DEBUG, ("OpenInclude(%s, %p, %p, %p, %d)", szFileName, pSearch, pMainFileName, fptr, (int) bStandardOnly));
if( bStandardOnly )
{
fptr = 0;
szInclude[ 0 ] = '\0';
}
{
fptr = 0;
szInclude[ 0 ] = '\0';
}
else
{
pFileName = hb_fsFNameSplit( szFileName );
{
pFileName = hb_fsFNameSplit( szFileName );
if( pFileName->szPath == NULL || *(pFileName->szPath) == '\0' )
pFileName->szPath = pMainFileName->szPath;
if( pFileName->szPath == NULL || *(pFileName->szPath) == '\0' )
pFileName->szPath = pMainFileName->szPath;
/*
printf( "Name=%s Ext=%s Path=%s\n", pFileName->szName, pFileName->szExtension, pFileName->szPath );
printf( "Name=%s Ext=%s Path=%s\n", pMainFileName->szName, pMainFileName->szExtension, pMainFileName->szPath );
*/
hb_fsFNameMerge( szInclude, pFileName );
{
char * szName, * szMainName, * szExt, * szMainExt, * szPath, * szMainPath;
{
char * szRequested, * szOpened;
PFILE pFile = hb_comp_files.pLast;
if( pFileName->szName )
szName = hb_strupr( hb_strdup( pFileName->szName ) );
else
szName = hb_strdup( "" );
#if 1
#define HB_OS_CASE(s) hb_strupr(s)
#else
#define HB_OS_CASE(s) s
#endif
if( pMainFileName->szName )
szMainName = hb_strupr( hb_strdup( pMainFileName->szName ) );
else
szMainName = hb_strdup( "" );
szRequested = HB_OS_CASE( hb_strdup( szInclude ) );
if( pFileName->szExtension )
szExt = hb_strupr( hb_strdup( pFileName->szExtension ) );
else
szExt = hb_strdup( "" );
while ( pFile )
{
szOpened = HB_OS_CASE( hb_strdup( pFile->szFileName ) );
if( pMainFileName->szExtension )
szMainExt = hb_strupr( hb_strdup( pMainFileName->szExtension ) );
else
szMainExt = hb_strdup( "" );
if( strcmp( szRequested, szOpened ) == 0 )
hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_INCLUDE_CYCLIC, szFileName, NULL );
if( pFileName->szPath )
szPath = hb_strupr( hb_strdup( pFileName->szPath ) );
else
szPath = hb_strdup( "" );
pFile = pFile->pPrev;
}
if( pMainFileName->szPath )
szMainPath = hb_strupr( hb_strdup( pMainFileName->szPath ) );
else
szMainPath = hb_strdup( "" );
#undef HB_OS_CASE
if( strcmp( szName, szMainName ) == 0 && strcmp( szExt, szMainExt ) == 0 && strcmp( szPath, szMainPath ) == 0 )
hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_INCLUDE_SELF, szFileName, NULL );
hb_xfree( szRequested );
hb_xfree( szOpened );
}
hb_xfree( szName );
hb_xfree( szMainName );
hb_xfree( szExt );
hb_xfree( szMainExt );
hb_xfree( szPath );
hb_xfree( szMainPath );
}
hb_fsFNameMerge( szInclude, pFileName );
fptr = fopen( szInclude, "r" );
hb_xfree( pFileName );
}
fptr = fopen( szInclude, "r" );
hb_xfree( pFileName );
}
if( !fptr && pSearch )
{
{
pFileName = hb_fsFNameSplit( szFileName );
pFileName->szName = szFileName;
pFileName->szExtension = NULL;
while( pSearch && !fptr )
{
{
pFileName->szPath = pSearch->szPath;
hb_fsFNameMerge( szInclude, pFileName );
fptr = fopen( szInclude, "r" );
pSearch = pSearch->pNext;
}
}
hb_xfree( pFileName );
}
}
if( fptr )
{