[Xsb-commits] CVS: XSB/emu builtin.c, 1.345, 1.346 psc_defs.h, 1.13, 1.14

[Terrance S. <ts...@us...>]

Update of /cvsroot/xsb/XSB/emu
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4956

Modified Files:
	builtin.c psc_defs.h 
Log Message:

Forgot to commit these when expanding predicate property for various
types of tabling.



Index: builtin.c
===================================================================
RCS file: /cvsroot/xsb/XSB/emu/builtin.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- builtin.c	22 Jun 2010 23:50:47 -0000	1.345
+++ builtin.c	31 Jul 2010 17:29:08 -0000	1.346
@@ -2215,7 +2215,7 @@
   }
   case PSC_TABLED: {	/* reg 1: +PSC; reg 2: -int */
     Psc psc = (Psc)ptoc_addr(1);
-    ctop_int(CTXTc 2, (get_tabled(psc)?TRUE:FALSE));  //(Integer)get_tip(CTXTc psc));
+    ctop_int(CTXTc 2, get_tabled(psc));  // Returns both bits -- subsumptive / variant
     break;
   }
   case PSC_SET_TABLED: {	/* reg 1: +PSC; reg 2: +int */

Index: psc_defs.h
===================================================================
RCS file: /cvsroot/xsb/XSB/emu/psc_defs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psc_defs.h	25 Nov 2009 16:51:57 -0000	1.13
+++ psc_defs.h	31 Jul 2010 17:29:09 -0000	1.14
@@ -69,6 +69,9 @@
 #define T_IMPORTED 2
 #define T_GLOBAL   4
 
+#define T_VARIANT      8
+#define T_SUBSUMPTIVE  4
+#define T_TABLED_UNDETERMINED 12
 
 /* Global module */