Merge branch 'master' of ssh://ssh.dcc.fc.up.pt:31064/home/vsc/yap

C/modules.c

@@ -24,7 +24,7 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "Yatom.h"
 
-static Int currgent_module(USES_REGS1);
+static Int current_module(USES_REGS1);
 static Int current_module1(USES_REGS1);
 static ModEntry *LookupModule(Term a);
 static ModEntry *LookupSystemModule(Term a);

C/utilpreds.c

@@ -52,6 +52,7 @@ typedef struct non_single_struct_t {
 	}\
 	LIST0;\
 	ptd0 = RepPair(d0);\
+	if (*ptd0 == TermFreeTerm) continue;\
 	to_visit->pt0 = pt0;\
 	to_visit->pt0_end = pt0_end;\
 	to_visit->ptd0 = ptd0;\
@@ -59,7 +60,7 @@ typedef struct non_single_struct_t {
 	to_visit ++;\
 	d0 = ptd0[0];\
 	pt0 = ptd0;\
-	*ptd0 = TermNil;\
+	*ptd0 = TermFreeTerm;\
 	pt0_end = pt0 + 1;\
 	goto   list_loop;\
       } else if (IsApplTerm(d0)) {\
@@ -2269,9 +2270,8 @@ static Term free_vars_in_complex_term(register CELL *pt0, register CELL *pt0_end
     *to_visit = Malloc(1024*sizeof( struct non_single_struct_t)),
     *to_visit0 = to_visit,
     *to_visit_max = to_visit+1024;
+  Term o = TermNil;
   CELL *InitialH = HR;
-  *HR++ = MkAtomTerm(AtomDollar);
-
   to_visit0 = to_visit;
  restart:
   while (pt0 < pt0_end) {
@@ -2284,7 +2284,7 @@ static Term free_vars_in_complex_term(register CELL *pt0, register CELL *pt0_end
     deref_head(d0, vars_within_term_unk);
   vars_within_term_nvar:
     {
-      WALK_COMPLEX_TERM()
+      WALK_COMPLEX_TERM();
        continue;
     }
 
@@ -2293,10 +2293,13 @@ static Term free_vars_in_complex_term(register CELL *pt0, register CELL *pt0_end
     *ptd0 = TermNil;
     /* leave an empty slot to fill in later */
     if (HR+1024 > ASP) {
+      o = TermNil;
       goto global_overflow;
     }
     HR[0] =  (CELL)ptd0;
-    HR ++;
+    HR[1] = o;
+    o = AbsPair(HR);
+    HR += 2;
     /* next make sure noone will see this as a variable again */
     if (TR > (tr_fr_ptr)LOCAL_TrailTop - 256) {
       /* Trail overflow */
@@ -2318,13 +2321,8 @@ static Term free_vars_in_complex_term(register CELL *pt0, register CELL *pt0_end
   }
 
   clean_tr(TR0 PASS_REGS);
-pop_text_stack(lvl);
- if (HR > InitialH+1) {
-    InitialH[0] = (CELL)Yap_MkFunctor(AtomDollar, (HR-InitialH)-1);
-    return AbsAppl(InitialH);
-  } else {
-    return MkAtomTerm(AtomDollar);
-  }
+  pop_text_stack(lvl);
+  return o;
 
  
   def_trail_overflow();

packages/clpqr/clpq/itf_q.pl

@@ -62,7 +62,7 @@
 	[
 	    class_drop/2
 	]).
-
+
 do_checks(Y,Ty,St,Li,Or,Cl,No,Later) :-
 	numbers_only(Y),
 	verify_nonzero(No,Y),
@@ -76,7 +76,7 @@ numbers_only(Y) :-
 	;   throw(type_error(_X = Y,2,'a rational number',Y))
 	),
 	!.
-
+ø
 % verify_nonzero(Nonzero,Y)
 %
 % if Nonzero = nonzero, then verify that Y is not zero

packages/clpqr/clpqr/geler.pl

@@ -43,6 +43,10 @@
 	    project_nonlin/3,
 	    collect_nonlin/3
 	]).
+:- use_module(library(maplist),
+	      [
+	       maplist/2
+	      ]).
 
 % l2conj(List,Conj)
 %

packages/clpqr/clpqr/itf.pl

@@ -47,6 +47,10 @@
 	    dump_nonzero/3,
 	    clp_type/2
 	]).
+:- use_module(library(maplist),
+	      [
+	       maplist/2
+	      ]).
 
 
 clp_type(Var,Type) :-

packages/clpqr/clpr/itf_r.pl

@@ -63,6 +63,10 @@
 	[
 	    class_drop/2
 	]).
+:- use_module(library(maplist),
+	      [
+	       maplist/2
+	      ]).
 
 do_checks(Y,Ty,St,Li,Or,Cl,No,Later) :-
 	numbers_only(Y),