[Xsb-commits] CVS: XSB/packages/altCDF cdf_cdf.P,1.2,1.3 cdf_components.P,1.5,1.6 cdf_config.P,1.4,1.5 cdf_init_cdf.P,1.9,1.10

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

Update of /cvsroot/xsb/XSB/packages/altCDF
In directory sc8-pr-cvs1:/tmp/cvs-serv25861

Modified Files:
	cdf_cdf.P cdf_components.P cdf_config.P cdf_init_cdf.P 
Log Message:
This version for Luis.


Index: cdf_cdf.P
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/altCDF/cdf_cdf.P,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cdf_cdf.P	20 May 2003 22:02:55 -0000	1.2
+++ cdf_cdf.P	27 May 2003 20:39:54 -0000	1.3
@@ -3,12 +3,9 @@
 :- export make_cdf_dirty/1, make_cdf_clean/0,
 	  cdf_update_list/1,  cdf_dont_use_cache/0, cdf_use_cache/0.
 
-%:- import assert_cdf/1, retractall_cdf/1 from cdf_init_cdf.
 :- import assert_cdf/1, retractall_cdf/1 from usermod.
 
-:- import call_assert/1 from cdf_utilities.
-
-:- import cdf_dirty/1, caching_cdf/1 from usermod.
+:- import cdf_flags/2, caching_cdf/1 from usermod.
 
 cdf_dont_use_cache.
 cdf_use_cache.
@@ -21,14 +18,8 @@
 	(Name == 'CDF' -> 
 	    true
 	  ; 
-	    call_assert(cdf_dirty(Name)) ).
-make_cdf_clean :- retractall(cdf_dirty(_)).
-
-/*
-:- index(cdf_dirty/1,0,0).
-make_cdf_dirty :- retractall(cdf_dirty(_)),asserta(cdf_dirty(1)).
-make_cdf_clean :- retractall(cdf_dirty(_)),asserta(cdf_dirty(0)).
-*/
+	    assert(cdf_flags(dirty,Name)) ).
+make_cdf_clean :- retractall(cdf_flags(dirty,_)).
 
 :- comment(cdf_update_list/1, "cdf_update_list takes a list of
 assert/retracts to stored CDF relations and executes them.  All

Index: cdf_components.P
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/altCDF/cdf_components.P,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cdf_components.P	23 May 2003 19:32:22 -0000	1.5
+++ cdf_components.P	27 May 2003 20:39:54 -0000	1.6
@@ -26,7 +26,7 @@
  	from usermod.
 
 % cdf_config.
-:- import cdf_dirty/1,
+:- import cdf_flags/2,
 	  component_table_ext/3,component_table_int/3 from usermod.
 
 :- import cdf_warning/2,cdf_error/2 from cdf_exceptions.
@@ -220,7 +220,8 @@
 all dependencies between these cells.  Cells that are not components
 are made into components (with version 0), and those that are already
 components have their version number updated if necessary (by checking
-@tt{cdf_dirty/1}).  Other aspects may be specified by various options.
+@tt{dirty} entries of @tt{cdf_flags/2}).  Other aspects may be
+specified by various options.
 
 Alternately, if a part of a loaded CDF instance is to be saved as a
 component the predicate @tt{update_components(List,Dir)} can be used.
@@ -451,8 +452,8 @@
 
 clean_up_dirty_bits:- 
 	temp_depends(From,To,_,_),
-	retractall(oms_dirty(From)),
-	retractall(oms_dirty(To)),
+	retractall(cdf_flags(dirty,From)),
+	retractall(cdf_flags(dirty,To)),
 	fail.
 clean_up_dirty_bits.
 
@@ -731,8 +732,8 @@
 
 propagate_for_name(Name):- 
 	((\+ component_exists(Name) ; needs_update_tran(Name)) -> 
-	     call_assert(cdf_dirty(Name))
-	   ; true).	
+	    call_assert(cdf_flags(dirty,Name)) 
+	  ; true).
 
 /* demand could go here */
 needs_update_tran(Name):- 
@@ -959,7 +960,7 @@
 write_component_intensional(_).
 
 needs_update(Component):- 
-	cdf_dirty(Component),
+	cdf_flags(dirty,Component),
 	\+ system_component(Component).
 
 /* New component initializes a new component, creating version,
@@ -1150,7 +1151,6 @@
 
 :- table table_call/1.
 table_call(Call):- call(Call).
-
 
 :-comment(merge_components/2,"merge_components(+List,+Component)
 merges the components in @tt{List} into component @tt{Component}.

Index: cdf_config.P
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/altCDF/cdf_config.P,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cdf_config.P	23 May 2003 19:32:22 -0000	1.4
+++ cdf_config.P	27 May 2003 20:39:54 -0000	1.5
@@ -6,6 +6,9 @@
 logging
 */
 
+:- dynamic cdf_flags/2.
+:- index(cdf_flags/2,trie).
+
 :- dynamic caching_cdf/1.
 :- dynamic cdf_dirty/1.
 :- dynamic using_xj/0.

Index: cdf_init_cdf.P
===================================================================
RCS file: /cvsroot/xsb/XSB/packages/altCDF/cdf_init_cdf.P,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cdf_init_cdf.P	23 May 2003 20:13:36 -0000	1.9
+++ cdf_init_cdf.P	27 May 2003 20:39:54 -0000	1.10
@@ -1,13 +1,13 @@
 :- compiler_options([ciao_directives]).
 
 :- export
-	isa/2, immed_isa/2, implicit_isa/2,
+	isa/2, immed_isa/2, implicit_isa/2,proper_isa/2,
 	hasAttr/3, immed_hasAttr/3, 
 	allAttr/3, immed_allAttr/3, 
 	classHasAttr/3, immed_classHasAttr/3, 
 	in_hierarchy/1,
 	newExtTerm/1, retractallExtTerm/1,
-	initialize_state/0, system_component/1,
+	initialize_state/0, system_component/1, initialize_cdf/0,
 	set_chk_index/0,
 	assert_cdf/1, retractall_cdf/1,
 	cdf_set_log_on/0, cdf_set_log_off/0, cdf_reset_log/0, show_log/0,
@@ -22,7 +22,7 @@
 
 :- import isa_int/2, hasAttr_int/3, classHasAttr_int/3, allAttr_int/3 
 							from  usermod.
-:- import cdf_dirty/1, cdf_log_trie/1, 
+:- import cdf_flags/2, cdf_log_trie/1, 
 	  assert_cdf_int/1, retractall_cdf_int/1 from usermod.
 
 :- import load_component/3 from cdf_components.
@@ -662,7 +662,7 @@
 assert_cdf_term(Term) :-
 	asserta(Term),
 	get_component_extensional(Term,Name),
-	(cdf_dirty(Name)
+	(cdf_flags(dirty,Name)
 	 ->	true
 	 ;	make_cdf_dirty(Name)
 	).
@@ -680,7 +680,7 @@
 retractall_cdf_term(Term) :-
 	retract(Term),
 	get_component_extensional(Term,Name),
-	(cdf_dirty(Name)
+	(cdf_flags(dirty,Name)
 	 ->	true
 	 ;	make_cdf_dirty(Name)
 	),