new linedit completion using new map implementation

important when loading (consult) large files with a lot of atoms (put in the completion table)
new files: completion.c and completion.h

NEWS

@@ -1,8 +1,11 @@
 Change in GNU Prolog version 1.6.0
 
 * fix issue #32: remove duplicate warning message
+* improve consult speed on large Prolog data bases
+  (use new map implementation to improve the linedit completion: new file completion.c)
 * improve compiler speed on large Prolog data bases
   (speed up generation of indexing instructions switch_on_atom/integer/structure)
+  (use new map implementation (based on red-black trees) for wam2ma and ma2asm)
 * speed up bind_variables/2 (also speed up the compiler for byte-code)
 * increase max vars in a term to 2^20 (MAX_VAR_IN_TERM) 
 * increase default Prolog stack sizes and MAX_ATOMS

src/BipsPl/le_interf_c.c

@@ -58,6 +58,8 @@
  * Global Variables                *
  *---------------------------------*/
 
+static ComplMatch compl_match;
+
 /*---------------------------------*
  * Function Prototypes             *
  *---------------------------------*/
@@ -133,26 +135,22 @@ Pl_Add_Linedit_Completion_1(WamWord compl_word)
 Bool
 Pl_Find_Linedit_Completion_2(WamWord prefix_word, WamWord compl_word)
 {
-  char *prefix = Pl_Rd_String_Check(prefix_word);
-  int nb_match, max_lg, is_last;
-  char *compl;
+  int prefix_atom = Pl_Rd_Atom_Check(prefix_word);
+  char *prefix = pl_atom_tbl[prefix_atom].name;
+  int prefix_length = pl_atom_tbl[prefix_atom].prop.length;
 
   Pl_Check_For_Un_Atom(compl_word);
 
-  if (Pl_LE_Compl_Init_Match(prefix, &nb_match, &max_lg) == NULL)
+  if (!Pl_LE_Compl_Match_First(&compl_match, prefix, prefix_length))
     return FALSE;
 
-  compl = Pl_LE_Compl_Find_Match(&is_last);
-
-  if (!is_last)			/* non deterministic case */
+  if (compl_match.nb_match > 1)			/* non deterministic case */
     {
       A(0) = compl_word;
-      Pl_Create_Choice_Point((CodePtr)
-			  Prolog_Predicate(FIND_LINEDIT_COMPLETION_ALT, 0),
-			  1);
+      Pl_Create_Choice_Point((CodePtr) Prolog_Predicate(FIND_LINEDIT_COMPLETION_ALT, 0), 1);
     }
 
-  return Pl_Get_Atom(Pl_Create_Atom(compl), compl_word);
+  return Pl_Get_Atom(Pl_Create_Atom(compl_match.cur_word), compl_word);
 }
 
 
@@ -166,18 +164,14 @@ Bool
 Pl_Find_Linedit_Completion_Alt_0(void)
 {
   WamWord compl_word;
-  int is_last;
-  char *compl;
-
-  Pl_Update_Choice_Point((CodePtr)
-		      Prolog_Predicate(FIND_LINEDIT_COMPLETION_ALT, 0), 0);
 
+  Pl_Update_Choice_Point((CodePtr) Prolog_Predicate(FIND_LINEDIT_COMPLETION_ALT, 0), 0);
   compl_word = AB(B, 0);
 
-  compl = Pl_LE_Compl_Find_Match(&is_last);
+  Pl_LE_Compl_Match_Next(&compl_match);
 
-  if (is_last)
+  if (compl_match.cur_no >= compl_match.nb_match - 1)
     Delete_Last_Choice_Point();
 
-  return Pl_Get_Atom(Pl_Create_Atom(compl), compl_word);
+  return Pl_Get_Atom(Pl_Create_Atom(compl_match.cur_word), compl_word);
 }

src/BipsPl/t.pl

@@ -213,24 +213,8 @@
 */
 
 
-
-
 /*
 
-lgt_current_output(S) :-
-	current_output(S), !.
-
-lgt_current_output(S) :-
-	current_stream(S), !,
-	fail.
-
-lgt_current_output(S) :-
-	set_bip_name(current_output, 1),
-	'$pl_err_existence'(stream, S).
-
-*/
-
-
 :- multifile(p/0).
 :- dynamic(p/0).
 
@@ -239,8 +223,11 @@
 
 
 %:- initialization((trace, p)).
-%foo:-write(a),write(b),nl.
 
+*/
+%foo:-write(a),write(b),nl. % %
+
+/*
 test(Goal) :-
 	open('/tmp/foo.out', write, Stream),
 	set_output(Stream),
@@ -325,3 +312,8 @@
 
 m :-
 	exec(ls, null, user_output, null).
+*/
+
+:- multifile(p/0).
+
+p.

src/BipsPl/top_level_c.c

@@ -107,8 +107,9 @@ Pl_Set_Ctrl_C_Handler_0(void)
 
 
 
+
 /*-------------------------------------------------------------------------*
- * CTRL_C_MANAGER                                                          *
+ * PL_SAVE_REGS_FOR_SIGNAL                                                 *
  *                                                                         *
  *-------------------------------------------------------------------------*/
 void

src/EnginePl/engine.c

@@ -198,17 +198,17 @@ Pl_Start_Prolog(int argc, char *argv[])
   /* must be changed to store global info (see the debugger) */
   heap_actual_start = Global_Stack;
 
-  Pl_Init_Atom();
-  Pl_Init_Pred();
-  Pl_Init_Oper();
-
   pl_le_mode = 0;	/* not compiled with linedit or deactivated (using env var) */
 
 #ifndef NO_USE_LINEDIT
   if (pl_le_initialize != NULL)
     pl_le_mode = (*pl_le_initialize)();
 #endif
 
+  Pl_Init_Atom();
+  Pl_Init_Pred();
+  Pl_Init_Oper();
+
   if (copy_of_pl_init_stream_supp)
     (*copy_of_pl_init_stream_supp)();
 

src/Linedit/.gitignore

@@ -6,6 +6,7 @@ lccmake
 makefile.lcc
 test_linedit
 test_noecho
+completion
 
 
 

src/Linedit/Makefile.in

@@ -7,7 +7,7 @@ AR_RC                = @AR_RC@
 RANLIB               = @RANLIB@
 
 LIBNAME = $(LIB_LINEDIT)
-OBJLIB  = linedit@OBJ_SUFFIX@ terminal@OBJ_SUFFIX@ ctrl_c@OBJ_SUFFIX@
+OBJLIB  = linedit@OBJ_SUFFIX@ terminal@OBJ_SUFFIX@ ctrl_c@OBJ_SUFFIX@ completion@OBJ_SUFFIX@ ../Tools/rbtree@OBJ_SUFFIX@
 
 .SUFFIXES:
 .SUFFIXES: @OBJ_SUFFIX@ .c $(SUFFIXES)
@@ -28,6 +28,11 @@ terminal@OBJ_SUFFIX@: terminal.h
 
 linedit@OBJ_SUFFIX@: linedit.h terminal.h ctrl_c.h
 
+completion@OBJ_SUFFIX@: completion.h ../Tools/map_rbtree.h
+
+../Tools/rbtree@OBJ_SUFFIX@:
+	(cd ../Tools; $(MAKE))
+
 
 clean:
 	rm -f *@OBJ_SUFFIX@ *.ilk *.pdb *.pch *.idb *.exp $(LIBNAME)