flora-commits Mailing List for Flora-2

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

Modified Files:
	flrmetaops.P 
Log Message:
fix the bug regarding infinite loops for clause{...,(B1,B2)} queries

Index: flrmetaops.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrmetaops.P,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- flrmetaops.P	26 Jul 2005 00:33:36 -0000	1.19
+++ flrmetaops.P	28 Sep 2005 13:04:01 -0000	1.20
@@ -51,6 +51,10 @@
 /******************************************************************************
  utilities for dealing with FLLIBMODOBJ
 ******************************************************************************/
+collect_libmodobj(Var,Var,[]) :-
+        var(Var),
+        !.
+
 collect_libmodobj(','(A,B),P,O) :-
         !,
         collect_libmodobj(A,PA,OA),

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

Modified Files:
	flora-protege.tex flora-flrjava.tex 
Log Message:
minor fixes


Index: flora-flrjava.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-flrjava.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flora-flrjava.tex	5 Aug 2005 22:16:52 -0000	1.1
+++ flora-flrjava.tex	16 Sep 2005 03:22:36 -0000	1.2
@@ -570,3 +570,8 @@
 delete all values of a set-valued method.
 \end{itemize}
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "flora-packages"
+%%% End: 

Index: flora-protege.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-protege.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flora-protege.tex	5 Aug 2005 22:16:52 -0000	1.1
+++ flora-protege.tex	16 Sep 2005 03:22:36 -0000	1.2
@@ -164,10 +164,10 @@
 \begin{itemize}
 \item Each \fl class is represented as a subclass of \Protege's
   class {\tt :FLORACLASS}. This
-  subclass is named as {\tt flora\_classname@flora\_modulename}.
+  subclass is named as {\tt floraClassname@floraModulename}.
 \item Each \fl method is represented as a subclass of \Protege's class {\tt :FLORAMETHOD}. The
 subclass is named as {\tt
-flora\_classname\_methodname\_no@flora\_modulename}. Numeric suffixes (e.g.
+floraClassname.methodname.number@floraModulename}. Numeric suffixes (e.g.
 \_1,\_2,\_3) are used to disambiguate methods that have the same names but
 different number of parameters (or different parameter types).
 \item The subclass of \Protege {\tt :FLORACLASS} corresponding to the \fl class
@@ -177,7 +177,7 @@
 corresponding \fl instance.
 \item Each instance of {\tt :FLORAMETHOD} has a slot
   {\tt MethodName} whose value follows the following naming schema:
-{\tt floraInstancename\_floraMethodname\_number}. Numeric suffixes 1,2,3,
+{\tt floraInstancename.floraMethodname.number}. Numeric suffixes 1,2,3,
   etc.,  are used to disambiguate methods that have identical names, but
   different numbers of arguments.
 \item {\tt :FLORAMETHOD} subclasses have slots {\tt single} and {\tt
@@ -298,3 +298,8 @@
 the plugins configured for your system will appear. Check the
 box next to {\tt floraTab}. The {\tt floraTab}  will appear.
 \end{itemize}
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "flora-packages"
+%%% End: 

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

Modified Files:
	flrutils.P 
Log Message:
minor fixes


Index: flrutils.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.P,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- flrutils.P	30 Aug 2005 14:43:25 -0000	1.58
+++ flrutils.P	16 Sep 2005 03:22:37 -0000	1.59
@@ -2783,6 +2783,11 @@
 	).
 
 
+/*
+   Takes an option list (for the trailers) of the form [(Option,Index),...]
+   and deletes indices from options. Options FLOBJEQLDEF, FL_EQUALITY,
+   FL_CUSTOM, FL_INHERITANCE are ignored completely.
+*/
 strip_indices_from_options_and_split([],[],[]).
 strip_indices_from_options_and_split([(Option,_I)|Rest],
 				     StrippedOptions,