[Xsb-commits] CVS: xsbtests/flora_tests reification_old,1.1,1.2 reification.flr,1.1,1.2

[Michael K. <ki...@us...>]

Update of /cvsroot/xsb/xsbtests/flora_tests
In directory usw-pr-cvs1:/tmp/cvs-serv16661/flora_tests

Modified Files:
	reification_old reification.flr 
Log Message:
adjust to the new syntax for reification: ${...}


Index: reification_old
===================================================================
RCS file: /cvsroot/xsb/xsbtests/flora_tests/reification_old,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reification_old	17 May 2002 08:57:27 -0000	1.1
+++ reification_old	18 May 2002 08:25:05 -0000	1.2
@@ -1,6 +1,9 @@
+Tst4: ok
 tst1: (_$_$_flora'usermod'foo'd_fd(a,b,c)  ','  _$_$_flora'usermod'foo'd_meth(c,e))
 tst1: (_$_$_flora'usermod'foo'd_fd(a,b,c)  ','  _$_$_flora'usermod'foo'd_meth(c,e))
-tst2: [(_$_$_flora'usermod'main'mvd(alice,likes,flora)  ','  _$_$_flora'usermod'main'isa(flora,cool)),_$_$_flora'usermod'main'mvd(sally,likes,_$_$_flora'usermod'main'isa(flora,cool))]
-tst2: [(_$_$_flora'usermod'main'mvd(alice,likes,flora)  ','  _$_$_flora'usermod'main'isa(flora,cool)),_$_$_flora'usermod'main'mvd(sally,likes,_$_$_flora'usermod'main'isa(flora,cool))]
+tst2: [(_$_$_flora'usermod'main'mvd(alice,thinks,flora)  ','  _$_$_flora'usermod'main'isa(flora,cool)),_$_$_flora'usermod'main'mvd(sally,thinks,_$_$_flora'usermod'main'isa(flora,cool))]
+tst2: [(_$_$_flora'usermod'main'mvd(alice,thinks,flora)  ','  _$_$_flora'usermod'main'isa(flora,cool)),_$_$_flora'usermod'main'mvd(sally,thinks,_$_$_flora'usermod'main'isa(flora,cool))]
 tst3: (_$_$_flora'usermod'bar'd_isa(b,a)  ','  _$_$_flora'usermod'bar'd_fd(b,b,c))
 tst3: (_$_$_flora'usermod'bar'd_isa(b,a)  ','  _$_$_flora'usermod'bar'd_fd(b,b,c))
+tst4: P = _$_$_flora'usermod'main'mvd(mary,thinks,_$_$_flora'usermod'main'isa(flora,cool))
+tst4: _$_$_flora'usermod'main'mvd(mary,thinks,_$_$_flora'usermod'main'isa(flora,cool))

Index: reification.flr
===================================================================
RCS file: /cvsroot/xsb/xsbtests/flora_tests/reification.flr,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reification.flr	17 May 2002 08:57:27 -0000	1.1
+++ reification.flr	18 May 2002 08:25:05 -0000	1.2
@@ -1,12 +1,23 @@
 
-tom[believes->> ~alice[likes->>flora:cool]].
-tom[believes->> ~sally[likes->> ~flora:cool]].
-tst1 :- X = ~a[b->c[e]]@foo, write('tst1: ')@prolog(), writeln(X)@prolog().
+tom[believes->> ${alice[thinks->>flora:cool]}].
+tom[believes->> ${sally[thinks->> ${flora:cool}]}].
+tst1 :- X = ${a[b->c[e]]@foo}, write('tst1: ')@prolog(), writeln(X)@prolog().
 tst2 :- X = collectset{B| tom[believes->>B]},
 	write('tst2: ')@prolog(), writeln(X)@prolog().
-tst3 :- X = ~b:a[b->c]@bar, write('tst3: ')@prolog(), writeln(X)@prolog().
+tst3 :- X = ${b:a[b->c]@bar}, write('tst3: ')@prolog(), writeln(X)@prolog().
 
-pretest :- tst1, tst2, tst3.
+tst4 :- insert{jack[believes->> ${mary[thinks->> ${flora:cool}]}]},
+	jack[believes->>B],
+	write('tst4: ')@prolog(), writeln(B)@prolog(),
+	delete{jack[believes->>P]},
+	abolish_all_tables,
+	write('tst4: ')@prolog(), writeln('P' = P)@prolog(),
+	if jack[believes->>_] then
+           writeln('Tst4: something wrong')@prolog()
+        else
+           writeln('Tst4: ok')@prolog().
+
+pretest :- tst1, tst2, tst3, tst4.
 
 test :- tell(temp)@prolog(),
 	debug[#check_undefined(on)]@flora(sys),