[frontierkernel-commits] Frontier/Common/headers lang.h,1.4.2.8,1.4.2.9 tableinternal.h,1.1.2.1,1.1.2.2

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

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

Modified Files:
      Tag: New_Tables_Experiment-branch
	lang.h tableinternal.h 
Log Message:
Moved table sorting functions from tablecompare.c to hashcompare.c and made some minor optimizations. By default, tables are now always sorted by name, even during startup before the UserTalk interpreter is fully initialized.

Index: lang.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -d -r1.4.2.8 -r1.4.2.9
*** lang.h	3 Dec 2004 13:09:10 -0000	1.4.2.8
--- lang.h	4 Dec 2004 22:23:38 -0000	1.4.2.9
***************
*** 475,478 ****
--- 475,483 ----
  
  
+ #define sortbyname 0 /*values for tyhashtable.sortorder*/
+ #define sortbyvalue 1
+ #define sortbykind 2
+ 
+ 
  typedef struct tyhashtable {
  	
***************
*** 631,635 ****
  typedef boolean (*langsymbolchangedcallback) (hdlhashtable, const bigstring, hdlhashnode, boolean);
  
! typedef short (*langcomparenodescallback)(hdlhashtable, hdlhashnode, hdlhashnode);
  
  typedef boolean (*langhashnodetreenodecallback)(hdlhashnode, hdltreenode *);
--- 636,640 ----
  typedef boolean (*langsymbolchangedcallback) (hdlhashtable, const bigstring, hdlhashnode, boolean);
  
! //typedef short (*langcomparenodescallback)(hdlhashtable, hdlhashnode, hdlhashnode); /*2004-12-04 aradke: not used anymore*/
  
  typedef boolean (*langhashnodetreenodecallback)(hdlhashnode, hdltreenode *);
***************
*** 666,670 ****
  	langsymbolinsertedcallback symbolinsertedcallback;
  	
! 	langcomparenodescallback comparenodescallback;
  	
  	langtreenodecallback debuggercallback;
--- 671,675 ----
  	langsymbolinsertedcallback symbolinsertedcallback;
  	
! 	//langcomparenodescallback comparenodescallback; /*2004-12-04 aradke: not used anymore*/
  	
  	langtreenodecallback debuggercallback;

Index: tableinternal.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/tableinternal.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** tableinternal.h	20 Nov 2004 23:03:19 -0000	1.1.2.1
--- tableinternal.h	4 Dec 2004 22:23:38 -0000	1.1.2.2
***************
*** 52,60 ****
  
  
- #define sortbyname 0 /*values for "sortorder"*/
- #define sortbyvalue 1
- #define sortbykind 2
- 
- 
  #define tablestringlist 165
  #define systemtabletypestring 1
--- 52,55 ----
***************
*** 131,138 ****
--- 126,141 ----
  
  
+ #if 0
+ 
+ /*
+ 2004-12-04 aradke: temporarily overriding the sort order is no longer supported
+ */
+ 
  extern void tableoverridesort (hdlhashnode); /*tablecompare.c*/
  
  extern void tablerestoresort (void);
  
+ #endif
+ 
  
  extern boolean tableeditsetglobals (void); /*tableedit.c*/