flora-commits Mailing List for Flora-2

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17889

Modified Files:
	version.flh flrutils.P 
Log Message:
allow the query string in flora_query/4 to be a list.
This prevents generation of numerous atoms that might clog XSB's atom table.


Index: flrutils.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.P,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- flrutils.P	31 Oct 2005 04:50:47 -0000	1.62
+++ flrutils.P	21 Nov 2005 05:44:30 -0000	1.63
@@ -2442,6 +2442,7 @@
 
 flora_call_string_command(String,_UserVars,Status,_Exception) :-
 	\+ atom(String),
+	\+ is_list(String),
 	!,
 	Status = [FLORA_INVALID_INPUT, FLORA_FAILURE].
 flora_call_string_command(String,UserVars,Status,Exception) :-

Index: version.flh
===================================================================
RCS file: /cvsroot/flora/flora2/version.flh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- version.flh	20 Oct 2005 03:26:02 -0000	1.17
+++ version.flh	21 Nov 2005 05:44:30 -0000	1.18
@@ -1,2 +1,2 @@
 
-#define FLORA_VERSION               '0.95devel (Androcymbium) of July 2005'
+#define FLORA_VERSION               '0.95devel (Androcymbium) of November 2005'

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17889/docs

Modified Files:
	flora2.tex 
Log Message:
allow the query string in flora_query/4 to be a list.
This prevents generation of numerous atoms that might clog XSB's atom table.


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- flora2.tex	17 Oct 2005 05:25:33 -0000	1.145
+++ flora2.tex	21 Nov 2005 05:44:30 -0000	1.146
@@ -2933,17 +2933,23 @@
 \index{{\tt flora\_query/4} predicate}
 %%
 To enable such unrestricted queries, \FLORA provides a special predicate,
-{\tt flora\_query/4}, which takes the following arguments: 
+{\tt flora\_query/4}, which is called from Prolog
+and takes the following arguments: 
 %%
 \begin{itemize}
-  \item  \emph{String}: A string that contains a \FLORA query
-  \item \emph{Vars}: A list of the form {\tt [?Name1=?Var1, ?Name2=?Var2,...]}.
+  \item  \emph{String}: A string that contains a \FLORA query. It can be an
+    atom (e.g., 'foo[bar->?X].') or a list of character codes (e.g.,
+    "foo[bar->?X].").
+  \item \emph{Vars}: A list of the form {\tt ['?Name1'=Var1,
+      '?Name2'=Var2,...]} or of the form
+    {\tt ["?Name1"=Var1, "?Name2"=Var2,...]}.
     {\tt ?Name} is a name of a variable mentioned in \emph{String}, for
     instance, {\tt '?X'} (note: the name must be quoted, since it is an
-    atom).  Var is a variable where you want the binding for the variable
+    atom).  Var is a \emph{Prolog} (not \FLORA!)
+    variable where you want the binding for the variable
     {\tt Name} in \emph{String} to be returned.  For instance, if
     \emph{String} is {\tt 'p(?X,?Y).'} then \emph{Vars} can be {\tt ['?X' =
-      Xyz, '?Y' = Qpr]}. In this case, {\tt Xyz} will be bound to the value
+      Xyz, "?Y" = Qpr]}. In this case, {\tt Xyz} will be bound to the value
     of {\tt ?X} in {\tt p(?X,?Y)} after the execution, and {\tt Qpr} will be
     bound to the value of {\tt ?Y} in {\tt p(?X,?Y)}.
   \item \emph{Status}: Indicates the status of compilation of the command
@@ -2955,13 +2961,20 @@
     need to process exceptions in sophisticated ways).
 \end{itemize}
 %%
+We should note that if the \FLORA query string is generated outside of XSB
+(e.g., by a C program) then it is preferable to enclose the query string
+and the variable names (in the first two arguments to {\tt flora\_query})
+in double quotes (i.e., represent these strings as character lists) rather
+than single quotes (i.e., represent the strings as atoms). This has to do
+with a limitation of XSB, which is unable to garbage-collect unused atoms. 
 
-In order to use the above feature, the following steps are necessary.
+In order to use the the {\tt flora\_query/4} predicate from within Prolog,
+the following steps are necessary.
 %%
 \begin{enumerate}
   \item  If \FLORA is installed as a standalone application rather than an
-    XSB package, then the installation directory must be added to the XSB
-    search path:
+    XSB package, then the \FLORA installation directory must be added to
+    the XSB search path:
 %%
 \begin{verbatim}
  ?- asserta(library_directory('/home/myHomeDir/flora2')).  
@@ -2990,7 +3003,7 @@
 
 ?- flLoad(flrtest).  
 
-?- Str='?X[b->?Y].', flora_query(Str,['?X'=YYY,'?Y'=PPP], _Status,_Exception).
+?- Str="?X[b->?Y].", flora_query(Str,["?X"=YYY,"?Y"=PPP], _Status,_Exception).
 \end{verbatim}
 %%
 After the query to {\tt flrtest.flr} is successfully executed, the bindings

Update of /cvsroot/flora/flora2/debugger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17889/debugger

Modified Files:
	static_data.in 
Log Message:
allow the query string in flora_query/4 to be a list.
This prevents generation of numerous atoms that might clog XSB's atom table.


Index: static_data.in
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/static_data.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- static_data.in	3 Apr 2005 06:37:52 -0000	1.20
+++ static_data.in	21 Nov 2005 05:44:30 -0000	1.21
@@ -102,6 +102,8 @@
 flora_hide_this_hide(flora_optimizer_registry/2).
 
 flora_hide_this_show(get_residual/2).
+flora_hide_this_show(xsb_thread_self/2).
+flora_hide_this_show(xsb_thread_self/1).
 
 flora_show_this_hide((flCompile)/1).
 flora_show_this_hide((flLoad)/1).

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10186/docs

Modified Files:
	flora-packages.tex 
Log Message:
typo


Index: flora-packages.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-packages.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flora-packages.tex	5 Aug 2005 22:16:52 -0000	1.1
+++ flora-packages.tex	10 Nov 2005 10:03:17 -0000	1.2
@@ -6,7 +6,7 @@
 \usepackage{longtable}
 \usepackage{alltt}
 \usepackage{xspace}
-\usepackage{subfigure, graphics, psfig, epsf, epsfig, amsmath, amsfonts, float}
+\usepackage{subfigure, graphicx, epsfig, epsf, epsfig, amsmath, amsfonts, float}
 
 
 \parskip5pt