diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 970bdf8561..c361cc3d76 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,15 @@ +2000-07-10 20:25 UTC+0800 Ron Pinkas + * include/hbcomp.h + * source/compiler/harbour.y + * source/compiler/hbgenerr.c + - Removed hb_comp_szFile + + * source/compiler/harbour.slx + * Reduced aStrings and YY_BUF_SIZE to 2048 + + * source/compiler/simplex.c + + Added RTL license exception. + 2000-07-10-22:20 Luiz Rafael Culik *contrib/hbzlib/zipfile2.c +hb___GetNumbersofFilestoUnzip(char *szFile) internal function that returns @@ -24,10 +36,10 @@ *include/hbcomp.h * added a forward declaration to comiple with Watcom C/C++ - + *source/compiler/harbour.c * added missing declaration of hb_compReleaseStrings() - + *source/rtl/errorapi.c * error objects created during error launching called internally are locked to prevent deallocation by the GC @@ -51,7 +63,6 @@ * during sweep phase the items are checked only once to prevent recursive loops ->>>>>>> 1.2397 2000-07-09 01:02 UTC+0800 Ron Pinkas * include/hbcomp.h + Added: external BOOL hb_comp_bSimpLex diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 4a37977e50..e837c6bfcc 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -416,7 +416,6 @@ extern void hb_compGenObj32( PHB_FNAME ); /* generates OBJ 32 bits */ */ extern int hb_comp_iLine; extern int hb_comp_iCompiled; -extern char * hb_comp_szFile; extern FUNCTIONS hb_comp_functions; extern FUNCTIONS hb_comp_funcalls; extern SYMBOLS hb_comp_symbols; diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx index 05eecae2d7..e265b5c20d 100644 --- a/harbour/source/compiler/harbour.slx +++ b/harbour/source/compiler/harbour.slx @@ -46,7 +46,7 @@ static int iTexts = 0, iStrings = 0, iString; static char * aTexts[256]; -static char * aStrings[16384]; +static char * aStrings[2048]; static char * pString; /* ----------------------------------------------------- Language Definitions. ---------------------------------------------------- */ diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index 049a9701b9..39f60473e5 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -241,23 +241,23 @@ Main : { hb_compLinePush(); } Source { } ; Source : Crlf { hb_comp_EOL = FALSE; } - | VarDefs { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | FieldsDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | MemvarDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Declaration { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Function { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Statement { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Line { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } + | VarDefs { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | FieldsDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | MemvarDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | Declaration { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | Function { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | Statement { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } + | Line { hb_comp_EOL = FALSE; hb_comp_iCompiled = 2; } | ProcReq { hb_comp_EOL = FALSE; } | error Crlf { hb_comp_EOL = FALSE; yyclearin; } | Source Crlf { hb_comp_EOL = FALSE; } - | Source VarDefs { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source FieldsDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source MemvarDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source Declaration { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source Function { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source Statement { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } - | Source Line { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; hb_comp_szFile = hb_strdup( hb_comp_files.pLast->szFileName ); } + | Source VarDefs { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source FieldsDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source MemvarDef { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source Declaration { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source Function { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source Statement { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } + | Source Line { hb_comp_EOL = FALSE; hb_comp_iCompiled = hb_comp_files.pLast->iLine - 1; } | Source ProcReq { hb_comp_EOL = FALSE; } | Source error Crlf { hb_comp_EOL = FALSE; yyclearin; } ; diff --git a/harbour/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c index c9e79fcd42..6e7a788a0a 100644 --- a/harbour/source/compiler/hbgenerr.c +++ b/harbour/source/compiler/hbgenerr.c @@ -129,7 +129,7 @@ void hb_compGenError( char * szErrors[], char cPrefix, int iError, char * szErro if( cPrefix != 'F' && hb_comp_bError ) return; - printf( "\r%s(%i) ", hb_comp_szFile, iLine ); + printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, iLine ); printf( "Error %c%04i ", cPrefix, iError ); printf( szErrors[ iError - 1 ], szError1, szError2 ); @@ -154,7 +154,7 @@ void hb_compGenWarning( char * szWarnings[], char cPrefix, int iWarning, char * if( ( szText[ 0 ] - '0' ) <= hb_comp_iWarnings ) { - printf( "\r%s(%i) ", hb_comp_szFile, iLine ); + printf( "\r%s(%i) ", hb_comp_files.pLast->szFileName, iLine ); printf( "Warning %c%04i ", cPrefix, iWarning ); printf( szText + 1, szWarning1, szWarning2 ); diff --git a/harbour/source/compiler/simplex.c b/harbour/source/compiler/simplex.c index f774343639..9646c1e7d4 100644 --- a/harbour/source/compiler/simplex.c +++ b/harbour/source/compiler/simplex.c @@ -7,6 +7,11 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version, with one exception: * + * The exception is that if you link this file with other files to produce + * an executable, this does not by itself causes 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 this file. + * * 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