33ccad6661
* harbour/tests/codebl.prg
* harbour/tests/langmsg.prg
* harbour/utils/hbpptest/pp_test.prg
* harbour/utils/hbpptest/pretest.prg
* harbour/samples/pe/license.txt
* removed carriage return (\r) characters
* harbour/include/hbcomp.h
* harbour/include/hbapi.h
* harbour/include/hbcompdf.h
* harbour/include/hbexprb.c
* harbour/include/hbexprop.h
* harbour/source/vm/macro.c
* harbour/source/compiler/hbcomp.c
* harbour/source/compiler/complex.c
* harbour/source/compiler/harbour.c
* harbour/source/compiler/harbour.l
* harbour/source/compiler/harbour.y
* harbour/source/compiler/genjava.c
* harbour/source/compiler/hbcomp.c
* harbour/source/compiler/hbident.c
* harbour/source/compiler/hbpcode.c
* harbour/source/compiler/ppcomp.c
* separated HB_COMP and HB_MACRO definitions and added HB_COMMON
structure used when HB_COMMON_SUPPORT macro is set
* hide HB_MACRO internal definitions in hbapi.h when HB_MACRO_SUPPORT
is not set
These modifications should help in future compiler and macro compiler
integration into single binary.
+ added clipper compatible error message in unclosed structures
In general we should cleanup rules to make error reporting more
user friendly and Clipper compatible
% eliminated unnecessary allocations
+ added int mode member to common part of HB_COMP and HB_MACRO
structure. It's initialized to HB_MODE_MACRO or HB_MODE_COMPILER
+ add TOFIX note about memory leaks in cParamTypes and pParamClasses
members of COMDECLARED structure. It's a part of unfinished strong
typing code. I do not know what Ryszard plan to do with it so I'm
leaving it as is. The part of strong typing which were operating
on emulated HVM stack has been removed.
* removed static variables from genjava.c. Also gencli.c and genobj32.c
should be fixed but this will not make this code working so I haven't
touched it.
* changed 3-rd parameter of hb_compIdentifierNew() from BOOL to int.
Now it can have the following values: HB_IDENT_STATIC, HB_IDENT_FREE,
HB_IDENT_COPY. This modification will allow in the future using common
for static and dynamic symbol hash table without additional source code
changes. I also plan to use identifier hash table in PP the reduce
number of memory allocations and speed-up preprocessing by using
second level hashing for hash keys.
* harbour/source/common/expropt1.c
* harbour/source/common/expropt2.c
* changed HB_MACRO_SUPPORT to HB_COMMON_SUPPORT to automatically detect
possible conflicts between compiler and macro compiler
! removed first detected conflict which existed for long time
+ added hb_compExprMacroAsAlias() function to convert HB_ET_VARIABLE
expression to HB_ET_ALIAS.
* harbour/source/macro/macro.y
! fixed using prefix¯o-> and ¯o.sufix-> when macro cannot be
substituted by compiler, f.e.:
M->v := NIL
x := "&v.1->fld"
M->v := "v"
M->v1:= "data"
? &x
! fixed memory leak in macro substituted expression compilation
* harbour/source/vm/macro.c
! fixed initialization of some HB_MACRO members
! fixed value returned for type("&V->F") when alias does not exist
- removed not longer used hb_comp_bShortCuts global variable
111 lines
2.9 KiB
C
111 lines
2.9 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The cache for identifiers
|
|
*
|
|
* Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
|
|
* 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/).
|
|
*
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include "hbhash.h"
|
|
#include "hbcomp.h"
|
|
|
|
#define HB_IDENT_TABLE_SIZE 509UL
|
|
|
|
/* create a new identifier or return the existing one
|
|
*/
|
|
char * hb_compIdentifierNew( HB_COMP_DECL, char * szName, int iType )
|
|
{
|
|
char * szIdent;
|
|
|
|
szIdent = ( char * ) hb_hashTableFind( HB_COMP_PARAM->pIdentifiers,
|
|
( void * ) szName );
|
|
if( !szIdent )
|
|
{
|
|
/*
|
|
* In the future we may want direct support for static identifiers
|
|
* so it will not be necessary to allocate separate buffer for them
|
|
*/
|
|
if( iType == HB_IDENT_COPY || iType == HB_IDENT_STATIC )
|
|
szIdent = hb_strdup( szName );
|
|
else
|
|
szIdent = szName;
|
|
|
|
hb_hashTableAdd( HB_COMP_PARAM->pIdentifiers,
|
|
( void * ) szIdent, ( void * ) szIdent );
|
|
}
|
|
else if( iType == HB_IDENT_FREE )
|
|
hb_xfree( szName );
|
|
|
|
return szIdent;
|
|
}
|
|
|
|
/* returns a hash key */
|
|
static HB_HASH_FUNC( hb_comp_IdentKey ) /* ULONG func (void *Value, void *Cargo) */
|
|
{
|
|
ULONG ulSum = 0;
|
|
char *szName = ( char * )Value;
|
|
|
|
while( *szName )
|
|
ulSum += *szName++;
|
|
|
|
HB_SYMBOL_UNUSED( HashPtr );
|
|
HB_SYMBOL_UNUSED( Cargo );
|
|
|
|
return ulSum % HB_IDENT_TABLE_SIZE;
|
|
}
|
|
|
|
/* deletes an identifier */
|
|
static HB_HASH_FUNC( hb_comp_IdentDel )
|
|
{
|
|
hb_xfree( Value );
|
|
HB_SYMBOL_UNUSED( HashPtr );
|
|
HB_SYMBOL_UNUSED( Cargo );
|
|
return 1;
|
|
}
|
|
|
|
/* compares two identifiers */
|
|
static HB_HASH_FUNC( hb_comp_IdentComp )
|
|
{
|
|
HB_SYMBOL_UNUSED( HashPtr );
|
|
return strcmp( (char *)Value, (char *)Cargo );
|
|
}
|
|
|
|
/* initialize the hash table for identifiers */
|
|
void hb_compIdentifierOpen( HB_COMP_DECL )
|
|
{
|
|
HB_COMP_PARAM->pIdentifiers = hb_hashTableCreate( HB_IDENT_TABLE_SIZE,
|
|
hb_comp_IdentKey, hb_comp_IdentDel, hb_comp_IdentComp );
|
|
}
|
|
|
|
/* release identifiers table */
|
|
void hb_compIdentifierClose( HB_COMP_DECL )
|
|
{
|
|
if( HB_COMP_PARAM->pIdentifiers )
|
|
{
|
|
hb_hashTableKill( HB_COMP_PARAM->pIdentifiers );
|
|
HB_COMP_PARAM->pIdentifiers = NULL;
|
|
}
|
|
}
|