flora-commits Mailing List for Flora-2

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

Modified Files:
	flora_errors.flh 
Log Message:
additional error msg


Index: flora_errors.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_errors.flh,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- flora_errors.flh	6 Jun 2007 14:12:09 -0000	1.54
+++ flora_errors.flh	26 Oct 2007 05:15:43 -0000	1.55
@@ -233,6 +233,7 @@
 #define ERROR_BOOLEAN                  'invalid Boolean literal'
 
 #define ERROR_DATATYPE_LITERAL         'invalid data type literal'
+#define ERROR_DATATYPE_LITLIST         'invalid list of data type literals'
 #define ERROR_DATATYPE_NAME            'invalid data type name specification'
 
 /**************************************

Update of /cvsroot/flora/flora2/pkgs/prolog
In directory sc8-pr-cvs17:/tmp/cvs-serv23515/pkgs/prolog

Modified Files:
	flrpm.P 
Log Message:
fixed bugs in the persistence module, documentation updates


Index: flrpm.P
===================================================================
RCS file: /cvsroot/flora/flora2/pkgs/prolog/flrpm.P,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flrpm.P	5 Jun 2007 06:51:06 -0000	1.4
+++ flrpm.P	26 Oct 2007 05:14:02 -0000	1.5
@@ -87,7 +87,10 @@
 	flora_concat_atoms/2
    from flrporting.
 
-:- import flora_add_hook/5 from flrhooks.
+:- import
+	flora_add_hook/5,
+	flora_delete_hook/4
+   from flrhooks.
 
 :- import
 	append/3,
@@ -124,11 +127,11 @@
 	flora_add_hook(Module,LOADTOMODULE,before,0,db_disconnect_on_load_hook(_,_)).
 
 remove_hooks_from_module(Module) :-
-	flora_delete_hook(Module,INSERTFACT,after,0,insert_hook(_,_)),
-	flora_delete_hook(Module,DELETEFACT,after,0,delete_hook(_,_)),
-	flora_delete_hook(Module,FINDFACT,before,0,db_findfact_and_load_to_memory(_,_)),
-	flora_delete_hook(Module,EXITFLORA,before,0,db_disconnect_on_exit_hook(_,_)),
-	flora_delete_hook(Module,LOADTOMODULE,before,0,db_disconnect_on_load_hook(_,_)).
+	flora_delete_hook(Module,INSERTFACT,after,insert_hook(_,_)),
+	flora_delete_hook(Module,DELETEFACT,after,delete_hook(_,_)),
+	flora_delete_hook(Module,FINDFACT,before,db_findfact_and_load_to_memory(_,_)),
+	flora_delete_hook(Module,EXITFLORA,before,db_disconnect_on_exit_hook(_,_)),
+	flora_delete_hook(Module,LOADTOMODULE,before,db_disconnect_on_load_hook(_,_)).
 
 /****************************************************************************
  db_findfact_and_load_to_memory(+Module,+Term)

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

Modified Files:
	flora2.tex flora2.bib 
Log Message:
fixed bugs in the persistence module, documentation updates


Index: flora2.bib
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.bib,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flora2.bib	10 Oct 2004 05:18:59 -0000	1.4
+++ flora2.bib	26 Oct 2007 05:14:03 -0000	1.5
@@ -542,6 +542,19 @@
 year = 2002
 }
 
+@article{ reification-data-semantics-03,
+author = "G. Yang and M. Kifer",
+title = "Reasoning about Anonymous Resources and Meta Statements on the
+	{Semantic Web}",
+journal = "Journal on Data Semantics, LNCS 2800",
+volume = 1,
+month = "September",
+year = 2003,
+publisher="Springer Verlag",
+pages = {69--98}
+}
+
+
  
 @inproceedings{ code-inheritance-2003,
 author = "G. Yang and M. Kifer",
@@ -553,3 +566,14 @@
 year = 2003
 }
 
+
+@article{ kifer-yang-inheritance-2006,
+author = "G. Yang and M. Kifer",
+title = "Inheritance in Rule-Based
+            Frame Systems: Semantics and Inference",
+journal = "Journal on Data Semantics",
+series = LNCS,
+volume = 2800,
+year = 2003,
+pages = {69--97}
+}

Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- flora2.tex	9 Oct 2007 07:12:24 -0000	1.183
+++ flora2.tex	26 Oct 2007 05:14:02 -0000	1.184
@@ -714,7 +714,8 @@
   between functional and set-valued methods), and both were inheritable.
 
   The semantics of {\tt *=>} are
-  characterized by the following inference rules:
+  characterized by the following logical entailments ($\phi \models \psi$
+  means $\phi$ logically entails $\psi$):
   %%
   \begin{quote}
     {\tt X[M *=> T], Y::X $\models$ Y[M *=> T]}\\
@@ -3583,7 +3584,7 @@
 
 \noindent
 The semantics of reification in \FLORA is described in
-\cite{reification-odbase-02}.
+\cite{reification-data-semantics-03}.
 
 \paragraph{Reification of complex formulas.}
 In \FLORA, one can reify not only simple facts, but also anything that
@@ -4248,7 +4249,7 @@
 %%
 
 Behavioral inheritance in \fl is discussed at length in
-\cite{inheritance-odbase-02}.  The above  non-monotonic behavior is
+\cite{inheritance-odbase-02,kifer-yang-inheritance-2006}.  The above  non-monotonic behavior is
 just the tip of an iceberg. Much more difficult problems arise when
 inheritance interacts with regular deduction. To illustrate, consider
 the following program:
@@ -4435,7 +4436,7 @@
 \index{inheritance!of code}
 %%
 In \fl this kind of inheritance is called \emph{code inheritance} and was
-studied in \cite{code-inheritance-2003}. Code inheritance is not yet
+studied in \cite{code-inheritance-2003,kifer-yang-inheritance-2006}. Code inheritance is not yet
 supported by \FLORA. However, with some loss of
 elegance and extra work, code inheritance can often be simulated using value
 inheritance. The method consists of three steps.

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

Modified Files:
	flrbasetype.flr 
Log Message:
bug fixx in lessThan


Index: flrbasetype.flr
===================================================================
RCS file: /cvsroot/flora/flora2/lib/flrbasetype.flr,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- flrbasetype.flr	11 Jun 2007 17:06:39 -0000	1.14
+++ flrbasetype.flr	10 Oct 2007 23:49:04 -0000	1.15
@@ -129,9 +129,13 @@
 _double[_isTypeOf(?_V)] :- ?_V : _double.
 
 // strings
-?N[_lessThan(?N2)] :- ?N : _string, N2 : _string, ?N @< ?N2.
+?N[_lessThan(?N2)] :- ?N:_string, ?N2:_string, ?N._rawValue @< ?N2._rawValue.
 _string[_isTypeOf(?_V)] :- ?_V : _string.
 
+// symbols
+?N[_lessThan(?N2)] :- ?N : _symbol, N2 : _symbol, ?N._rawValue @< ?N2._rawValue.
+_symbol[_isTypeOf(?_V)] :- ?_V : _symbol.
+
 // general
 ?D[_toString->?V] :- flora_printable_type_representation(?D,[?_TName,?V])@_prolog(flrdatatype), !.
 ?D[_rawValue->?V] :- flora_datatype_raw_value(?D,?V)@_prolog(flrdatatype), !.

Hi,
I'm using Flora-2 version 0.95. I have some problem with _string[*=> lessThan(
object)] method.
- When I made: ?- "ABC"^^_string[_equals("ABC"^^_string)]@_basetype.
 Flora returns : Yes

- But when I made:  "ABC"^^_string[_lessThan("ZZZ"^^_string)]@_basetype.
Flora always returns : No to me.

I don't know why. Can you help me to resolve this problem.
Best regards,
Hung


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

Hi,
I'm using Flora-2 version 0.95. I have some problem with _string[*=> lessThan(
object)] method.
- When I made: ?- "ABC"^^_string[_equals("ABC"^^_string)]@_basetype.
 Flora returns : Yes

- But when I made:  "ABC"^^_string[_lessThan("ZZZ"^^_string)]@_basetype.
Flora always returns : No to me.

I don't know why. Can you help me to resolve this problem.
Best regards,
Hung


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

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

Modified Files:
	version.flh 
Added Files:
	flrdepstest.P 
Log Message:
small fixes


--- NEW FILE: flrdepstest.P ---


:- import shell/1, sys_exit/1 from shell.

:- import flora_error_line/2 from flrprint.

:- import xsb_configuration/2 from xsb_configuration.
:- import
	flora_slash/1,
	flora_concat_atoms/2,
	flora_file_op/2
   from flrporting.

?- 
   xsb_configuration(install_dir,InstallDir),
   flora_slash(Slash),
   flora_concat_atoms([InstallDir,Slash,emu,Slash,'extensions_xsb.h'],
		      ExtensionsFile),
   (
     flora_file_op(exists,ExtensionsFile) -> true
   ;
     flora_error_line('File ~w not found. XSB has not been properly installed.', [ExtensionsFile]),
     sys_exit(-1)
   ).

Index: version.flh
===================================================================
RCS file: /cvsroot/flora/flora2/version.flh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- version.flh	10 Sep 2007 04:38:47 -0000	1.24
+++ version.flh	9 Oct 2007 07:12:25 -0000	1.25
@@ -1,2 +1,2 @@
 
-#define FLORA_VERSION               '0.95 (Androcymbium) of September 2007'
+#define FLORA_VERSION               '0.96devel (Callistephus Daintiness) of September 2007'

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

Modified Files:
	flora2.tex 
Log Message:
small fixes


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- flora2.tex	18 Sep 2007 04:24:31 -0000	1.182
+++ flora2.tex	9 Oct 2007 07:12:24 -0000	1.183
@@ -1519,57 +1519,14 @@
 are also needed in these examples to avoid {\tt *-} and {\tt +--} being
 interpreted as distinct token.
 
-\subsection{Predefined Classes}
-\label{sec-predefined-types}
-
-\index{type!predefined}
-\index{predefined type}
-%%
-\FLORA predefines certain primitive classes and provides operators
-that can be applied to classes.
-
-\index{{\tt integer} class} 
-\index{{\tt float} class} 
-\index{{\tt number} class} 
-\index{{\tt symbol} class} 
-%%
-The predefined primitive classes are {\tt integer}, {\tt float}, {\tt
-  number} (either an integer or a float), and {\tt symbol}. The latter
-  consists of all symbols as defined in Section~\ref{sec-symbols}.
-For instance, the queries
-%%
-\begin{verbatim}
-flora2 ?- abc:symbol.
-flora2 ?- 23:integer.
-flora2 ?- 1.2 : float.
-\end{verbatim}
-%%
-are all true, while
-%%
-\begin{verbatim}
-flora2 ?- 1.0:integer.
-flora2 ?- a,b : symbol.
-\end{verbatim}
-%%
-are false.
-
-{\bf Note}: Since predefined classes have infinite extensions, you can only have
-ground membership tests with respect to these classes. Non-ground tests are
-permitted, but are evaluated to {\bf false}. For instance, the following
-query fails.
-%%
-\begin{verbatim}
-flora2 ?- ?X:symbol.
- 
-No
-\end{verbatim}
-%%
+\section{Class Expressions}
+\label{sec-class-expr}
 
-In addition to the predefined types, \FLORA also defines operations on
-these types. For instance, $(a,b)$ represents \emph{intersection}, $(a;b)$
-represents the union, and $(a-b)$ represents the difference between the
-extensions of class $a$ and $b$. For
-instance, if the extensions of the following classes are as given:
+\FLORA defines a number of set-theoretic
+operations on classes. For instance, $(a,b)$ represents
+\emph{intersection}, $(a;b)$ represents the union, and $(a-b)$ represents
+the difference between the extensions of class $a$ and $b$. Suppose
+the following information is given:
 %%
 \begin{verbatim}
    a, b, c  in class1
@@ -1577,9 +1534,9 @@
    e        in class3
 \end{verbatim}
 %%
-then $\tt (class1 - class2) ; class3$ has the extension of $\tt a,b,e$.
+Then $\tt (class1 - class2) ; class3$ has the extension of $\tt a,b,e$.
 
-\index{class expression}
+\index{class!expression}
 %%
 We call the above combinations of types {\bf class expressions}.  
 Type expressions can occur in signature expressions as shown below:
@@ -1614,7 +1571,8 @@
 %%
 Unfortunately, these subclass relationships can adversely affect certain user
 programs and \FLORA provides an optimization option that allows the user to
-disable these relationships for programs that do not need them.
+disable these relationships for programs that do not need them. See
+Section~\ref{sec-runtime-optimizer}.
 
 {\bf Note}: Type expressions introduce a potential for infinite answers
 for seemingly innocuous queries. For instance, suppose that {\tt a:c} is
@@ -7229,8 +7187,10 @@
 \section{Primitive Data Types}\label{sec-data-types}
 
 An extensive data type support is being planned for \FLORA in the future.
-At present, apart from the built-in \emph{integer}, \emph{decimal}, and
-\emph{string} data types, \FLORA supports {\tt
+At present, \FLORA supports the built-in data types
+{\tt \_long}, \emph{\_integer},
+{\tt \_double},  \emph{\_decimal},
+\emph{\_string}, {\tt \_symbol}, {\tt \_object}, {\tt
   \_iri}, (international resource identifier), {\tt \_time}, {\tt \_date},
 {\tt \_dateTime}, and {\tt \_duration}.
 
@@ -7297,11 +7257,29 @@
 
     All these methods are available in \FLORA system module {\tt
       \_basetype}. 
+
+In addition, each primitive data type has a builtin class associated with it.
+For instance, the primitive data type {\tt \_integer} has an associated
+class  named {\tt \_integer} and the data type {\tt \_dateTime} has an
+associated class under the same name.  
+
+{\bf Note}: Since builtin classes have infinite extensions, you can only have
+ground membership tests with respect to these classes. Non-ground tests are
+permitted, but are evaluated to {\bf false}. For instance, the following
+query fails.
+%%
+\begin{verbatim}
+flora2 ?- ?X:\_symbol.
+ 
+No
+\end{verbatim}
+%%
+
 We now describe each data type separately.
 
 \subsection{\FLORA Symbols}
 
-\index{constant symbol}
+\index{datatype!\_symbol}
 Before describing the actual data types, we would like to remind that
 in Section~\ref{sec-basic-flogic} we introduced
 alphanumeric constants, such as {\tt abc12}, and sequences of symbols
@@ -7310,7 +7288,7 @@
 In the following subsections we will introduce typed literals that
 represent time, URIs, and more. 
 
-\index{class {\tt \_symbol}}
+\index{class!\_symbol}
 Constant symbols belong to \FLORA builtin class {\tt \_symbol}.
 In addition, this class contains IRIs, which are described next.
 An IRI of the form {\tt "some-string"$\hat{~}\hat{~}$\_iri} is assumed to
@@ -7343,6 +7321,7 @@
 
 \subsection{The \_iri Data Type}\label{sec-uri}
 
+\index{datatype!\_iri}
 The canonical representation of the constants of type IRI (international
 resource identifiers, a generalization of IRIs, universal resource
 identifiers) is
@@ -7448,6 +7427,7 @@
 However, one can always override these builtin definitions using either a
 compile time directive {\tt iriprefix} or a runtime query {\tt iriprefix}.
 
+\index{class!\_iri}
 All constants of the primitive type IRI are members of the built-in class
 {\tt \_iri}. 
 
@@ -7512,6 +7492,7 @@
 
 \subsection{ The Primitive Type \_dateTime}
 
+\index{datatype!\_dateTime}
 This data type corresponds to the XML Schema {\tt dateTime} type.  The
 constants of this data type have the form {\tt
   "ZYYYY-MM-DDTHH:MM:SS.sZHH:MM"$\hat{~}\hat{~}$\_dateTime}.  The symbols
@@ -7525,6 +7506,7 @@
 fractions of the second. Here {\tt s}  can be any positive integer.
 
 
+\index{class!\_dateTime}
 The constants of this primitive type all belong to the class {\tt
   \_dateTime}.  The name of this type has the following synonyms:
 {\tt \_dt},  {\tt 'http://www.w3.org/2001/XMLSchema\#dateTime'}. 
@@ -7586,6 +7568,7 @@
 
 \subsection{ The Primitive Type \_date}
 
+\index{datatype!\_date}
 This type corresponds to the XML Schema {\tt date} type.  Constants of this
 type have the form {\tt "ZYYYY-MM-DDSHH:MM"$\hat{~}\hat{~}$\_date}.  The
 symbols {\tt -} and {\tt :} are part of the syntax. The symbol {\tt S}
@@ -7595,6 +7578,7 @@
 single time point, {\tt \_date}  represents \emph{duration} of a single day.
 
 
+\index{class!\_date}
 All constants of this type belong to the built-in class {\tt \_date}. 
 The type name {\tt \_date} has the following synonyms: 
 {\tt \_d},  {\tt 'http://www.w3.org/2001/XMLSchema\#date'}. 
@@ -7653,6 +7637,7 @@
 
 \subsection{ The Primitive Type \_time}
 
+\index{datatype!\_time}
 This primitive type corresponds to the XML Schema {\tt time} data type
 Constants of this type have the form {\tt
   "HH:MM:SS.sZHH:MM"$\hat{~}\hat{~}$\_time}.  The symbols {\tt :} and {\tt
@@ -7663,12 +7648,13 @@
 minutes. The time zone part is optional.
 
 
+\index{class!\_time}
 The name of this type has the following alternative versions:
 {\tt \_t} and  {\tt 'http://www.w3.org/2001/ XMLSchema\#time'}. 
 All constants of that type are also assumed to be members of the built-in
 class {\tt \_time}. 
 
-The following methods are available for the type {\tt \_time} and are
+The following methods are available for the class {\tt \_time} and are
 provided by the module {\tt \_basetype}.  Their signatures are given below.
 %%
 \paragraph{Class methods:}
@@ -7719,6 +7705,7 @@
 
 \subsection{ The Primitive Type \_duration}
 
+\index{datatype!\_duration}
 The primitive type duration corresponds to the XML Schema {\tt duration}
 data type. The constants that belong to this type have the form {\tt
   "sPnYnMnDTnHnMnS"$\hat{~}\hat{~}$\_duration}.  Here {\tt s} is optional
@@ -7731,6 +7718,7 @@
 and seconds can exceed 60). The part that starts with {\tt T}  is optional
 and any element in the date and the time parts can be omitted.
 
+\index{class!\_duration}
 The constants of this data type all belong to the class {\tt \_duration}. 
 
 The type name has the following synonyms:
@@ -7782,6 +7770,7 @@
 
 \subsection{ The Primitive Type \_boolean}
 
+\index{datatype!\_boolean}
 This corresponds to the XML Schema Boolean type.
 Constants of this type have the form 
 {\tt "true"$\hat{~}\hat{~}$\_boolean}  {\tt "false"$\hat{~}\hat{~}$\_boolean} 
@@ -7789,6 +7778,7 @@
 A synonym for this type name is {\tt
   'http://www.w3.org/2001/XMLSchema\#boolean'}.
 
+\index{class!\_boolean}
 All constants in this type belong to the built-in class {\tt \_boolean}. 
 The following methods are available in module {\tt \_basetype}. 
 %%
@@ -7822,12 +7812,14 @@
 
 \subsection{ The Primitive Type \_double}
 
+\index{datatype!\_double}
 This corresponds to the XML Schema type {\tt double}.  The constants in
 this type all belong to the class {\tt \_double} and have the form {\tt
   "value"$\hat{~}\hat{~}$\_double}, where {\tt value} is a floating point number that uses
 the regular decimal point representation with an optional exponent.
 Doubles have a short form where the "..."$\hat{~}\hat{~}$\_double wrapper is removed.
 
+\index{class!\_double}
 This type name has a synonym {\tt 'http://www.w3.org/2001/XMLSchema\#double'}. 
 The following methods are available for type {\tt \_double} in module
 {\tt \_basetype}.  
@@ -7855,7 +7847,7 @@
 \item {\tt \_double[*=> \_equals(\_object)]}
 \item {\tt \_double[*=> \_lessThan(\_object)]}
 \item {\tt \_double[\_typeName *=> \_symbol]}
-\item {\tt \_double[\_rawValue *=> \_number]}
+\item {\tt \_double[\_rawValue *=> \_double]}
   \\
   Extract the number part of the {\tt \_double} data type. 
 \end{itemize}
@@ -7873,6 +7865,8 @@
 
 \subsection{ The Primitive Type \_long}
 
+\index{datatype!\_long}
+\index{class!\_long}
 This data type corresponds to XML Schema's long integers.
 The constants in this data type belong to class {\tt \_long} and have the
 form {\tt "value"$\hat{~}\hat{~}$\_long}, where value is an integer in its regular
@@ -7895,7 +7889,7 @@
 \item {\tt \_long[*=> \_equals(\_object)]}  
 \item {\tt \_long[*=> \_lessThan(\_object)]}  
 \item {\tt \_long[\_typeName *=> \_symbol]}   
-\item {\tt \_long[\_rawValue *=> \_number]}
+\item {\tt \_long[\_rawValue *=> \_long]}
   \\
   Extract the number part of the {\tt \_long} data type. 
 \end{itemize}
@@ -7914,14 +7908,22 @@
 
 \subsection{ The Primitive Types \_decimal and \_integer}
 
+\index{datatype!\_decimal}
+\index{class!\_decimal}
+\index{datatype!\_integer}
+\index{class!\_integer}
 At present, \FLORA does not implement the {\tt \_decimal} and the {\tt
   \_integer} types, which correspond to XML Schema arbitrary precision
 types decimal and integer.  Instead, {\tt \_decimal}  is a synonym for
 {\tt \_double} and {\tt \_integer} for {\tt \_long}.   
+As usual, there are corresponding classes {\tt \_integer} and {\tt
+  \_decimal}. 
 
 
 \subsection{ The Primitive Type \_string}
 
+\index{datatype!\_string}
+\index{class!\_string}
 This corresponds to the XML Schema type string.  The constants in this
 class belong to type {\tt \_string} and the type name has the synonym {\tt
   http://www.w3.org/2001/XMLSchema\#string}.  The values of this class have
@@ -7986,6 +7988,8 @@
 
 \subsection{ The Primitive Type \_list}
 
+\index{datatype!\_list}
+\index{class!\_list}
 This is the usual Prolog list type.
 The members of this type have the form 
 {\tt [elt1, ..., eltn]$\hat{~}\hat{~}$\_list}
@@ -8721,6 +8725,7 @@
 time.
 
 \subsection{Invoking the \FLORA Runtime Optimizer}
+\label{sec-runtime-optimizer}
 
 \index{optimizer}
 %%
@@ -8772,7 +8777,7 @@
 Invoking {\tt \_optimize(class\_expressions,somemodule)} always improves
 performance, sometimes significantly and sometimes negligibly.
 However, this is done at the expense of disabling the subtype relationships
-that involve class expressions (see Section~\ref{sec-predefined-types}).
+that involve class expressions (see Section~\ref{sec-class-expr}).
 So, while {\tt class\_expressions} optimization is on the usual
 subclass relationships among these expressions does not hold. For instance,
 {\tt c::(c;d)} and {\tt (c,d)::c} are false.

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

Removed Files:
	flrprettyprint_inc.flh 
Log Message:
deprecated


--- flrprettyprint_inc.flh DELETED ---

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

Modified Files:
	download.php 
Log Message:
small change


Index: download.php
===================================================================
RCS file: /cvsroot/flora/flora-website/download.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- download.php	18 Sep 2007 18:36:29 -0000	1.17
+++ download.php	5 Oct 2007 03:57:57 -0000	1.18
@@ -22,7 +22,7 @@
 </p>
 
 
-<h3>Downloading the current release of FLORA-2:</h3>
+<h3>Downloading the latest release of FLORA-2:</h3>
 <p>
 Please follow these steps:
 <ul>

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

Modified Files:
	flora_terms.flh 
Log Message:
Added in a evaluation library, predicates in it includes
    flora_lessthan(?,?)@_eval,
    flora_greaterthan(?,?)@_eval,
    flora_lessequal(?,?)@_eval,
    flora_greaterequal(?,?)@_eval,
    flora_equal(?,?)@_eval,
    flora_unequal(?,?)@_eval.

Using these predicates, evalutations can be delayed until both arguments are bounded (ground term). For example,
?- flora_lessthan(?X,?Y)@_eval,?X=2,?Y=3.
will succeed.
?- flora_equal(?X,?Y)@_eval,?X=2,?Y=3.
will fail.

These predicates are respectively corresponding to: <,>,=<,>=,=:=,=\=.



Index: flora_terms.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_terms.flh,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- flora_terms.flh	3 Aug 2007 14:17:50 -0000	1.89
+++ flora_terms.flh	5 Oct 2007 02:21:24 -0000	1.90
@@ -840,6 +840,7 @@
 #define FLSYSMODDATABASE	'_storage'
 #define FLSYSMODSYSTEM		'_system'
 #define FLSYSMODTYPECHECK	'_typecheck'
+#define FLSYSMODEVAL		'_eval'
 #define FLSYSMODBASETYPE	'_basetype'
 #define FLSYSMODPARSE   	'_parse'
 #define FL_PLIB			'_prolog'

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

Modified Files:
	Makefile NMakefile.mak 
Added Files:
	flreval.flr 
Log Message:
Added in a evaluation library, predicates in it includes
    flora_lessthan(?,?)@_eval,
    flora_greaterthan(?,?)@_eval,
    flora_lessequal(?,?)@_eval,
    flora_greaterequal(?,?)@_eval,
    flora_equal(?,?)@_eval,
    flora_unequal(?,?)@_eval.

Using these predicates, evalutations can be delayed until both arguments are bounded (ground term). For example,
?- flora_lessthan(?X,?Y)@_eval,?X=2,?Y=3.
will succeed.
?- flora_equal(?X,?Y)@_eval,?X=2,?Y=3.
will fail.

These predicates are respectively corresponding to: <,>,=<,>=,=:=,=\=.



Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/lib/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	28 May 2007 21:46:49 -0000	1.13
+++ Makefile	5 Oct 2007 02:21:24 -0000	1.14
@@ -31,7 +31,8 @@
 	flrstorage${PROLOGEXT} flrsystem${PROLOGEXT} \
 	flrbasetype${PROLOGEXT} \
 	flrparse${PROLOGEXT} \
-	flrtypeconstraint${PROLOGEXT}
+	flrtypeconstraint${PROLOGEXT} \
+        flreval${PROLOGEXT}
 
 Option = [optimize]
 

--- NEW FILE: flreval.flr ---
/* File:      flreval.flr
**
** Author(s): Hui Wan
** Contact:   flo...@li...
**
** Copyright (C) The Research Foundation of SUNY, 2006, 2007
** 
** FLORA-2 is free software; you can redistribute it and/or modify it under the
** terms of the GNU Library General Public License as published by the Free
** Software Foundation; either version 2 of the License, or (at your option)
** any later version.
** 
** FLORA-2 is distributed in the hope that it will be useful, but WITHOUT ANY
** WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
** FOR A PARTICULAR PURPOSE.  See the GNU Library General Public License for
** more details.
** 
** You should have received a copy of the GNU Library General Public License
** along with FLORA-2; if not, write to the Free Software Foundation,
** Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** 
**
*/


#include "flora_terms.flh"

:- export
	flora_lessthan(?,?),
	flora_greaterthan(?,?),
	flora_lessequal(?,?),
	flora_greaterequal(?,?),
	flora_equal(?,?),
	flora_unequal(?,?).


flora_lessthan(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X<?Y)@_prolog(constraintLib).

flora_greaterthan(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X>?Y)@_prolog(constraintLib).

flora_lessequal(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X=<?Y)@_prolog(constraintLib).

flora_greaterequal(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X>=?Y)@_prolog(constraintLib).

flora_equal(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X=:=?Y)@_prolog(constraintLib).

flora_unequal(?X,?Y):-
  when((ground(?X)@_prolog(basics),ground(?Y)@_prolog(basics)),?X=\=?Y)@_prolog(constraintLib).
Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/lib/NMakefile.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- NMakefile.mak	28 May 2007 21:46:49 -0000	1.11
+++ NMakefile.mak	5 Oct 2007 02:21:24 -0000	1.12
@@ -7,7 +7,8 @@
 	  flrstorage$(PROLOGEXT) flrsystem$(PROLOGEXT) \
 	  flrbasetype$(PROLOGEXT) \
 	  flrparse$(PROLOGEXT) \
-	  flrtypeconstraint$(PROLOGEXT)
+	  flrtypeconstraint$(PROLOGEXT) \
+          flreval$(PROLOGEXT)
 
 !IF EXISTS (..\.prolog_path_wind) 
 !INCLUDE ..\.prolog_path_wind

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

Added Files:
	flreval_inc.flh 
Log Message:
Added in a evaluation library, predicates in it includes
    flora_lessthan(?,?)@_eval,
    flora_greaterthan(?,?)@_eval,
    flora_lessequal(?,?)@_eval,
    flora_greaterequal(?,?)@_eval,
    flora_equal(?,?)@_eval,
    flora_unequal(?,?)@_eval.

Using these predicates, evalutations can be delayed until both arguments are bounded (ground term). For example,
?- flora_lessthan(?X,?Y)@_eval,?X=2,?Y=3.
will succeed.
?- flora_equal(?X,?Y)@_eval,?X=2,?Y=3.
will fail.

These predicates are respectively corresponding to: <,>,=<,>=,=:=,=\=.



--- NEW FILE: flreval_inc.flh ---
/************************************************************************
  file: libinc/flreval_inc.flh

  Author(s): Hui Wan

  This file is automatically included by the FLORA compiler.
************************************************************************/

:- compiler_options([xpp_on]).

#mode standard Prolog

#if !defined(FLORA_TERMS_FLH)
#define FLORA_TERMS_FLH
#include "flora_terms.flh"
#endif

:- import flora_load_system_module/1 from flrlibman.
?- flora_load_system_module(FLSYSMODEVAL).

/***********************************************************************/

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

Modified Files:
	flrlibman.P flrsynonym.P 
Log Message:
Added in a evaluation library, predicates in it includes
    flora_lessthan(?,?)@_eval,
    flora_greaterthan(?,?)@_eval,
    flora_lessequal(?,?)@_eval,
    flora_greaterequal(?,?)@_eval,
    flora_equal(?,?)@_eval,
    flora_unequal(?,?)@_eval.

Using these predicates, evalutations can be delayed until both arguments are bounded (ground term). For example,
?- flora_lessthan(?X,?Y)@_eval,?X=2,?Y=3.
will succeed.
?- flora_equal(?X,?Y)@_eval,?X=2,?Y=3.
will fail.

These predicates are respectively corresponding to: <,>,=<,>=,=:=,=\=.



Index: flrsynonym.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrsynonym.P,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- flrsynonym.P	11 Jun 2007 17:07:00 -0000	1.10
+++ flrsynonym.P	5 Oct 2007 02:21:24 -0000	1.11
@@ -74,6 +74,7 @@
 builtin_synonym('_sys', FLSYSMODSYSTEM) :- !.
 builtin_synonym('_db', FLSYSMODDATABASE) :- !.
 builtin_synonym('_typeCheck', FLSYSMODTYPECHECK) :- !.
+builtin_synonym('_eval', FLSYSMODEVAL) :- !.
 builtin_synonym('_baseType', FLSYSMODBASETYPE) :- !.
 
 builtin_synonym('_real', FL_DOUBLE) :- !.

Index: flrlibman.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrlibman.P,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- flrlibman.P	28 May 2007 21:46:51 -0000	1.26
+++ flrlibman.P	5 Oct 2007 02:21:24 -0000	1.27
@@ -263,6 +263,7 @@
 flora_sysmod_file(FLSYSMODIO,flrio,lib) :- !.
 flora_sysmod_file(FLSYSMODSYSTEM,flrsystem,lib) :- !.
 flora_sysmod_file(FLSYSMODTYPECHECK,flrtypeconstraint,lib) :- !.
+flora_sysmod_file(FLSYSMODEVAL,flreval,lib) :- !.
 flora_sysmod_file(FLSYSMODBASETYPE,flrbasetype,lib) :- !.
 flora_sysmod_file(FLSYSMODPARSE,flrparse,lib) :- !.
 flora_sysmod_file(FLSYSMODDATABASE,flrstorage,lib) :- !.