flora-commits Mailing List for Flora-2

Update of /cvsroot/flora/flora2/p2h
In directory sc8-pr-cvs17:/tmp/cvs-serv14350/p2h

Modified Files:
	prolog2hilog.c 
Log Message:
fixed small compiler problem


Index: prolog2hilog.c
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/prolog2hilog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- prolog2hilog.c	19 Jul 2007 13:30:36 -0000	1.10
+++ prolog2hilog.c	30 Jul 2007 21:50:17 -0000	1.11
@@ -38,10 +38,6 @@
 #include "cinterf.h"
 #include "context.h"
 
-/* These two have become necessary due to some recent XSB changes. */
-#include "register.h"
-#include "emudef.h"
-
 #define FLORA_META_PREFIX      "_$_$_flora'mod"
 #define FLORA_LIB_PREFIX       "fllib"
 #define FLORA_META_PREFIX_LEN  14

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs17:/tmp/cvs-serv14350

Modified Files:
	flrcompiler.P 
Log Message:
fixed small compiler problem


Index: flrcompiler.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.P,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- flrcompiler.P	28 May 2007 21:46:51 -0000	1.101
+++ flrcompiler.P	30 Jul 2007 21:50:18 -0000	1.102
@@ -240,18 +240,19 @@
   This procedure should be called for a syntax in an oid position.
 ****************************************************************************/
 approximate_index(FLATOM(_Atom,I),I)              :- !.
-approximate_index(FLBUILTIN_IDENTIFIER(_Id,I),I):- !.
-approximate_index(FLDATATYPE(_Type,_Sort,I),I):- !.
-approximate_index(FLNUMBER(_Number,I),I)          :- !.
-approximate_index(FLSTRING(_String,I),I)          :- !.
-approximate_index(FLTOKEN(_Token,I),I)            :- !.
-approximate_index(FLTOKEN(_Token,_Num,I),I)       :- !.
-approximate_index(FLVAR(_Name,I),I)               :- !.
-approximate_index(FLLIST(_List,_T,I),I)           :- !.
-approximate_index(FLTERM(F,_A,_Args),I)           :- !, approximate_index(F,I).
-approximate_index(FLBIRELATE(Obj1,_Rel,_Obj2),I)  :- !, approximate_index(Obj1,I).
-approximate_index(FLOBJSPEC(Obj,_Spec),I)         :- !, approximate_index(Obj,I).
-approximate_index(FLOBJREF(Obj,_Ref,_Att),I)      :- !, approximate_index(Obj,I).
+approximate_index(FLBUILTIN_IDENTIFIER(_Id,I),I)  :- !.
+approximate_index(FLDATATYPE(_Type,_Sort,I),I)    :- !.
+approximate_index(FLNUMBER(_Number,I),I)      :- !.
+approximate_index(FLSTRING(_String,I),I)      :- !.
+approximate_index(FLTOKEN(_Token,I),I)        :- !.
+approximate_index(FLTOKEN(_Token,_Num,I),I)   :- !.
+approximate_index(FLVAR(_Name,I),I)           :- !.
+approximate_index(FLLIST(_List,_T,I),I)       :- !.
+approximate_index(FLTERM(F,_A,_Args),I)       :- !, approximate_index(F,I).
+approximate_index(FLBIRELATE(Obj1,_Rel,_O),I) :- !, approximate_index(Obj1,I).
+approximate_index(FLOBJSPEC(Obj,_Spec),I)     :- !, approximate_index(Obj,I).
+approximate_index(FLOBJREF(Obj,_Ref,_Att),I)  :- !, approximate_index(Obj,I).
+approximate_index(FLURISQ(Prefix,_Local),I)   :- !, approximate_index(Prefix,I).
 approximate_index(FLAGGREGATE(Op,_V,_GV,_Goal),I) :- !, approximate_index(Op,I).
 approximate_index(FLPLIB(P,_M),I)                 :- !, approximate_index(P,I).
 approximate_index(FLPLIB(P),I)                    :- !, approximate_index(P,I).

Update of /cvsroot/flora/flora2/datatypes
In directory sc8-pr-cvs17:/tmp/cvs-serv31249/datatypes

Modified Files:
	flrdatatype.P 
Log Message:
minor fixes in printing charlist data types.


Index: flrdatatype.P
===================================================================
RCS file: /cvsroot/flora/flora2/datatypes/flrdatatype.P,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- flrdatatype.P	11 Jun 2007 17:06:40 -0000	1.21
+++ flrdatatype.P	23 Jul 2007 18:07:09 -0000	1.22
@@ -155,7 +155,8 @@
 	!.
 
 flora_canonical_type_name(Type, FL_CHARLIST) :-
-	flora_toLower(Type,FL_CHARLIST),
+	flora_toLower(Type,Lower),
+	flora_toLower(FL_CHARLIST,Lower),
 	!.
 
 flora_canonical_type_name('http://www.w3.org/2001/XMLSchema#boolean', FL_BOOL) :- !.
@@ -288,7 +289,10 @@
 flora_printable_type_representation(FL_DOUBLE(Val),[FL_DOUBLE,Val]) :- !.
 %%flora_printable_type_representation(FL_FLOAT(Val),[FL_FLOAT,Val]) :- !.
 flora_printable_type_representation(FL_BOOL(Val),[FL_BOOL,Val]) :- !.
-flora_printable_type_representation(FL_CHARLIST(Val),[FL_CHARLIST,Val]) :- !.
+flora_printable_type_representation(FL_CHARLIST(Val),[FL_CHARLIST,ValRepr]) :-
+	!,
+	is_charlist(Val),
+	atom_codes(ValRepr,Val).
 flora_printable_type_representation(FL_LISTTYPE(Val),[FL_LISTTYPE,ValP]) :-
 	!,
 	flora_decode_oid_as_atom(Val,ValP).

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs17:/tmp/cvs-serv30165/docs

Modified Files:
	flora2.tex 
Log Message:
updated prolog2hilog to work around xsb's linkage problem.


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- flora2.tex	6 Jun 2007 14:12:09 -0000	1.180
+++ flora2.tex	19 Jul 2007 13:30:36 -0000	1.181
@@ -3323,7 +3323,7 @@
 {\tt foo} and then imports that module.  
 The importing module itself contains a fact and a query.
 
-Let now {\tt myprog.flr} be as follows:
+Suppose {\tt myprog.flr} is as follows:
 %% 
 \begin{alltt}
   q(?X) :- p(?X).

Update of /cvsroot/flora/flora2/p2h
In directory sc8-pr-cvs17:/tmp/cvs-serv30165/p2h

Modified Files:
	prolog2hilog.c 
Log Message:
updated prolog2hilog to work around xsb's linkage problem.


Index: prolog2hilog.c
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/prolog2hilog.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- prolog2hilog.c	17 Apr 2007 23:11:48 -0000	1.9
+++ prolog2hilog.c	19 Jul 2007 13:30:36 -0000	1.10
@@ -38,6 +38,10 @@
 #include "cinterf.h"
 #include "context.h"
 
+/* These two have become necessary due to some recent XSB changes. */
+#include "register.h"
+#include "emudef.h"
+
 #define FLORA_META_PREFIX      "_$_$_flora'mod"
 #define FLORA_LIB_PREFIX       "fllib"
 #define FLORA_META_PREFIX_LEN  14

Update of /cvsroot/flora/flora2/p2h/windows
In directory sc8-pr-cvs17:/tmp/cvs-serv30165/p2h/windows

Modified Files:
	prolog2hilog.dll 
Log Message:
updated prolog2hilog to work around xsb's linkage problem.


Index: prolog2hilog.dll
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/windows/prolog2hilog.dll,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
Binary files /tmp/cvsFJvxKN and /tmp/cvsfesu4l differ

Update of /cvsroot/flora/flora-website/tutorial
In directory sc8-pr-cvs17:/tmp/cvs-serv29634

Modified Files:
	part2-programming.ppt part1-foundations.ppt 
Log Message:
typo fixes


Index: part2-programming.ppt
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/part2-programming.ppt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsAUEef1 and /tmp/cvsPRUXuI differ

Index: part1-foundations.ppt
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/part1-foundations.ppt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvs0bvGib and /tmp/cvs01ZqSS differ

Update of /cvsroot/flora/flora-website/tutorial
In directory sc8-pr-cvs17:/tmp/cvs-serv31849/tutorial

Modified Files:
	part2-programming.ppt part1-foundations.ppt 
Log Message:
typo fixes


Index: part2-programming.ppt
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/part2-programming.ppt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsI0bJph and /tmp/cvs7jWtA7 differ

Index: part1-foundations.ppt
===================================================================
RCS file: /cvsroot/flora/flora-website/tutorial/part1-foundations.ppt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvswB0NXB and /tmp/cvsHO9nzs differ