Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

C/utilpreds.c

@@ -4514,17 +4514,27 @@ unnumber_complex_term(CELL *pt0, CELL *pt0_end, CELL *ptf, CELL *HLow, int share
 	    if (ASP-(max+1) <= H) {
 	      goto overflow;
 	    }
-	    /* we found this before */
+	    /* we found this before? */
+	    if (ASP[-id-1])
 	      *ptf++ = ASP[-id-1];
+	    else {
+	      RESET_VARIABLE(ptf);
+	      ASP[-id-1] = (CELL)ptf;
+	      ptf++;
+	    }
 	    continue;
 	  }
-	  max = id;
+	  /* alloc more space */
-	  if (ASP-(max+1) <= H) {
+	  if (ASP-(id+1) <= H) {
 	    goto overflow;
 	  }
+	  while (id > max) {
+	    ASP[-(id+1)] = 0L;
+	    max++;
+	  }
 	  /* new variable */
 	  RESET_VARIABLE(ptf);
-	  ASP[-id-1] = (CELL)ptf;
+	  ASP[-(id+1)] = (CELL)ptf;
 	  ptf++;
 	  continue;
 	}

Makefile.in

@@ -709,6 +709,7 @@ all: startup.yss
 	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
 	@ENABLE_CPLINT@ (cd packages/cplint/slipcase; $(MAKE))
+	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE))
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE))
 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
@@ -785,6 +786,8 @@ install_unix: startup.yss libYap.a
 	$(INSTALL) YapTermConfig.h $(DESTDIR)$(INCLUDEDIR)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
 	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) install)
+	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install)
+	@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) install)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install)
 
@@ -835,6 +838,8 @@ install_win32: startup.yss @ENABLE_WINCONSOLE@ pl-yap@EXEC_SUFFIX@
 	@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
 	@ENABLE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
+	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) install)
+	@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) install)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd_lfi; $(MAKE) install)
 
@@ -894,6 +899,8 @@ clean: clean_docs
 	@ENABLE_MINISAT@ (cd packages/swi-minisat2; $(MAKE) clean)
 	@ENABLE_CLPBN_BP@ (cd packages/CLPBN/clpbn/bp; $(MAKE) clean)
 	@ENABLE_ZLIB@ @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) clean)
+	@ENABLE_PRISM@ (cd packages/prism/src/c; $(MAKE) clean)
+	@ENABLE_PRISM@ (cd packages/prism/src/prolog; $(MAKE) clean)
 	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE) clean)
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) clean)
 	@ENABLE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) clean)

configure

@@ -615,6 +615,7 @@ IN_SWI
 IN_YAP
 PROLOG_SYSTEM
 M4GENABSMI
+INSTALL_PRISM
 MATLAB_INCLUDE
 INSTALL_MATLAB
 EXTRA_LIBS_FOR_R
@@ -790,6 +791,7 @@ enable_max_memory
 enable_debug_yap
 enable_eam
 enable_cygwin
+enable_prism
 enable_dynamic_loading
 enable_static_compilation
 enable_use_malloc
@@ -1463,6 +1465,7 @@ Optional Features:
  --enable-debug-yap         enable C-debugging for YAP
  --enable-eam               enable EAM on YAP
  --enable-cygwin            use cygwin library in WIN32
+ --enable-prism            use PRISM system in YAP
  --enable-dynamic-loading   compile YAP as a DLL
  --enable-static-compilation   compile YAP statically
  --enable-use-malloc        use malloc to allocate memory
@@ -4486,6 +4489,13 @@ else
   cygwin=no
 fi
 
+# Check whether --enable-prism was given.
+if test "${enable_prism+set}" = set; then :
+  enableval=$enable_prism; prism="$enableval"
+else
+  prism=yes
+fi
+
 # Check whether --enable-dynamic_loading was given.
 if test "${enable_dynamic_loading+set}" = set; then :
   enableval=$enable_dynamic_loading; dynamic_loading="$enableval"
@@ -4922,6 +4932,13 @@ _ACEOF
 fi
 
 
+if test "$yap_cv_prism" = no
+then
+  INSTALL_PRISM="@# "
+else
+  INSTALL_PRISM=""
+fi
+
 if test "$yap_cv_matlab" = no
 then
   INSTALL_MATLAB="@# "
@@ -8784,6 +8801,7 @@ fi
 
 
 
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5

configure.in

@@ -153,6 +153,9 @@ AC_ARG_ENABLE(eam,
 AC_ARG_ENABLE(cygwin,
 	[ --enable-cygwin            use cygwin library in WIN32 ],
 	cygwin="$enableval", cygwin=no)
+AC_ARG_ENABLE(prism,
+	[ --enable-prism            use PRISM system in YAP ],
+	prism="$enableval", prism=yes)
 AC_ARG_ENABLE(dynamic_loading,
 	[ --enable-dynamic-loading   compile YAP as a DLL ],
 	dynamic_loading="$enableval", dynamic_loading=no)
@@ -453,6 +456,13 @@ else
 fi
 
 
+if test "$yap_cv_prism" = no 
+then
+  INSTALL_PRISM="@# "
+else
+  INSTALL_PRISM=""
+fi
+
 dnl condor does not like dynamic linking on Linux, DEC, and HP-UX platforms.
 if test "$yap_cv_matlab" = no 
 then
@@ -1711,6 +1721,7 @@ AC_SUBST(YAPR_INCLUDES)
 AC_SUBST(EXTRA_LIBS_FOR_R)
 AC_SUBST(INSTALL_MATLAB)
 AC_SUBST(MATLAB_INCLUDE)
+AC_SUBST(INSTALL_PRISM)
 
 dnl check for threaded code
 AC_MSG_CHECKING(for gcc threaded code)

packages/YapR

@@ -1 +1 @@
-Subproject commit f218eaacc9ef3922829ff4a8c5cd64cca9c19dc7
+Subproject commit 27b398187116aaa5c6b687d1abe79b0a270381bb

packages/prism/src/c/Makefile.in

@@ -16,6 +16,7 @@ BINDIR = $(EROOTDIR)/bin
 #
 # where YAP should look for libraries
 #
+TARGETS=	prism.@SO@
 LIBDIR=@libdir@
 YAPLIBDIR=@libdir@/Yap
 YAP_EXTRAS=@YAP_EXTRAS@ -D_YAP_NOT_INSTALLED_=1  -D__YAP_PROLOG__=1
@@ -38,6 +39,7 @@ SO=@SO@
 #4.1VPATH=@srcdir@:@srcdir@/OPTYap
 CWD=$(PWD)
 #
+RM=rm -f
 
 ##----------------------------------------------------------------------
 
@@ -71,9 +73,9 @@ mp/%.o: $(srcdir)/mp/%.c
 @DO_SECOND_LD@prism.@SO@: $(OBJS)
 @DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $(OBJS)  @EXTRA_LIBS_FOR_DLLS@
 
-all: $(TARGET)
+all: $(TARGETS)
 
-install: $(TARGET)
+install: $(TARGETS)
 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
 
 clean: clean_subdirs
@@ -81,7 +83,7 @@ clean: clean_subdirs
 
 clean_subdirs:
 	for i in $(SUBDIRS); do                     \
-	  ($(MAKE) -f $(MAKEFILE) -C $$i clean )    \
+	  $(RM) $$i/*.o;                            \
 	done
 
 ##----------------------------------------------------------------------

packages/prism/src/c/up/graph.c

@@ -797,7 +797,7 @@ int pc_import_occ_switches_3(void)
 	  /* running out of stack */
 	  extern int Yap_gcl(UInt gc_lim, Int predarity, CELL *current_env, yamop *nextop);
 
-	  Yap_gcl(4*64*1024, 3, ENV, P);
+	  Yap_gcl(4*64*1024, 3, ENV, CP);
 	  goto restart;
 	}
 #endif