* harbour/bin/hb-func.sh
+ added linker parametrs to hbcc
* harbour/include/hbapi.h
+ added hb_retclenAdoptRaw()
* harbour/include/hbapifs.h
* harbour/source/common/hbfsapi.c
* changed first parameters of hb_fsAddSearchPath() to const char *
* harbour/include/hbclass.ch
* update for new PP. I think that now we can try to create final
version of our OOP rules.
* harbour/include/hbdefs.h
+ added UCHAR and SCHAR typedefs
* harbour/include/hbrddcdx.h
* indenting
* harbour/source/rdd/workarea.c
! fixed minor typo
* harbour/source/common/hbdate.c
* harbour/source/rtl/dates.c
* moved hb_dateToday() and hb_dateTimeStr() from RTL to COMMON library
- harbour/include/hbpp.h
- harbour/source/pp/ppcomp.c
- harbour/source/pp/ppcore.c
- harbour/source/pp/pplib.c
- harbour/source/pp/pptable.c
- harbour/source/pp/pragma.c
* harbour/utils/hbpp/Makefile
* harbour/utils/hbpp/hbpp.c
+ harbour/utils/hbpp/hbpp.h
+ harbour/utils/hbpp/ppcomp.c
+ harbour/utils/hbpp/ppcore.c
+ harbour/utils/hbpp/pplib.c
+ harbour/utils/hbpp/pptable.c
+ harbour/utils/hbpp/pragma.c
* moved all PP code to harbour/utils/hbpp
It's interesting and working preprocessor and the code can be
usable for some other things so I do not want to remove it.
Probablly we should move it to contrib/hbpptext
* harbour/include/hbcomp.h
* harbour/include/hberrors.h
* harbour/include/hbsetup.ch
+ harbour/include/hbpp.h
+ harbour/include/hbstdgen.ch
* harbour/source/common/hbstr.c
* harbour/source/compiler/Makefile
* harbour/source/compiler/cmdcheck.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.l
* harbour/source/compiler/hbgenerr.c
+ harbour/source/compiler/ppcomp.c
* harbour/source/pp/Makefile
+ harbour/source/pp/ppcore.c
+ harbour/source/pp/pplib.c
+ harbour/source/pp/ppgen.c
+ New PP code written from scratch. It works in similar way to
Clipper PP even the error codes are replicated. The code is MT
safe does not have any limitation on size of preprocessed code,
line, etc. It's also Clipper compatible lexer. It means that
we do not longer need FLEX or SIMPLEX which can be replaced
by new PP after some small modifications. Anyhow I haven't
decided to make it myself. I would like to agree with with the
rest of developers. I will be very happy if such modifications
will be done by someone else, Ryszard?
Meanwhile I current PP join on output the line tokens and give
the string line to FLEX/SIMPLEX. It does not have any sense and
all FLEX/SIMPLEX limitations are still existing. Ryszard, even
if we keep it then I hope you can remove at least FLEX line buffer
and use the one returned from PP.
Because string tokens in parsed line are converted to text which is
later once again decoded to tokens by FLEX I had to introduce new
string format which supports embedded string delimiters. I chose
modified version of xHarbour extension with escaped strings e"<sting>"
so now FLEX understand such strings and decode them like C escaped
strings. It means that you can use them also in the .prg code f.e.:
outstd( e"Hello\n\rWorld" )
The new PP is also noticeable faster. You should see the difference
compiling long files. The build in PP rules are generated automatically
by ppgen program created from source/pp/ppgen.c
I had to add to GNU source/pp/Makefile these two lines:
pptable.c : ppgen$(EXE_EXT)
./ppgen$(EXE_EXT) $(TOP)$(ROOT)include/hbstdgen.ch -opptable.c -q
Sth like that will have to be done also in non GNU make system.
Now Harbour can be compiled only using GNU make.
Marek can you update non GNU make files? I would like to leave this
modification to you or other developers who can test it.
It was quite big modification and I do not believe that I haven't
make any mistakes but I hope that in few weeks I'll fix any reported
bugs and it will resolve any PP problems.
TODO:
* error messages
create one common list of errors and warnings and keep it
in common library. PP and compiler can still generate different
errors with the same number. It can be confusing for the users
and hard to document and add i18n translations.
If possible we should also try to keep Clipper error numbers.
In new PP code I added Clipper error numbers but I cannot use
them until compiler code is not updated.
We should aslo remove the ctype passed to error functions and
hack with first character in warning messages and use only
error number. The codes from 1000 to 1999 should be warnings
where range 1000:1099 is activated by -w, 1100:1199 by -w1,
1200:1299 by -w2, etc. 2000:2999 are errors and 3000:3999
fatal errors. All compiler functions which generate an error
should expect that error function will not stop the compiler
but return and cleanly finished their job. It's necessary for
MT support in compiler and making compiler part of some other
programs which may still work and compile different source code.
* FLEX/SIMPLEX
remove them at all and add some final pass to PP to create
more precise tokens for grammar parser or at least add better
integration to remove some redundant code and existing limits.
* hb_inLine() support - it's broken in new PP but as I can see
it was never working correctly. I can add a hack to PP to support
hb_inLine() but I'm not sure it's worth to do. Maybe in few days.
+ harbour/include/std.ch
+ added new std.ch. It was created without using Clipper's std.ch.
It's quite possible that some rules are wrong and should be fixed
so please help. Anyhow I created a set of programs based on new PP
code generating all possible combinations of different commands I
collected from different source code, documentation and match patterns
of rules I was adding to new std.ch and then I was comparing .ppo
files generated by Clipper and Harbour so I do not expect any bigger
problems then some minor typos. I had to introduce some modifications
in spacing as workaround for FLEX/SIMPLEX which cannot properly decode
text preprocessed by Clipper after stringify.
* harbour/utils/hbpptest/pretest.prg
* updated for new PP
It reports 16 wrong translations but some of them are valid
and some others are caused by escaped string e"..." (one of hack
for FLEX/SIMPLEX support)
I also had to remove all spaces in comparison the results
because they were not Clipper ocmpatible at all. Ryszard please
look at it.
267 lines
8.6 KiB
C
267 lines
8.6 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Harbour common FileSys API (accessed from standalone utilities and the RTL)
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbapifs.h"
|
|
|
|
/* NOTE: Not really belongs here, but until we can't find a better place
|
|
it will do it. [vszakats] */
|
|
extern void hb_fhnd_ForceLink( void );
|
|
|
|
/*
|
|
* Function that adds zero or more paths to a list of pathnames to search
|
|
*/
|
|
void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList )
|
|
{
|
|
char * pPath;
|
|
char * pDelim;
|
|
BOOL fFree = TRUE;
|
|
|
|
while( *pSearchList )
|
|
{
|
|
pSearchList = &(*pSearchList)->pNext;
|
|
}
|
|
|
|
pPath = hb_strdup( szPath );
|
|
while( ( pDelim = strchr( pPath, OS_PATH_LIST_SEPARATOR ) ) != NULL )
|
|
{
|
|
*pDelim = '\0';
|
|
*pSearchList = ( HB_PATHNAMES * ) hb_xgrab( sizeof( HB_PATHNAMES ) );
|
|
(*pSearchList)->szPath = pPath;
|
|
(*pSearchList)->fFree = fFree;
|
|
pSearchList = &(*pSearchList)->pNext;
|
|
pPath = pDelim + 1;
|
|
fFree = FALSE;
|
|
}
|
|
*pSearchList = ( HB_PATHNAMES * ) hb_xgrab( sizeof( HB_PATHNAMES ) );
|
|
(*pSearchList)->szPath = pPath;
|
|
(*pSearchList)->pNext = NULL;
|
|
(*pSearchList)->fFree = fFree;
|
|
}
|
|
|
|
/*
|
|
* free list of pathnames to search
|
|
*/
|
|
void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList )
|
|
{
|
|
HB_PATHNAMES * pNext;
|
|
|
|
/* Only the first path holds an allocated string.
|
|
All of the other paths in the list are part of
|
|
that first string. */
|
|
|
|
while( pSearchList )
|
|
{
|
|
if( pSearchList->fFree )
|
|
hb_xfree( pSearchList->szPath );
|
|
pNext = pSearchList->pNext;
|
|
hb_xfree( pSearchList );
|
|
pSearchList = pNext;
|
|
}
|
|
}
|
|
|
|
/* Split given filename into path, name and extension, plus determine drive */
|
|
PHB_FNAME hb_fsFNameSplit( char * pszFileName )
|
|
{
|
|
PHB_FNAME pFileName;
|
|
char * pszPos;
|
|
int iSize, iPos;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_fsFNameSplit(%s)", pszFileName));
|
|
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameSplit: Filename: |%s|\n", pszFileName));
|
|
|
|
iPos = iSize = hb_strnlen( pszFileName, _POSIX_PATH_MAX );
|
|
|
|
/* Grab memory, set defaults */
|
|
pFileName = ( PHB_FNAME ) hb_xgrab( sizeof( HB_FNAME ) );
|
|
|
|
pszPos = pFileName->szBuffer;
|
|
|
|
pFileName->szPath = pFileName->szName = pFileName->szExtension =
|
|
pFileName->szDrive = NULL;
|
|
|
|
/* Find the end of the path part, and find out where the
|
|
name+ext starts */
|
|
|
|
while( --iPos >= 0 )
|
|
{
|
|
if( strchr( OS_PATH_DELIMITER_LIST, pszFileName[ iPos ] ) )
|
|
{
|
|
pFileName->szPath = pszPos;
|
|
hb_strncpy( pszPos, pszFileName, iPos + 1 );
|
|
pszPos += iPos + 2;
|
|
pszFileName += iPos + 1;
|
|
iSize -= iPos + 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* From this point pszFileName will point to the name+ext part of the path */
|
|
/* Split the filename part to name and extension */
|
|
iPos = iSize;
|
|
while( --iPos > 0 )
|
|
{
|
|
if( pszFileName[ iPos ] == '.' )
|
|
{
|
|
pFileName->szExtension = pszPos;
|
|
hb_strncpy( pszPos, pszFileName + iPos, iSize - iPos );
|
|
pszPos += iSize - iPos + 1;
|
|
iSize = iPos;
|
|
break;
|
|
}
|
|
}
|
|
if( iSize )
|
|
{
|
|
pFileName->szName = pszPos;
|
|
hb_strncpy( pszPos, pszFileName, iSize );
|
|
pszPos += iSize + 1;
|
|
}
|
|
|
|
/* Duplicate the drive letter from the path for easy access on
|
|
platforms where applicable. Note that the drive info is always
|
|
present also in the path itself. */
|
|
|
|
if( pFileName->szPath )
|
|
{
|
|
iPos = 0;
|
|
while( iPos < HB_MAX_DRIVE_LENGTH && pFileName->szPath[ iPos ] != '\0' )
|
|
{
|
|
if( pFileName->szPath[ iPos ] == ':' )
|
|
{
|
|
pFileName->szDrive = pszPos;
|
|
hb_strncpy( pszPos, pFileName->szPath, iPos );
|
|
break;
|
|
}
|
|
++iPos;
|
|
}
|
|
}
|
|
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameSplit: szPath: |%s|\n", pFileName->szPath));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameSplit: szName: |%s|\n", pFileName->szName));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameSplit: szExt: |%s|\n", pFileName->szExtension));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameSplit: szDrive: |%s|\n", pFileName->szDrive));
|
|
|
|
return pFileName;
|
|
}
|
|
|
|
/* NOTE: szFileName buffer must be at least _POSIX_PATH_MAX long */
|
|
|
|
/* This function joins path, name and extension into a string with a filename */
|
|
char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName )
|
|
{
|
|
static char szPathSep[] = {OS_PATH_DELIMITER,0}; /* see NOTE below */
|
|
char * pszName;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_fsFNameMerge(%p, %p)", pszFileName, pFileName));
|
|
|
|
/* Set the result to an empty string */
|
|
pszFileName[ 0 ] = '\0';
|
|
|
|
/* Strip preceding path separators from the filename */
|
|
pszName = pFileName->szName;
|
|
if( pszName && pszName[ 0 ] != '\0' && strchr( OS_PATH_DELIMITER_LIST, pszName[ 0 ] ) != NULL )
|
|
pszName++;
|
|
|
|
/* Add path if specified */
|
|
if( pFileName->szPath )
|
|
hb_strncat( pszFileName, pFileName->szPath, _POSIX_PATH_MAX - 1 );
|
|
|
|
/*
|
|
NOTE: be _very_ careful about 'optimising' this next section code!
|
|
(specifically, initialising szPathSep) as MSVC with /Ni
|
|
(or anything that infers it like /Ox) will cause you trouble.
|
|
*/
|
|
|
|
/* If we have a path, append a path separator to the path if there
|
|
was none. */
|
|
if( pszFileName[ 0 ] != '\0' && ( pszName || pFileName->szExtension ) )
|
|
{
|
|
int iLen = strlen( pszFileName ) - 1;
|
|
|
|
if( strchr( OS_PATH_DELIMITER_LIST, pszFileName[ iLen ] ) == NULL )
|
|
{
|
|
/*
|
|
char szPathSep[2];
|
|
|
|
szPathSep[ 0 ] = OS_PATH_DELIMITER;
|
|
szPathSep[ 1 ] = '\0';
|
|
|
|
*/
|
|
hb_strncat( pszFileName, szPathSep, _POSIX_PATH_MAX - 1 );
|
|
}
|
|
}
|
|
|
|
/* Add filename (without extension) if specified */
|
|
if( pszName )
|
|
hb_strncat( pszFileName, pszName, _POSIX_PATH_MAX - 1 );
|
|
|
|
/* Add extension if specified */
|
|
if( pFileName->szExtension )
|
|
{
|
|
/* Add a dot if the extension doesn't have it */
|
|
if( pFileName->szExtension[ 0 ] != '\0' &&
|
|
pFileName->szExtension[ 0 ] != '.' )
|
|
hb_strncat( pszFileName, ".", _POSIX_PATH_MAX - 1 );
|
|
|
|
hb_strncat( pszFileName, pFileName->szExtension, _POSIX_PATH_MAX - 1 );
|
|
}
|
|
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameMerge: szPath: |%s|\n", pFileName->szPath));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameMerge: szName: |%s|\n", pFileName->szName));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameMerge: szExt: |%s|\n", pFileName->szExtension));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameMerge: szDrive: |%s|\n", pFileName->szDrive));
|
|
HB_TRACE(HB_TR_INFO, ("hb_fsFNameMerge: Filename: |%s|\n", pszFileName));
|
|
|
|
return pszFileName;
|
|
}
|