[frontierkernel-commits] Frontier/Common/headers frontierdefs.h,1.3,1.4 lang.h,1.5,1.6 langinternal.h,1.4,1.5

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22241

Modified Files:
	frontierdefs.h lang.h langinternal.h 
Log Message:
Rollback previous revision which was supposed to go into the New_Tables_Experiment-branch only.


Index: lang.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lang.h	10 Nov 2004 16:18:29 -0000	1.5
--- lang.h	10 Nov 2004 18:18:24 -0000	1.6
***************
*** 437,446 ****
  	byte ctlocks: 8;
  	
- 	#ifdef flv10tables
- 	
- 	unsigned long hashval; /*2004-11-10 aradke: cache of hashfunction(hashkey)*/
- 
- 	#endif
- 	
  	byte hashkey []; /*the identifier of this table element, lives in extension of record*/
  	
--- 437,440 ----
***************
*** 450,474 ****
  #define HNoNode ((hdlhashnode) -1)
  #define gethashkey(h,bs)	copystring ((**h).hashkey, bs);
- 
- 	
- #ifdef flv10tables
- 
- 	#define ctinitialbuckets 11
- 	
- 	typedef hdlhashnode **hdlhashbucketarray;
- 	
- 	#define nthhashbucket(ht,i)	((*((**(ht)).hbuckets))[i])
- 	
- 	#define gethashbucketcount(ht)	((**(ht)).ctbuckets)
- 
- #else
- 
- 	#define ctbuckets 11 /*should be a prime number?*/
  	
- 	#define nthhashbucket(ht,i)	((**(ht)).hashbucket[i])
- 	
- 	#define gethashbucketcount(ht)	ctbuckets
  
! #endif
  
  
--- 444,450 ----
  #define HNoNode ((hdlhashnode) -1)
  #define gethashkey(h,bs)	copystring ((**h).hashkey, bs);
  	
  
! #define ctbuckets 11 /*should be a prime number?*/
  
  
***************
*** 478,493 ****
  typedef struct tyhashtable {
  	
- 	#ifdef flv10tables
- 	
- 	unsigned long ctbuckets;
- 	
- 	hdlhashbucketarray hbuckets;
- 	
- 	#else
- 	
  	hdlhashnode hashbucket [ctbuckets];
! 
! 	#endif
! 
  	hdlhashnode hfirstsort; /*the alphabetically-first hash node*/
  	
--- 454,459 ----
  typedef struct tyhashtable {
  	
  	hdlhashnode hashbucket [ctbuckets];
! 	
  	hdlhashnode hfirstsort; /*the alphabetically-first hash node*/
  	

Index: frontierdefs.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** frontierdefs.h	10 Nov 2004 16:21:21 -0000	1.3
--- frontierdefs.h	10 Nov 2004 18:18:23 -0000	1.4
***************
*** 76,81 ****
  #undef lazythis_optimization
  #undef langexternalfind_optimization
- #define flv10tables 1			/* 2004-11-10 aradke: for new hash table implementation [EXPERIMENTAL] */
- 
  #define PASCALSTRINGVERSION 1
  #define SPEED 1
--- 76,79 ----

Index: langinternal.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langinternal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langinternal.h	10 Nov 2004 16:18:30 -0000	1.4
--- langinternal.h	10 Nov 2004 18:18:24 -0000	1.5
***************
*** 416,424 ****
  extern boolean hashflushcache (long *); /*langhash.h*/
  
! #ifdef flv10tables
! 	extern unsigned long hashfunction (const bigstring); /* 2004-11-10 aradke */
! #else
! 	extern short hashfunction (const bigstring);
! #endif
  
  extern boolean hashresolvevalue (hdlhashtable, hdlhashnode);
--- 416,420 ----
  extern boolean hashflushcache (long *); /*langhash.h*/
  
! extern short hashfunction (const bigstring);
  
  extern boolean hashresolvevalue (hdlhashtable, hdlhashnode);