flora-commits Mailing List for Flora-2

Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs1:/tmp/cvs-serv30464

Modified Files:
	florahome.php aboutFlogic.php 
Log Message:
added info on Ontoprise.


Index: florahome.php
===================================================================
RCS file: /cvsroot/flora/flora-website/florahome.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- florahome.php	10 Jul 2002 22:52:53 -0000	1.6
+++ florahome.php	21 Dec 2002 21:06:29 -0000	1.7
@@ -51,11 +51,23 @@
 Related links:
 </p>
 <ul>
+<li>
+<A href="http://www.ontoprise.de/">Ontoprise</a> - A provider of semantic Web
+solutions, which uses an F-logic engine to power its products. Ontoprise
+has a nice <A
+href="http://www.ontoprise.de/com/download/f_logik_tutorial.pdf">tutorial</a>
+for their version of F-logic. Although their dialect of F-logic is
+different from FLORA-2's, it can be useful for people with no prior
+experience with F-logic programming.
+</li>
 <li> <A href="http://www.SemanticWeb.org/">Semantic Web Resources</a>
+</li>
 <li> <a href="http://www.informatik.uni-freiburg.de/~dbis/florid/">
     FLORID</a>: A C++-based implementation of F-logic from Freiburg University.
+</li>
 <li> <A href="http://www.dsic.upv.es/~pcarsi/tfl/">Transaction F-logic
   prototype</a> from the University of Valencia, Spain.
+</li>
 <li> The <a href="http://www.cs.toronto.edu/~bonner/transaction-logic.html">
 Transaction Logic</a> and <a
 href="http://www.cs.toronto.edu/~bonner/ctr/index.html">Concurrent

Index: aboutFlogic.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutFlogic.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aboutFlogic.php	5 Sep 2002 16:13:06 -0000	1.2
+++ aboutFlogic.php	21 Dec 2002 21:06:29 -0000	1.3
@@ -73,6 +73,13 @@
          anonymous oid. These features are important for being able to
 	properly model RDF in F-logic and FLORA-2.
       </li>
+      <li>
+      <A href="http://www.ontoprise.de/com/download/f_logik_tutorial.pdf">
+	How to Write F-Logic Programs.</A>
+      A tutorial for the <a href="http://www.ontoprise.de/">Ontoprise</a>'s
+      F-logic based deductive engine, which underlies their semantic Web
+      products.
+      </li>
     </ul>
 
 <pre>

Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs1:/tmp/cvs-serv28296

Modified Files:
	aboutTR.php 
Log Message:


Index: aboutTR.php
===================================================================
RCS file: /cvsroot/flora/flora-website/aboutTR.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aboutTR.php	21 May 2002 17:03:29 -0000	1.1
+++ aboutTR.php	21 Dec 2002 06:26:42 -0000	1.2
@@ -31,6 +31,14 @@
     report with a focus on database applications.
   </li>
   <li>
+    <a
+    href="ftp://ftp.cs.sunysb.edu/pub/TechReports/kifer/tr-reasoning.ps">Results
+    on Reasoning about Updates in Transaction Logic</a> 
+    in Transactions and Change in
+          Logic Databases, Lecture Notes in Computer Science, vol. 1472,
+          Springer Verlag, 1998.
+  </li>
+  <li>
     <a href="ftp://ftp.cs.sunysb.edu/pub/TechReports/kifer/concurrent-trans-logic.ps.Z">
       Concurrent Transaction Logic
     </a>. Joint Intl. Conference and Symposium on

Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs1:/tmp/cvs-serv28867

Modified Files:
	release_notes.html 
Log Message:


Index: release_notes.html
===================================================================
RCS file: /cvsroot/flora/flora-website/release_notes.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- release_notes.html	25 Sep 2002 05:08:12 -0000	1.10
+++ release_notes.html	21 Dec 2002 06:29:38 -0000	1.11
@@ -10,25 +10,47 @@
 
 <hr>
 <center>
-<h1> Release Notes for Version 0.90 (...)</h1>
+<h1> Release Notes for Version 0.91 (Beta lomatogona)</h1>
 </center>
 
 <h3>General</h3>
 <p>
+  FLORA has undergone many changes and a great number of features were
+  added. Some changes make the syntax of the present version incompatible with
+  earlier versions. This was made by the desire to simplify the language and
+  improve its usability.
+
+  It is the first version that is reasonably feature-complete and thus
+  can be called a "beta".
 </p>
 
 
 <h3>News</h3>
 <ul>
-  <li>It is now possible to call X@Module, where X is a variable. This allows
-  one to construct a term and then call it in a module. For instance,
-  the following will work: ..., p(X), X(a,Y), X@foo.
-  </li>
   <li>
     Major changes in the language: there are no firstorder predicates any
     more -- all are HiLog. See backward incompatibility.
   </li>
   <li>
+    It is now possible to add new rules to the program at run time as well as
+    create new program modules at run time. This is useful for agent
+    programming. Typically one would use this feature by creating a new module
+    and then adding rules to it at run time. Then calling the methods defined
+    in that module.
+  </li>
+  <li>
+   Inheritance is now implemented in accordance with the semantics defined in
+   <a href="ftp://ftp.cs.sunysb.edu/pub/TechReports/kifer/well-founded-optimizm.pdf">Well-Founded
+  Optimism: Inheritance in Frame-Based Knowledge
+  Bases</a>.  <i>Intl. Conference on Ontologies, DataBases, and Applications of
+  Semantics for Large Scale Information Systems (ODBASE), October, 2002.</i> 
+   In plain terms it means that inheritance now "works right."
+  </li>
+  <li>It is now possible to call X@Module, where X is a variable. This allows
+  one to construct a term and then call it in a module. For instance,
+  the following will work: ..., p(X), X(a,Y), X@foo.
+  </li>
+  <li>
     Flora now honors XSB directives --nobanner, --noprompt, --quietload. This
     makes it easier to put graphical interfaces on top of Flora and simplifies
     interprogram communication.
@@ -36,7 +58,16 @@
 </ul>
 <h3>Bugfixes</h3>
 <ul>
-  <li>Great many</li>
+  <li>There was a subtle bug in the behavior of multiple inheritance. This has
+  now been fixed. Inheritance (and especially multiple inheritance)
+  has now a well-defined model theoretic semantics, as described in
+  <a href="ftp://ftp.cs.sunysb.edu/pub/TechReports/kifer/well-founded-optimizm.pdf">Well-Founded
+  Optimism: Inheritance in Frame-Based Knowledge
+  Bases</a>.  <i>Intl. Conference on Ontologies, DataBases, and Applications of
+  Semantics for Large Scale Information Systems (ODBASE), October, 2002.</i> 
+
+  </li>
+  <li>Great many other small fixes.</li>
 </ul>
 <h3>Backward Incompatibility</h3>
 <ul>

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv8532

Modified Files:
	flora2.tex 
Log Message:
put in Chang's description of dynamic rules


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- flora2.tex	20 Dec 2002 05:11:46 -0000	1.28
+++ flora2.tex	21 Dec 2002 05:10:17 -0000	1.29
@@ -146,13 +146,15 @@
 \title{
         \FLORA: User's Manual
            \\
-       {\Large Version 0.90}
+       {\Large Version 0.91}
        }
 
 \author{
   {Guizhen Yang
-  \hspace{3cm}
-  Michael Kifer}
+  \hspace{1cm}
+  Michael Kifer
+  \hspace{1cm}
+  Chang Zhao}
   \\\\
   Department of Computer Science\\
   Stony Brook University\\
@@ -2932,6 +2934,7 @@
 {\tt X:=:Y :- X[similar->Y].} \\
 \end{quote}
 
+\index{equality maintenance level}
 \paragraph{Equality maintenance levels.}
 Once an equality between terms is derived, this information may need to be
 propagated to all \fl 
@@ -4519,6 +4522,214 @@
 methods should not occur. 
 
 
+\section{Rule Insertion}
+
+\index{rule insertion}
+\index{rule!static}
+\index{rule!dynamic}
+\index{dynamic rule}
+\index{static rule}
+%%
+\FLORA supports \emph{non-backtrackable} insertion of rules into modules.
+A \FLORA module gets created when a program is loaded into it, as described
+in Section~\ref{sec-shell-commands}, or it can be created using the
+primitive {\tt newmodule}. Subsequently, rules can be added to an existing
+module. Rules that are inserted via the {\tt insertrule} command are
+called \emph{dynamic} and the rules loaded using the {\tt flLoad} or
+{\tt [...]} commands are called \emph{static} or \emph{compiled}.
+As mentioned in Section~\ref{sec-updates}, \FLORA predicates and molecules 
+can have both static and dynamic parts and no special declaration is
+required to make a predicate dynamic. The same molecule or a predicate can
+be defined by a mixture of static or dynamic rules.
+
+In this section, we will first look at the syntax of creating new modules.
+Then we will describe how to insert rules and, finally,  we address other
+related issues, including tabling, indexing, and the cut.
+
+
+\subsection{Creating a Module}
+
+
+\index{newmodule/1}
+%%
+The syntax for creating a new module is as follows:
+{\tt
+\begin{quote}
+\emph{newmodule}\{\emph{modulename} [\emph{equalityMaintenanceLevel}]\}
+\end{quote}
+}
+\index{equality maintenance level}
+%%
+\noindent
+where {\tt equalityMaintenanceLevel} can be {\tt none}, {\tt basic}, or {\tt
+  flogic}, with {\tt none} being the default (see
+  Section~\ref{sec-eqmaintain} for the details about equality maintenance
+  in \FLORA). This creates a
+blank module with the given name and the equality maintenance level,
+provided that no existing module is using the same name. A module
+created using {\tt newmodule} can be used exactly the same way as the
+modules that are created by loading user programs.
+
+
+\subsection{Inserting Rules}
+
+
+\index{newmodule\_a}
+\index{newmodule\_z}
+%%
+Dynamic rules can be inserted before all static rules, using the primitive
+{\tt insertrule\_a}, or after all static rules, using the primitive {\tt
+  insertrule\_z}. Several rules can be inserted in the same command. The
+syntax of inserting a list of rules is as follows: {\tt
+\begin{quote}
+\emph{insruleop}\{\emph{rulelist}\}
+\end{quote}
+}
+\noindent
+where \emph{insruleop} is either {\tt insertrule\_a} or {\tt
+  insertrule\_z}, rulelist is a comma-separated list of rules.  The rules
+  being inserted \emph{should not} terminate with a
+period (unlike the static program rules):
+%%
+\begin{quote}
+\begin{verbatim}
+flora2 ?- insertrule_a{X:student:-enroll(X,_T)}.
+\end{verbatim}
+\end{quote}
+%%
+The above inserts the rule {\tt X:student :- enroll(X,\_T)} in
+front of the current module.
+
+If a rule is meant to be inserted into a module other than the current one,
+then the rule needs to be parenthesized \emph{and} the module name must be
+attached using the usual module operator {\tt @}. If several rules need to
+be inserted using the same command, each rule must be parenthesized.
+For example, the following statement inserts the same rule into two
+different modules: the current one and into module {\tt mod1}.
+%%
+\begin{quote}
+\begin{verbatim}
+flora2 ?- insertrule_a{(X:student:-enroll(X,_T)),
+                       (X:student:-enroll(X,_T))@mod1}.
+\end{verbatim}
+\end{quote}
+As a result, the rule {\tt X:student:-enroll(X,\_T)} will be inserted in
+front of each of these two modules.
+For this to be executed successfully, the module {\tt mod1} must already
+exist.
+
+
+\subsection{Tabling and Indexing of Dynamically Defined Predicates}
+
+If a rule needs to be inserted for a new predicate (which was not seen
+before), the system needs to know whether the predicate is to be tabled
+and how it should be indexed. By default, new predicates are not tabled and
+are indexed on the first argument. To change that,
+\FLORA provides instructions to table and index new predicates in
+modules. We will describe the syntax of the tabling and
+indexing instructions. 
+
+\paragraph{Tabling Dynamically Defined Predicates.} Suppose we have the
+following program: 
+\begin{quote}
+\begin{verbatim}
+?- newmodule{mod1}. 
+?- insertrule_a{(tc(X,Y):-e(X,Y))@mod1, (tc(X,Y):-tc(X,Z),e(Z,Y))@mod1}.
+?- insert{e(a,b)@mod1,e(b,c)@mod1}.
+?- tc(X,Y)@mod1.
+\end{verbatim}
+\end{quote}
+\noindent
+This program is not going to terminate unless we table {\tt tc/2} in {\tt
+  mod1}. To do so, the following executable directive can be used:
+%%
+\begin{quote}
+\begin{verbatim}
+?- table(mod1,tc/2).
+\end{verbatim}
+\end{quote}
+%%
+The module name is optional in the tabling directive. For instance,
+%%
+\begin{quote}
+\begin{verbatim}
+?- table(tc/2).
+\end{verbatim}
+\end{quote}
+%%
+tables {\tt tc/2} in the current module.  If we want to table more than one
+predicates for the same module in one tabling instruction, the predicates
+should be enclosed in parentheses. For example,
+\begin{quote}
+\begin{verbatim}
+?- table(mod2,(p/1/2,tc/2)). 
+\end{verbatim}
+\end{quote}
+\noindent
+tables {\tt p/1/2} and {\tt tc/2} in module {\tt mod2}.
+Please refer to Section~\ref{sec-tabling-flora} for more details on tabling
+in \FLORA.
+
+Note that when a tabling instruction is executed, there should be no rules
+(either static or inserted) that define the same predicate. Otherwise,
+the tabling directive will have no effect.
+The module must also exist prior to the execution of the tabling
+instruction. For instance,
+\begin{quote}
+\begin{verbatim}
+?- newmodule{mod1}. 
+?- table(mod1,tc/2).
+?- insertrule_a{(tc(X,Y):-e(X,Y))@mod1, (tc(X,Y):-tc(X,Z),e(Z,Y))@mod1}.
+\end{verbatim}
+\end{quote}
+will work, but if the newmodule/2 instruction were not executed prior then
+a runtime error will result.
+
+\paragraph{Indexing Dynamically Defined Predicates} Sometimes we need to
+index inserted rules in some module and \FLORA provides an indexing instruction
+for this purpose. For instance,
+\begin{quote}
+\begin{verbatim}
+?- newmodule{mod1}. 
+?- index(mod1,3-2).
+\end{verbatim}
+\end{quote}
+\noindent
+says that all HiLog predicates of arity 3 should be indexed on
+argument 2 provided that currently there are no such predicates defined.
+
+Similarly to the tabling instruction, the module name is optional, and there
+can be more than one arity-argument pairs in one indexing instruction.
+
+\paragraph{A Problem with Cuts} What is behind rule insertion is pretty
+simple. As we know from Section~\ref{sec-updates}, every predicate and
+object has a base part and a derived part. Now we further divide the
+derived part into three sub-parts: the \emph{dyna sub-part} (the part that
+precedes all other facts in the predicate), the static sub-part, and the
+\emph{dynz sub-part}. All rules inserted using {\tt insertrule\_a} go into
+the dyna sub-part; all the rules in the program file go into the static
+sub-part; and all the rules inserted using {\tt insertrule\_z} go into the
+dynz sub-part.
+
+This works well when there are no cuts in rules inserted by {\tt
+  insertrule\_a}. With the cuts, the program might not
+behave as expected. For example, if we have the following program:
+\begin{quote}
+\begin{verbatim}
+p(X) :- r(X).
+r(a).
+q(b).
+?- insertrule_a{p(X) :- q(X),!}.
+?- p(X).
+\end{verbatim}
+\end{quote}
+\noindent
+we normally expect the answer is {\tt b} only. However, \FLORA
+will return two answers, {\tt a} and {\tt b}, because the cut affects only the
+dyna sub-part of p(X), instead of all the rules for {\tt p/1}.
+
+
+
 \section{Control Flow Statements}\label{sec:control}
 
 \FLORA supports a number of control statements that are commonly used in
@@ -5669,7 +5880,7 @@
 \section{Authors}
 \FLORA was designed and implemented by Guizhen Yang. Some architectural
 ideas, such as the use of trailer files to implement the F-logic semantics,
-trace back to the \FLIP compiler developed by Bertram Lud\"aescher.
+were inspired by the \FLIP compiler developed by Bertram Lud\"aescher.
 
 Michael Kifer helped design \FLORA, implemented the debugger, and some
 other features.
@@ -5677,7 +5888,7 @@
 Chang Zhao made a great many of crucial enhancements to the
 system, such as run-time undefinedness checks, the checker for
 dependency among tabled predicates and updates, tabling of HiLog
-predicates, and assertion and retraction of general \FLORA program clauses.
+predicates, and assertion and retraction of program rules.
 
 
 \appendix

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv18800

Modified Files:
	flora2.tex 
Log Message:
typos


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- flora2.tex	6 Dec 2002 07:31:00 -0000	1.27
+++ flora2.tex	20 Dec 2002 05:11:46 -0000	1.28
@@ -3617,11 +3617,11 @@
  :- table p/2/1/3.  
 \end{verbatim}
 %%
-will cause a parsing error.  However, note that {\tt :- table p/1/3.} will
-table all predicates of the form {\tt p(a,b)(d)/1} as well. The difference
-is that it will also table {\tt p(a,b,c)(d)/1}, {\tt p(w)(f)/1}, etc.  In
-contrast, if {\tt :- table p/2/1/3.} were allowed, then the last two
-forms would not have been tabled.\footnote{
+will cause a parsing error.  However, note that {\tt :- table X/1/3.} will
+also table all 3-level predicates of the form {\tt p(\_,\_)(\_)/3}. The
+difference is that it will also table {\tt q(a,b,c)(d)/3}, {\tt r(w)(f)/3},
+etc.  In contrast, if {\tt :- table p/2/1/3.} were allowed, then the last
+two forms would not have been tabled.\footnote{
   %%
   The reason for not supporting this more elaborate tabling schema is
   because it is believed to be an overkill.

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs1:/tmp/cvs-serv23882

Modified Files:
	flrcoder.H flrcoder.P flrhilogtable.H flrhilogtable.P 
Log Message:
fix a bug in tabling hilog predicates

Index: flrcoder.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrcoder.H,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flrcoder.H	26 Nov 2002 21:06:47 -0000	1.6
+++ flrcoder.H	19 Dec 2002 23:03:59 -0000	1.7
@@ -89,5 +89,6 @@
 	is_flogic/4,
 	is_fllibdb/1,
 	get_fingerprint/6,
+	check_tabled/2,
 	flora_write_struct/2,
 	flora_build_struct/6.

Index: flrcoder.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcoder.P,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- flrcoder.P	26 Nov 2002 21:06:47 -0000	1.9
+++ flrcoder.P	19 Dec 2002 23:04:00 -0000	1.10
@@ -246,8 +246,22 @@
 flora_tabled_hilog(Head,WP,A,AList) :-
     is_prtermlit(Head,FObj,N,ObjList),
     get_fingerprint(FObj,N,WP,P,A,Args),
-    (var(P),flora_hilogtable(Def_P,A),var(Def_P),!;atom(P),flora_hilogtable(P,A)),
+    check_tabled(P,A),
     append(Args,ObjList,AList).
+
+check_tabled(P,A) :-
+    var(P),
+    flora_hilogtable(Def_P,A),
+    var(Def_P),
+    !.
+
+check_tabled(P,A) :-
+    atom(P),
+    flora_hilogtable(P,A),
+    !.
+
+check_tabled(_P,FL_SLASH(_M,N)) :-
+    check_tabled(_,N).
 
 /****************************************************************************
   flora_divide_program(+CompiledRuleList,-RuleList,-FactList)

Index: flrhilogtable.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrhilogtable.H,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flrhilogtable.H	26 Nov 2002 05:09:49 -0000	1.3
+++ flrhilogtable.H	19 Dec 2002 23:04:00 -0000	1.4
@@ -35,7 +35,6 @@
 :- index(flora_hilogtable/2,trie).
 :- index(flora_not_tabled_head/2,trie).
 
-:- import subsumes/2 from subsumes.
 :- import
 	is_prdirective/2,
 	is_prtable/3,
@@ -43,6 +42,7 @@
 	is_pratomlit/3,
 	is_prtermlit/4,
 	get_fingerprint/6,
+	check_tabled/2,
     flora_write_struct/2
    from flrcoder.
 

Index: flrhilogtable.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrhilogtable.P,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flrhilogtable.P	26 Nov 2002 05:09:49 -0000	1.3
+++ flrhilogtable.P	19 Dec 2002 23:04:00 -0000	1.4
@@ -89,15 +89,28 @@
   flora_check_tabled_registry(+ModuleName,+Functor,+Arity)
 ****************************************************************************/
 flora_check_tabled_registry(Module,Pred,N) :-
-	var(Pred), flora_tabled_registry(Module,P,N),var(P),!;
-    atom(Pred), flora_tabled_registry(Module,P,N).
+    var(Pred), flora_tabled_registry(Module,P,N),var(P),!.
+flora_check_tabled_registry(Module,Pred,N) :-
+    atom(Pred), flora_tabled_registry(Module,Pred,N),!.
+flora_check_tabled_registry(Module,_Pred,FL_SLASH(_M,N)) :-
+    flora_check_tabled_registry(Module,_,N).
 
 /****************************************************************************
   flora_check_not_tabled_registry(+ModuleName,+Functor,+Arity)
 ****************************************************************************/
 flora_check_not_tabled_registry(Module,Pred,N) :-
-	flora_not_tabled_registry(Module,P,N),
-	subsumes(Pred,P).
+    atom(Pred), flora_not_tabled_registry(Module,P,N), P==Pred, !.
+
+flora_check_not_tabled_registry(Module,Pred,N) :-
+    var(Pred), flora_not_tabled_registry(Module,Pred,N), !.
+
+flora_check_not_tabled_registry(Module,Pred,N) :-
+    var(Pred),
+    flora_not_tabled_registry(Module,_P,FL_SLASH(_M,N1)),
+    match(N,N1).
+
+match(N,N) :- !.
+match(N,FL_SLASH(_M,N1)) :- match(N,N1).
 
 /****************************************************************************
   flora_enter_tabled_registry(+ModuleName,+Functor,+Arity)
@@ -114,11 +127,15 @@
   flora_enter_not_tabled_registry(+ModuleName,+Functor,+Arity)
 ****************************************************************************/
 flora_enter_not_tabled_registry(Module,Pred,N) :-
-	( var(Pred) ->
-	    assert(flora_not_tabled_registry(Module,Pred,N))
+	( atom(Pred),flora_not_tabled_registry(Module,P,N),P==Pred ->
+	    true
 	;
-	    ( flora_not_tabled_registry(Module,Pred,N), !;
-	      assert(flora_not_tabled_registry(Module,Pred,N)))
+	    ( var(Pred), flora_not_tabled_registry(Module,Pred,N) ->
+		true
+	    ;
+
+		assert(flora_not_tabled_registry(Module,Pred,N))
+	    )
 	).
 
 
@@ -182,19 +199,24 @@
 	is_prtermlit(Term,FObj,M,_ObjList),
 	!,
 	get_fingerprint(FObj,M,WF,F,N,_VL),
-	( atom(F),(flora_hilogtable(F,N);flora_not_tabled_head(F,N)) ->
-        true
-    ;
-        ( (flora_hilogtable(F1,N),var(F1);flora_not_tabled_head(F1,N),var(F1)) ->
-            true
-        ;
+	( check_tabled(F,N) ->
+	    true
+	;
+	    ( atom(F),flora_not_tabled_head(F1,N),F1==F ->
+		true
+	    ;
+		( var(F),flora_not_tabled_head(F,N) ->
+		    true
+		;
+
 		    flora_define_not_tabled_head(F,N),
-            flora_write_atom('?- flora_enter_not_tabled_registry(FLORA_THIS_MODULE_NAME,'),
-            flora_write_struct(WF,FLBODYPREFIX),
-            put(0',),
-            write(N),
-            flora_write_atom(').'),
-            nl
+            	    flora_write_atom('?- flora_enter_not_tabled_registry(FLORA_THIS_MODULE_NAME,'),
+            	    flora_write_struct(WF,FLBODYPREFIX),
+            	    put(0',),
+            	    write(N),
+            	    flora_write_atom(').'),
+            	    nl
+	        )
 	    )
 	).
 

Update of /cvsroot/flora/flora2/syslib
In directory sc8-pr-cvs1:/tmp/cvs-serv23882/syslib

Modified Files:
	flrdynrule.P 
Log Message:
fix a bug in tabling hilog predicates

Index: flrdynrule.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdynrule.P,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrdynrule.P	11 Dec 2002 22:02:54 -0000	1.2
+++ flrdynrule.P	19 Dec 2002 23:04:01 -0000	1.3
@@ -308,6 +308,16 @@
 
 runtime_get_fingerprint(Pred,Args,NewPred,Arity) :-
 	Pred =.. [WRAP_HILOG,Pred1|Args1],
-	runtime_get_fingerprint(Pred1,Args1,NewPred,A1),
-	length(Args,A2),
-	Arity=FL_SLASH(A1,A2).
+	length(Args,N),
+	runtime_get_fingerprint(Pred1,Args1,N,NewPred,Arity).
+
+runtime_get_fingerprint(Pred,Args,N,Pred,FL_SLASH(M,N)) :-
+	(atomic(Pred);var(Pred)),
+	!,
+	length(Args,M).
+
+runtime_get_fingerprint(Pred,Args,N,NewPred,Arity) :-
+	Pred =.. [WRAP_HILOG,Pred1|Args1],
+	length(Args,M),
+	runtime_get_fingerprint(Pred1,Args1,FL_SLASH(M,N),NewPred,Arity).
+

Update of /cvsroot/flora/flora2/debugger
In directory sc8-pr-cvs1:/tmp/cvs-serv25779/debugger

Modified Files:
	static_data.in flrdebugger.P 
Log Message:
tell the user when during tracing we try to check against the database


Index: static_data.in
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/static_data.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- static_data.in	9 Dec 2002 06:36:32 -0000	1.4
+++ static_data.in	14 Dec 2002 03:27:25 -0000	1.5
@@ -69,7 +69,7 @@
 hide_this_hide(flora_commit_storage,0).
 hide_this_hide(flora_commit_storage,1).
 hide_this_hide(flora_load_file,1).
-hide_this_hide(FLLIBLOAD,1).
+hide_this_hide(FLLIBLOAD,4).
 
 hide_this_hide(flora_funct_arity,2).
 

Index: flrdebugger.P
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/flrdebugger.P,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- flrdebugger.P	9 Dec 2002 06:36:32 -0000	1.7
+++ flrdebugger.P	14 Dec 2002 03:27:25 -0000	1.8
@@ -139,8 +139,11 @@
 	; Type == (inheritance)
 	-> flora_write_dbg_item('(Trying to derive by inheritance) '),
 	    flora_write_flogic(Basename,ArgList,Workspace)
-	; Type == (dynamichead)
-	-> 
+	; Type == (dynhead_before)
+	-> flora_write_dbg_item('(Trying to derive by dynamic before-rules) '),
+	    flora_write_flogic(Basename,ArgList,Workspace)
+	; Type == (dynhead_after)
+	-> flora_write_dbg_item('(Trying to derive by dynamic after-rules) '),
 	    flora_write_flogic(Basename,ArgList,Workspace)
 	),
 	!.
@@ -573,8 +576,10 @@
 	-> (Prefix=inheritance_
 	   -> Basename = Basename1, Type = (inheritance), ArgList = ArgList1
 	   
-	   ; (Prefix=dyna_ ; Prefix=dynz_)
-	   -> Basename = Basename1, Type = (dynamichead), ArgList = ArgList1
+	   ; Prefix=dyna_ % This is actually hidden (possible future use)
+	   -> Basename = Basename1, Type = (dynhead_before), ArgList = ArgList1
+	   ; Prefix=dynz_ % This is actually hidden (possible future use)
+	   -> Basename = Basename1, Type = (dynhead_after), ArgList = ArgList1
 
 	   ;   %% must be a hilog predicate derivative formed by specialization
 	       %% such as FLORA_PREFIX'usermod''main''flapply_#303'
@@ -585,7 +590,8 @@
 	; Type1 == (prolog), Basename1 = FLORA_DB_FIND_PREDICATE,
 	    Call =.. [FLORA_DB_FIND_PREDICATE,Trie,RealCall],
 	    flora_match_substring(FLORA_PREFIX,Trie,forward,0,_)
-	->  flora_decode_predicate(RealCall,Type,Workspace,_,Basename,ArgList)
+	->  flora_write_dbg_item('(Checking against base facts) '),
+	    flora_decode_predicate(RealCall,Type,Workspace,_,Basename,ArgList)
 	; Type = Type1, Basename = Basename1, ArgList = ArgList1
 	).
 

Update of /cvsroot/flora/flora2/genincludes
In directory sc8-pr-cvs1:/tmp/cvs-serv14860/genincludes

Modified Files:
	flrdyna.fli flrdynz.fli 
Log Message:
fix bugs in patch rules for rule insertion; make equality(trailer) mean equality(trailer, thismodule) instead of equality(trailer,default_module)

Index: flrdyna.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrdyna.fli,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrdyna.fli	8 Dec 2002 09:45:32 -0000	1.2
+++ flrdyna.fli	11 Dec 2002 22:02:53 -0000	1.3
@@ -295,47 +295,47 @@
 
 ?- abolish(FLDYNAPREFIX(WRAP_ISA)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_SUB)/2).
-?- abolish(FLDYNAPREFIX(WRAP_METH)/2).
-?- abolish(FLDYNAPREFIX(WRAP_IMETH)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_FD)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_IFD)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_FDSIG)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_IFDSIG)/3).
-?- abolish(FLDYNAPREFIX(WRAP_FDDEF)/2).
-?- abolish(FLDYNAPREFIX(WRAP_IFDDEF)/2).
+?- abolish(FLDYNAPREFIX(WRAP_FDSIGDEF)/2).
+?- abolish(FLDYNAPREFIX(WRAP_IFDSIGDEF)/2).
+?- abolish(FLDYNAPREFIX(WRAP_METH)/2).
+?- abolish(FLDYNAPREFIX(WRAP_IMETH)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_MVD)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_IMVD)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_MVDSIG)/3).
 ?- abolish(FLDYNAPREFIX(WRAP_IMVDSIG)/3).
+?- abolish(FLDYNAPREFIX(WRAP_MVDSIGDEF)/2).
+?- abolish(FLDYNAPREFIX(WRAP_IMVDSIGDEF)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_MVDDEF)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_IMVDDEF)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_TRAN)/2).
-?- abolish(FLDYNAPREFIX(WRAP_MVDINC)/3).
-?- abolish(FLDYNAPREFIX(WRAP_IMVDINC)/3).
-?- abolish(FLDYNAPREFIX(WRAP_MVDTOLIST)/3).
-?- abolish(FLDYNAPREFIX(WRAP_IMVDTOLIST)/3).
+?- abolish(FLDYNAPREFIX(WRAP_EXISTS)/1).
+?- abolish(FLDYNAPREFIX(WRAP_OBJEQL)/2).
 
 ?- abolish(FLDYNZPREFIX(WRAP_ISA)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_SUB)/2).
-?- abolish(FLDYNZPREFIX(WRAP_METH)/2).
-?- abolish(FLDYNZPREFIX(WRAP_IMETH)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_FD)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_IFD)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_FDSIG)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_IFDSIG)/3).
-?- abolish(FLDYNZPREFIX(WRAP_FDDEF)/2).
-?- abolish(FLDYNZPREFIX(WRAP_IFDDEF)/2).
+?- abolish(FLDYNZPREFIX(WRAP_FDSIGDEF)/2).
+?- abolish(FLDYNZPREFIX(WRAP_IFDSIGDEF)/2).
+?- abolish(FLDYNZPREFIX(WRAP_METH)/2).
+?- abolish(FLDYNZPREFIX(WRAP_IMETH)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_MVD)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_IMVD)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_MVDSIG)/3).
 ?- abolish(FLDYNZPREFIX(WRAP_IMVDSIG)/3).
+?- abolish(FLDYNZPREFIX(WRAP_MVDSIGDEF)/2).
+?- abolish(FLDYNZPREFIX(WRAP_IMVDSIGDEF)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_MVDDEF)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_IMVDDEF)/2).
 ?- abolish(FLDYNZPREFIX(WRAP_TRAN)/2).
-?- abolish(FLDYNZPREFIX(WRAP_MVDINC)/3).
-?- abolish(FLDYNZPREFIX(WRAP_IMVDINC)/3).
-?- abolish(FLDYNZPREFIX(WRAP_MVDTOLIST)/3).
-?- abolish(FLDYNZPREFIX(WRAP_IMVDTOLIST)/3).
+?- abolish(FLDYNZPREFIX(WRAP_EXISTS)/1).
+?- abolish(FLDYNZPREFIX(WRAP_OBJEQL)/2).
 
 :- dynamic
 	FLDYNAPREFIX(WRAP_ISA)/2,FLDYNZPREFIX(WRAP_ISA)/2,
@@ -346,19 +346,19 @@
 	FLDYNAPREFIX(WRAP_IFD)/3,FLDYNZPREFIX(WRAP_IFD)/3,
 	FLDYNAPREFIX(WRAP_FDSIG)/3,FLDYNZPREFIX(WRAP_FDSIG)/3,
 	FLDYNAPREFIX(WRAP_IFDSIG)/3,FLDYNZPREFIX(WRAP_IFDSIG)/3,
-	FLDYNAPREFIX(WRAP_FDDEF)/2,FLDYNZPREFIX(WRAP_FDDEF)/2,
-	FLDYNAPREFIX(WRAP_IFDDEF)/2,FLDYNZPREFIX(WRAP_IFDDEF)/2,
+	FLDYNAPREFIX(WRAP_FDSIGDEF)/2,FLDYNZPREFIX(WRAP_FDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_IFDSIGDEF)/2,FLDYNZPREFIX(WRAP_IFDSIGDEF)/2,
 	FLDYNAPREFIX(WRAP_MVD)/3,FLDYNZPREFIX(WRAP_MVD)/3,
 	FLDYNAPREFIX(WRAP_IMVD)/3,FLDYNZPREFIX(WRAP_IMVD)/3,
 	FLDYNAPREFIX(WRAP_MVDSIG)/3,FLDYNZPREFIX(WRAP_MVDSIG)/3,
 	FLDYNAPREFIX(WRAP_IMVDSIG)/3,FLDYNZPREFIX(WRAP_IMVDSIG)/3,
+	FLDYNAPREFIX(WRAP_MVDSIGDEF)/2,FLDYNZPREFIX(WRAP_MVDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_IMVDSIGDEF)/2,FLDYNZPREFIX(WRAP_IMVDSIGDEF)/2,
 	FLDYNAPREFIX(WRAP_MVDDEF)/2,FLDYNZPREFIX(WRAP_MVDDEF)/2,
 	FLDYNAPREFIX(WRAP_IMVDDEF)/2,FLDYNZPREFIX(WRAP_IMVDDEF)/2,
 	FLDYNAPREFIX(WRAP_TRAN)/2,FLDYNZPREFIX(WRAP_TRAN)/2,
-	FLDYNAPREFIX(WRAP_MVDINC)/3,FLDYNZPREFIX(WRAP_MVDINC)/3,
-	FLDYNAPREFIX(WRAP_IMVDINC)/3,FLDYNZPREFIX(WRAP_IMVDINC)/3,
-	FLDYNAPREFIX(WRAP_MVDTOLIST)/3,FLDYNZPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNAPREFIX(WRAP_IMVDTOLIST)/3,FLDYNZPREFIX(WRAP_IMVDTOLIST)/3.
+	FLDYNAPREFIX(WRAP_EXISTS)/1,FLDYNZPREFIX(WRAP_EXISTS)/1,
+	FLDYNAPREFIX(WRAP_OBJEQL)/2,FLDYNZPREFIX(WRAP_OBJEQL)/2.
 
 FLHEADPREFIX(WRAP_ISA)(X,Y) :- 
 	FLDYNAPREFIX(WRAP_ISA)(X,Y).
@@ -378,18 +378,18 @@
 FLHEADPREFIX(WRAP_IFD)(X,Y,Z) :-
 	FLDYNAPREFIX(WRAP_IFD)(X,Y,Z).
 
-FLHEADPREFIX(WRAP_FDDEF)(X,Y) :-
-	FLDYNAPREFIX(WRAP_FDDEF)(X,Y).
-	    
-FLHEADPREFIX(WRAP_IFDDEF)(X,Y) :-
-	FLDYNAPREFIX(WRAP_IFDDEF)(X,Y).
-	    
 FLHEADPREFIX(WRAP_FDSIG)(X,Y,Z) :-
 	FLDYNAPREFIX(WRAP_FDSIG)(X,Y,Z).
 	    
 FLHEADPREFIX(WRAP_IFDSIG)(X,Y,Z) :-
 	FLDYNAPREFIX(WRAP_IFDSIG)(X,Y,Z).
 	    
+FLHEADPREFIX(WRAP_FDSIGDEF)(X,Y) :-
+	FLDYNAPREFIX(WRAP_FDSIGDEF)(X,Y).
+	    
+FLHEADPREFIX(WRAP_IFDSIGDEF)(X,Y) :-
+	FLDYNAPREFIX(WRAP_IFDSIGDEF)(X,Y).
+	    
 FLHEADPREFIX(WRAP_MVD)(X,Y,Z) :-
 	FLDYNAPREFIX(WRAP_MVD)(X,Y,Z).
 	    
@@ -408,17 +408,17 @@
 FLHEADPREFIX(WRAP_IMVDSIG)(X,Y,Z) :-
 	FLDYNAPREFIX(WRAP_IMVDSIG)(X,Y,Z).
 
-FLHEADPREFIX(WRAP_MVDINC)(X,Y,Z) :-
-	FLDYNAPREFIX(WRAP_MVDINC)(X,Y,Z).
-	    
-FLHEADPREFIX(WRAP_IMVDINC)(X,Y,Z) :-
-	FLDYNAPREFIX(WRAP_IMVDINC)(X,Y,Z).
+FLHEADPREFIX(WRAP_MVDSIGDEF)(X,Y) :-
+	FLDYNAPREFIX(WRAP_MVDSIGDEF)(X,Y).
 	    
-FLHEADPREFIX(WRAP_MVDTOLIST)(X,Y,Z) :-
-	FLDYNAPREFIX(WRAP_MVDTOLIST)(X,Y,Z).
+FLHEADPREFIX(WRAP_IMVDSIGDEF)(X,Y) :-
+	FLDYNAPREFIX(WRAP_IMVDSIGDEF)(X,Y).
+
+FLHEADPREFIX(WRAP_EXISTS)(X) :-
+	FLDYNAPREFIX(WRAP_EXISTS)(X).
 	    
-FLHEADPREFIX(WRAP_IMVDTOLIST)(X,Y,Z) :-
-	FLDYNAPREFIX(WRAP_IMVDTOLIST)(X,Y,Z).
+FLHEADPREFIX(WRAP_OBJEQL)(X,Y) :-
+	FLDYNAPREFIX(WRAP_OBJEQL)(X,Y).
 	    
 FLHEADPREFIX(WRAP_TRAN)(X,Y) :-
 	FLDYNAPREFIX(WRAP_TRAN)(X,Y).

Index: flrdynz.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrdynz.fli,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrdynz.fli	8 Dec 2002 09:45:32 -0000	1.2
+++ flrdynz.fli	11 Dec 2002 22:02:53 -0000	1.3
@@ -119,18 +119,18 @@
 FLHEADPREFIX(WRAP_IFD)(X,Y,Z) :-
 	FLDYNZPREFIX(WRAP_IFD)(X,Y,Z).
 
-FLHEADPREFIX(WRAP_FDDEF)(X,Y) :-
-	FLDYNZPREFIX(WRAP_FDDEF)(X,Y).
-	    
-FLHEADPREFIX(WRAP_IFDDEF)(X,Y) :-
-	FLDYNZPREFIX(WRAP_IFDDEF)(X,Y).
-	    
 FLHEADPREFIX(WRAP_FDSIG)(X,Y,Z) :-
 	FLDYNZPREFIX(WRAP_FDSIG)(X,Y,Z).
 	    
 FLHEADPREFIX(WRAP_IFDSIG)(X,Y,Z) :-
 	FLDYNZPREFIX(WRAP_IFDSIG)(X,Y,Z).
 	    
+FLHEADPREFIX(WRAP_FDSIGDEF)(X,Y) :-
+	FLDYNZPREFIX(WRAP_FDSIGDEF)(X,Y).
+	    
+FLHEADPREFIX(WRAP_IFDSIGDEF)(X,Y) :-
+	FLDYNZPREFIX(WRAP_IFDSIGDEF)(X,Y).
+	    
 FLHEADPREFIX(WRAP_MVD)(X,Y,Z) :-
 	FLDYNZPREFIX(WRAP_MVD)(X,Y,Z).
 	    
@@ -149,17 +149,17 @@
 FLHEADPREFIX(WRAP_IMVDSIG)(X,Y,Z) :-
 	FLDYNZPREFIX(WRAP_IMVDSIG)(X,Y,Z).
 
-FLHEADPREFIX(WRAP_MVDINC)(X,Y,Z) :-
-	FLDYNZPREFIX(WRAP_MVDINC)(X,Y,Z).
-	    
-FLHEADPREFIX(WRAP_IMVDINC)(X,Y,Z) :-
-	FLDYNZPREFIX(WRAP_IMVDINC)(X,Y,Z).
+FLHEADPREFIX(WRAP_MVDSIGDEF)(X,Y) :-
+	FLDYNZPREFIX(WRAP_MVDSIGDEF)(X,Y).
 	    
-FLHEADPREFIX(WRAP_MVDTOLIST)(X,Y,Z) :-
-	FLDYNZPREFIX(WRAP_MVDTOLIST)(X,Y,Z).
+FLHEADPREFIX(WRAP_IMVDSIGDEF)(X,Y) :-
+	FLDYNZPREFIX(WRAP_IMVDSIGDEF)(X,Y).
+
+FLHEADPREFIX(WRAP_EXISTS)(X) :-
+	FLDYNZPREFIX(WRAP_EXISTS)(X).
 	    
-FLHEADPREFIX(WRAP_IMVDTOLIST)(X,Y,Z) :-
-	FLDYNZPREFIX(WRAP_IMVDTOLIST)(X,Y,Z).
+FLHEADPREFIX(WRAP_OBJEQL)(X,Y) :-
+	FLDYNZPREFIX(WRAP_OBJEQL)(X,Y).
 	    
 FLHEADPREFIX(WRAP_TRAN)(X,Y) :-
 	FLDYNZPREFIX(WRAP_TRAN)(X,Y).

Update of /cvsroot/flora/flora2/syslib
In directory sc8-pr-cvs1:/tmp/cvs-serv14860/syslib

Modified Files:
	flrdynrule.P flrequality.P 
Log Message:
fix bugs in patch rules for rule insertion; make equality(trailer) mean equality(trailer, thismodule) instead of equality(trailer,default_module)

Index: flrdynrule.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdynrule.P,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flrdynrule.P	26 Nov 2002 05:03:42 -0000	1.1
+++ flrdynrule.P	11 Dec 2002 22:02:54 -0000	1.2
@@ -29,7 +29,10 @@
 #include "flora_terms.flh"
 :- import conset/2,conget/2 from gensym.
 :- import append/3,length/2 from basics.
-:- import flora_module_registry/1 from flrregistry.
+:- import
+	flora_module_registry/1,
+	flora_trailer_registry/1
+   from flrregistry.
 :- import
 	flora_error_line/1,
 	flora_error_line/2
@@ -204,6 +207,12 @@
 	    NewRule =.. [FL_IMPLYOP,InstHead,Body]
 	),
 	assert(NewRule),
+	(Pred==WRAP_OBJEQL ->
+		(flora_trailer_registry(Module),!;
+		assert(flora_trailer_registry(Module)))
+	;
+		true
+	),
 	flora_define_predicate(InstHead).
 
 /***********************************************************************

Index: flrequality.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrequality.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrequality.P	18 May 2002 17:43:28 -0000	1.1.1.1
+++ flrequality.P	11 Dec 2002 22:02:54 -0000	1.2
@@ -30,6 +30,7 @@
 
 
 :- import flloadtrailer/1, flloadtrailer/2 from flrutils.
+:- import flora_trailer_registry/1 from flrregistry.
 
 
 
@@ -37,5 +38,16 @@
 /*****************************************************************************
   fllibequality
 *****************************************************************************/
-fllibequality(A) :- (flloadtrailer(A) -> true; abort).
-fllibequality(A,M) :- (flloadtrailer(A,M) -> true; abort).
+fllibequality(A) :-
+	( flloadtrailer(A) ->
+		(flora_trailer_registry(FLORA_DEFAULT_WORKSPACE),!;
+		assert(flora_trailer_registry(FLORA_DEFAULT_WORKSPACE)))
+	;
+		abort
+	).
+fllibequality(A,M) :-
+	( flloadtrailer(A,M) ->
+		(flora_trailer_registry(M),!;assert(flora_trailer_registry(M)))
+	;
+		abort
+	).

Update of /cvsroot/flora/flora2/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv14860/includes

Modified Files:
	flrdefinition.flh 
Log Message:
fix bugs in patch rules for rule insertion; make equality(trailer) mean equality(trailer, thismodule) instead of equality(trailer,default_module)

Index: flrdefinition.flh
===================================================================
RCS file: /cvsroot/flora/flora2/includes/flrdefinition.flh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flrdefinition.flh	14 Jun 2002 09:05:32 -0000	1.3
+++ flrdefinition.flh	11 Dec 2002 22:02:53 -0000	1.4
@@ -22,6 +22,7 @@
 :- import flora_storage_registry/1,
      	  flora_debug_module_registry/1,
 	  flora_module_registry/1,
+	  flora_trailer_registry/1,
 	  flora_in_debug_mode/1
    from flrregistry.
 
@@ -47,6 +48,8 @@
       ;  true
       )
    ).
+
+?- retract(flora_trailer_registry(FLORA_THIS_MODULE_NAME)).
 
 
 /***********************************************************************/

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs1:/tmp/cvs-serv14860

Modified Files:
	flrcompiler.P flrregistry.P 
Log Message:
fix bugs in patch rules for rule insertion; make equality(trailer) mean equality(trailer, thismodule) instead of equality(trailer,default_module)

Index: flrcompiler.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.P,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- flrcompiler.P	26 Nov 2002 21:06:48 -0000	1.14
+++ flrcompiler.P	11 Dec 2002 22:02:51 -0000	1.15
@@ -4105,7 +4105,8 @@
 compile_execdirect(DirectTerm,Code) :-
 	( is_flequality(DirectTerm,T) ->
 	    compile_flatomvar(T,TObj),
-	    florasyslib_struct(FLLIBEQUALITY,1,[TObj],Code)
+	    thismodule_struct(MObj),
+	    florasyslib_struct(FLLIBEQUALITY,2,[TObj,MObj],Code)
 
 	; is_flequality(DirectTerm,T,M) ->
 	    compile_flatomvar(T,TObj),

Index: flrregistry.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrregistry.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrregistry.P	18 May 2002 17:43:26 -0000	1.1.1.1
+++ flrregistry.P	11 Dec 2002 22:02:52 -0000	1.2
@@ -2,6 +2,7 @@
 :- dynamic flora_module_registry/1.
 :- dynamic flora_debug_module_registry/1.
 :- dynamic flora_storage_registry/1.
+:- dynamic flora_trailer_registry/1.
 
 :- dynamic flora_in_debug_mode/1.
 :- index(flora_in_debug_mode/1,trie).
@@ -17,4 +18,5 @@
 	flora_debug_module_registry/1,
 	flora_in_debug_mode/1,
 	flora_storage_registry/1,
+	flora_trailer_registry/1,
 	flora_configuration/2.

Update of /cvsroot/flora/flora2/flrincludes
In directory sc8-pr-cvs1:/tmp/cvs-serv14860/flrincludes

Modified Files:
	flora_wspredicates.flh 
Log Message:
fix bugs in patch rules for rule insertion; make equality(trailer) mean equality(trailer, thismodule) instead of equality(trailer,default_module)

Index: flora_wspredicates.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_wspredicates.flh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flora_wspredicates.flh	9 Dec 2002 06:36:32 -0000	1.2
+++ flora_wspredicates.flh	11 Dec 2002 22:02:53 -0000	1.3
@@ -201,75 +201,48 @@
         WRAP_TABLED_HILOG/20, WRAP_TABLED_HILOG/21, WRAP_TABLED_HILOG/22.
 
 :- WRAP_WITH_WORKSPACE
-	FLHEADPREFIX(WRAP_ISA)/2,
-	FLHEADPREFIX(WRAP_SUB)/2,
-	FLHEADPREFIX(WRAP_METH)/2,
-	FLHEADPREFIX(WRAP_IMETH)/2,
-	FLHEADPREFIX(WRAP_FD)/3,
-	FLHEADPREFIX(WRAP_IFD)/3,
-	FLHEADPREFIX(WRAP_FDSIG)/3,
-	FLHEADPREFIX(WRAP_IFDSIG)/3,
-	FLHEADPREFIX(WRAP_FDDEF)/2,
-	FLHEADPREFIX(WRAP_IFDDEF)/2,
-	FLHEADPREFIX(WRAP_MVD)/3,
-	FLHEADPREFIX(WRAP_IMVD)/3,
-	FLHEADPREFIX(WRAP_MVDSIG)/3,
-	FLHEADPREFIX(WRAP_IMVDSIG)/3,
-	FLHEADPREFIX(WRAP_MVDDEF)/2,
-	FLHEADPREFIX(WRAP_IMVDDEF)/2,
-	FLHEADPREFIX(WRAP_TRAN)/2,
-	FLHEADPREFIX(WRAP_MVDINC)/3,
-	FLHEADPREFIX(WRAP_IMVDINC)/3,
-	FLHEADPREFIX(WRAP_MVDTOLIST)/3,
-	FLHEADPREFIX(WRAP_IMVDTOLIST)/3.
-
-:- WRAP_WITH_WORKSPACE
-	FLDYNAPREFIX(WRAP_ISA)/2,
 	FLDYNAPREFIX(WRAP_SUB)/2,
-	FLDYNAPREFIX(WRAP_METH)/2,
-	FLDYNAPREFIX(WRAP_IMETH)/2,
+	FLDYNAPREFIX(WRAP_ISA)/2,
 	FLDYNAPREFIX(WRAP_FD)/3,
 	FLDYNAPREFIX(WRAP_IFD)/3,
-	FLDYNAPREFIX(WRAP_FDSIG)/3,
-	FLDYNAPREFIX(WRAP_IFDSIG)/3,
-	FLDYNAPREFIX(WRAP_FDDEF)/2,
-	FLDYNAPREFIX(WRAP_IFDDEF)/2,
 	FLDYNAPREFIX(WRAP_MVD)/3,
 	FLDYNAPREFIX(WRAP_IMVD)/3,
-	FLDYNAPREFIX(WRAP_MVDSIG)/3,
-	FLDYNAPREFIX(WRAP_IMVDSIG)/3,
 	FLDYNAPREFIX(WRAP_MVDDEF)/2,
 	FLDYNAPREFIX(WRAP_IMVDDEF)/2,
+	FLDYNAPREFIX(WRAP_FDSIG)/3,
+	FLDYNAPREFIX(WRAP_FDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_IFDSIG)/3,
+	FLDYNAPREFIX(WRAP_IFDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_MVDSIG)/3,
+	FLDYNAPREFIX(WRAP_MVDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_IMVDSIG)/3,
+	FLDYNAPREFIX(WRAP_IMVDSIGDEF)/2,
+	FLDYNAPREFIX(WRAP_METH)/2,
+	FLDYNAPREFIX(WRAP_IMETH)/2,
 	FLDYNAPREFIX(WRAP_TRAN)/2,
-	FLDYNAPREFIX(WRAP_MVDINC)/3,
-	FLDYNAPREFIX(WRAP_IMVDINC)/3,
-	FLDYNAPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNAPREFIX(WRAP_IMVDTOLIST)/3,
 	FLDYNAPREFIX(WRAP_EXISTS)/1,
 	FLDYNAPREFIX(WRAP_OBJEQL)/2.
 
 :- WRAP_WITH_WORKSPACE
-	FLDYNZPREFIX(WRAP_ISA)/2,
 	FLDYNZPREFIX(WRAP_SUB)/2,
-	FLDYNZPREFIX(WRAP_METH)/2,
-	FLDYNZPREFIX(WRAP_IMETH)/2,
+	FLDYNZPREFIX(WRAP_ISA)/2,
 	FLDYNZPREFIX(WRAP_FD)/3,
 	FLDYNZPREFIX(WRAP_IFD)/3,
-	FLDYNZPREFIX(WRAP_FDSIG)/3,
-	FLDYNZPREFIX(WRAP_IFDSIG)/3,
-	FLDYNZPREFIX(WRAP_FDDEF)/2,
-	FLDYNZPREFIX(WRAP_IFDDEF)/2,
 	FLDYNZPREFIX(WRAP_MVD)/3,
 	FLDYNZPREFIX(WRAP_IMVD)/3,
-	FLDYNZPREFIX(WRAP_MVDSIG)/3,
-	FLDYNZPREFIX(WRAP_IMVDSIG)/3,
 	FLDYNZPREFIX(WRAP_MVDDEF)/2,
 	FLDYNZPREFIX(WRAP_IMVDDEF)/2,
+	FLDYNZPREFIX(WRAP_FDSIG)/3,
+	FLDYNZPREFIX(WRAP_FDSIGDEF)/2,
+	FLDYNZPREFIX(WRAP_IFDSIG)/3,
+	FLDYNZPREFIX(WRAP_IFDSIGDEF)/2,
+	FLDYNZPREFIX(WRAP_MVDSIG)/3,
+	FLDYNZPREFIX(WRAP_MVDSIGDEF)/2,
+	FLDYNZPREFIX(WRAP_IMVDSIG)/3,
+	FLDYNZPREFIX(WRAP_IMVDSIGDEF)/2,
+	FLDYNZPREFIX(WRAP_METH)/2,
+	FLDYNZPREFIX(WRAP_IMETH)/2,
 	FLDYNZPREFIX(WRAP_TRAN)/2,
-	FLDYNZPREFIX(WRAP_MVDINC)/3,
-	FLDYNZPREFIX(WRAP_IMVDINC)/3,
-	FLDYNZPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNZPREFIX(WRAP_IMVDTOLIST)/3,
 	FLDYNZPREFIX(WRAP_EXISTS)/1,
 	FLDYNZPREFIX(WRAP_OBJEQL)/2.
 

Update of /cvsroot/flora/flora2/debugger
In directory sc8-pr-cvs1:/tmp/cvs-serv23460/debugger

Modified Files:
	static_data.in flrdebugger.P dynamic_data.in 
Log Message:
adjustments to make the debugger work again


Index: static_data.in
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/static_data.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- static_data.in	9 Oct 2002 02:12:00 -0000	1.3
+++ static_data.in	9 Dec 2002 06:36:32 -0000	1.4
@@ -65,15 +65,17 @@
 
 hide_this_hide(flora_error_undefined,1).
 
-hide_this_hide(FLORA_DB_FIND_PREDICATE,2).
 hide_this_hide(FLORA_DB_RECLAIM_SPACE_PREDICATE,0).
 hide_this_hide(flora_commit_storage,0).
 hide_this_hide(flora_commit_storage,1).
 hide_this_hide(flora_load_file,1).
 hide_this_hide(FLLIBLOAD,1).
 
+hide_this_hide(flora_funct_arity,2).
+
 trace_this_noprint(flora_findall,3).
 
+show_this_hide(FLORA_DB_FIND_PREDICATE,2).
 show_this_hide(flP2H,2).
 
 %% These are handled by the debugger only if flTraceLow is NOT in effect.

Index: flrdebugger.P
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/flrdebugger.P,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flrdebugger.P	8 Dec 2002 09:46:01 -0000	1.6
+++ flrdebugger.P	9 Dec 2002 06:36:32 -0000	1.7
@@ -37,7 +37,8 @@
 :- import flora_configuration/2 from flrregistry.
 :- import process_control/2 from shell.
 :- import xpp_process_file/3 from parse.
-:- import member/2, append/3, length/2 from basics.
+:- import member/2, length/2 from basics.
+%%:- import append/3 from basics.
 
 :- import flora_decode_predicate/6,
 	flora_module_name/3,
@@ -124,6 +125,12 @@
 
 flora_write_goal(Call) :-
 	classify_call(Call, Type,Basename,ArgList,Workspace),
+	/*
+	%% Debugging
+	flora_dbg_stream(Stream),
+	format(Stream,'~n~w~n~w~n~w~n~w~n~w~n',
+		      [Call,Type,Workspace,Basename,ArgList]),
+	*/
 
 	( Type == (hilog)
 	-> flora_write_hilog(Basename,ArgList,Workspace)
@@ -132,10 +139,9 @@
 	; Type == (inheritance)
 	-> flora_write_dbg_item('(Trying to derive by inheritance) '),
 	    flora_write_flogic(Basename,ArgList,Workspace)
-	; Type == (definedvalue)
-	-> flora_write_dbg_item('derivable by deduction '),
-	    append(ArgList, ['...'], NewArgList),
-	    flora_write_flogic(Basename,NewArgList,Workspace)
+	; Type == (dynamichead)
+	-> 
+	    flora_write_flogic(Basename,ArgList,Workspace)
 	),
 	!.
 
@@ -564,14 +570,11 @@
 		      [Call,Type1,Workspace,Prefix,Basename1,ArgList]),
 	*/
 	(Type1 == (flora)
-	-> ((Prefix=immediate_ ; Prefix=inheritance_)
+	-> (Prefix=inheritance_
 	   -> Basename = Basename1, Type = (inheritance), ArgList = ArgList1
 	   
-	   ; Prefix=super_
-	   -> Basename = Basename1, Type = (flogic), ArgList = ArgList1
-
-	   ; Prefix=derived_
-	   -> Basename = Basename1, Type = (definedvalue), ArgList = ArgList1
+	   ; (Prefix=dyna_ ; Prefix=dynz_)
+	   -> Basename = Basename1, Type = (dynamichead), ArgList = ArgList1
 
 	   ;   %% must be a hilog predicate derivative formed by specialization
 	       %% such as FLORA_PREFIX'usermod''main''flapply_#303'
@@ -579,6 +582,10 @@
 	   ->  Type = (hilog), ArgList1 = [Basename | ArgList]
 	   ; Type = Type1, Basename = Basename1, ArgList = ArgList1
 	   )
+	; Type1 == (prolog), Basename1 = FLORA_DB_FIND_PREDICATE,
+	    Call =.. [FLORA_DB_FIND_PREDICATE,Trie,RealCall],
+	    flora_match_substring(FLORA_PREFIX,Trie,forward,0,_)
+	->  flora_decode_predicate(RealCall,Type,Workspace,_,Basename,ArgList)
 	; Type = Type1, Basename = Basename1, ArgList = ArgList1
 	).
 
@@ -750,13 +757,11 @@
 flora_debug_dyndata_file(Filename) :-
 	flora_configuration(installdir,FlrSysLib),
 	flora_slash(S),
-	flora_concat_atoms([FlrSysLib,S,debugger,S,'dynamic_data.dat'],
-			   Filename).
+	flora_concat_atoms([FlrSysLib,S,debugger,S,'dynamic_data.dat'],Filename).
 flora_debug_statdata_file(Filename) :-
 	flora_configuration(installdir,FlrSysLib),
 	flora_slash(S),
-	flora_concat_atoms([FlrSysLib,S,debugger,S,'static_data.dat'],
-			   Filename).
+	flora_concat_atoms([FlrSysLib,S,debugger,S,'static_data.dat'],Filename).
 
 %% If WS is a var -- loading static data
 %% Otherwise, loading dynamic data for the specified module
@@ -764,9 +769,7 @@
 	%% Check if already loaded
 	(var(WS) 
 	-> current_predicate(FLORA_SYMBOL('debugger_static_data_loaded')/0)
-	; flora_module_predicate_symbol(debugger_data_loaded,
-						   WS,
-						   WSSym),
+	; flora_module_predicate_symbol(debugger_data_loaded, WS, WSSym),
 	    current_predicate(WSSym/0)
 	),
 	!.
@@ -779,7 +782,7 @@
 	repeat,
 	    file_read(IOportFromCPP,T),
 	    (T = end_of_file -> true
-	    	    	     ;  assert(T), fail
+	    ;  assert(T), fail
 	    ),
 	process_control(CPP_process, wait(ExitStatus)),
 	(ExitStatus==0, !
@@ -790,8 +793,7 @@
 	flora_set_counter(xpp_on,0),
 	(var(WS)
 	->  flora_message_line('Static debugger data loaded')
-	;   flora_message_line('Dynamic debugger data loaded for module ~w',
-			       WS)
+	;   flora_message_line('Dynamic debugger data loaded for module ~w', WS)
 	),
 	!.
 
@@ -832,32 +834,32 @@
 	%% to be handled by the debugger
 	assert((hide_this_hide(X,Y) :-
 	       \+flora_switch(low_level_trace),
-		(flora_hide_this_hide(pref(X1/Y)), str_sub(X1,X,0), !
-		 ; flora_hide_this_hide(match(X1/Y)), str_sub(X1,X), !
+		(flora_hide_this_hide(pref(X1/Y)), atom(X),atom(X1), str_sub(X1,X,0), !
+		 ; flora_hide_this_hide(match(X1/Y)), atom(X),atom(X1), str_sub(X1,X), !
 		)
 	       )),
 	assert((hide_this_show(X,Y) :-
 	       \+flora_switch(low_level_trace),
-		(flora_hide_this_show(pref(X1/Y)), str_sub(X1,X,0), !
-		 ; flora_hide_this_show(match(X1/Y)), str_sub(X1,X), !
+		(flora_hide_this_show(pref(X1/Y)), atom(X),atom(X1), str_sub(X1,X,0), !
+		 ; flora_hide_this_show(match(X1/Y)), atom(X),atom(X1), str_sub(X1,X), !
 		)
 	       )),
 	assert((show_this_hide(X,Y) :-
 	       \+flora_switch(low_level_trace),
-		(flora_show_this_hide(pref(X1/Y)), str_sub(X1,X,0), !
-		 ; flora_show_this_hide(match(X1/Y)), str_sub(X1,X), !
+		(flora_show_this_hide(pref(X1/Y)), atom(X),atom(X1), str_sub(X1,X,0), !
+		 ; flora_show_this_hide(match(X1/Y)), atom(X),atom(X1), str_sub(X1,X), !
                 )
 	       )),
 	assert((trace_this_noprint(X,Y) :-
 	       \+flora_switch(low_level_trace),
-		(flora_trace_this_noprint(pref(X1/Y)), str_sub(X1,X,0), !
-		 ; flora_trace_this_noprint(match(X1/Y)), str_sub(X1,X), !
+		(flora_trace_this_noprint(pref(X1/Y)), atom(X),atom(X1), str_sub(X1,X,0), !
+		 ; flora_trace_this_noprint(match(X1/Y)), atom(X),atom(X1), str_sub(X1,X), !
 		)
 	       )),
 	assert((trace_this_print(X,Y) :-
 	       \+flora_switch(low_level_trace),
-		(flora_trace_this_print(pref(X1/Y)), str_sub(X1,X,0), !
-		 ; flora_trace_this_print(match(X1/Y)), str_sub(X1,X), !
+		(flora_trace_this_print(pref(X1/Y)), atom(X),atom(X1), str_sub(X1,X,0), !
+		 ; flora_trace_this_print(match(X1/Y)), atom(X),atom(X1), str_sub(X1,X), !
 		)
 	       )).
 

Index: dynamic_data.in
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/dynamic_data.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dynamic_data.in	8 Dec 2002 09:46:01 -0000	1.5
+++ dynamic_data.in	9 Dec 2002 06:36:32 -0000	1.6
@@ -149,21 +149,19 @@
 flora_hide_this_hide(FLTRAILERPREFIX(WRAP_OBJEQL)/2).
 
 
-/*
-flora_hide_this_hide(WRAP_SUB/2).
-flora_hide_this_hide(WRAP_ISA/2).
-flora_hide_this_hide(WRAP_FD/3).
-flora_hide_this_hide(WRAP_IFD/3).
-flora_hide_this_hide(WRAP_MVD/3).
-flora_hide_this_hide(WRAP_IMVD/3).
-flora_hide_this_hide(WRAP_METH/2).
-flora_hide_this_hide(WRAP_IMETH/2).
-flora_hide_this_hide(WRAP_TRAN/2).
-flora_hide_this_hide(WRAP_FDSIG/3).
-flora_hide_this_hide(WRAP_IFDSIG/3).
-flora_hide_this_hide(WRAP_MVDSIG/3).
-flora_hide_this_hide(WRAP_IMVDSIG/3).
-*/
+flora_hide_this_show(match(WRAP_SUB/2)).
+flora_hide_this_show(match(WRAP_ISA/2)).
+flora_hide_this_show(match(WRAP_FD/3)).
+flora_hide_this_show(match(WRAP_IFD/3)).
+flora_hide_this_show(match(WRAP_MVD/3)).
+flora_hide_this_show(match(WRAP_IMVD/3)).
+flora_hide_this_show(match(WRAP_METH/2)).
+flora_hide_this_show(match(WRAP_IMETH/2)).
+flora_hide_this_show(match(WRAP_TRAN/2)).
+flora_hide_this_show(match(WRAP_FDSIG/3)).
+flora_hide_this_show(match(WRAP_IFDSIG/3)).
+flora_hide_this_show(match(WRAP_MVDSIG/3)).
+flora_hide_this_show(match(WRAP_IMVDSIG/3)).
 
 flora_hide_this_hide(WRAP_FDDEF/2).
 flora_hide_this_hide(WRAP_IFDDEF/2).
@@ -171,6 +169,8 @@
 flora_hide_this_hide(WRAP_IMVDDEF/2).
 flora_hide_this_hide(WRAP_EXISTS/1).
 flora_hide_this_hide(WRAP_OBJEQL/2).
+
+flora_hide_this_hide(match(candidate_object/_)).
 
 /***************************************************************************
   intermediate F-logic predicates that appear in the trailer

Update of /cvsroot/flora/flora2/closure
In directory sc8-pr-cvs1:/tmp/cvs-serv23460/closure

Modified Files:
	flrtrailer.fli flreqltrailer.fli flrcommon.fli 
Log Message:
adjustments to make the debugger work again


Index: flrtrailer.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrtrailer.fli,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- flrtrailer.fli	8 Dec 2002 09:45:33 -0000	1.9
+++ flrtrailer.fli	9 Dec 2002 06:36:32 -0000	1.10
@@ -173,7 +173,7 @@
 	!,
 	candidate_class_ifd(Super,MethSign,C),
 	flora_funct_arity(M,MethSign),
-	inferred_ifd(Super,M,V),
+	inheritance_ifd(Super,M,V),
 	sk_not(local_ifd(C,MethSign)),
 	sk_not(multiple_class_ifd(Super,MethSign,C)).
 
@@ -181,7 +181,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_ifd(C,MethSign)),
 	candidate_class_ifd(Super,MethSign,C),
-	inferred_ifd(Super,M,V),
+	inheritance_ifd(Super,M,V),
 	sk_not(multiple_class_ifd(Super,MethSign,C)).
 
 
@@ -197,7 +197,7 @@
 	!,
 	candidate_object_ifd(Super,MethSign,O),
 	flora_funct_arity(M,MethSign),
-	inferred_ifd(Super,M,V),
+	inheritance_ifd(Super,M,V),
 	sk_not(local_fd(O,MethSign)),
 	sk_not(multiple_object_ifd(Super,MethSign,O)).
 
@@ -205,7 +205,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_fd(O,MethSign)),
 	candidate_object_ifd(Super,MethSign,O),
-	inferred_ifd(Super,M,V),
+	inheritance_ifd(Super,M,V),
 	sk_not(multiple_object_ifd(Super,MethSign,O)).
 
 
@@ -221,7 +221,7 @@
 	!,
 	candidate_class_imvd(Super,MethSign,C),
 	flora_funct_arity(M,MethSign),
-	inferred_imvd(Super,M,V),
+	inheritance_imvd(Super,M,V),
 	sk_not(local_imvd(C,MethSign)),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
@@ -229,7 +229,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
-	inferred_imvd(Super,M,V),
+	inheritance_imvd(Super,M,V),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
 
@@ -241,7 +241,7 @@
 	!,
 	candidate_class_imvd(Super,MethSign,C),
 	flora_funct_arity(M,MethSign),
-	inferred_imvddef(Super,M),
+	inheritance_imvddef(Super,M),
 	sk_not(local_imvd(C,MethSign)),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
@@ -249,7 +249,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
-	inferred_imvddef(Super,M),
+	inheritance_imvddef(Super,M),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
 imvddef(C,M) :-
@@ -269,7 +269,7 @@
 	!,
 	candidate_object_imvd(Super,MethSign,O),
 	flora_funct_arity(M,MethSign),
-	inferred_imvd(Super,M,V),
+	inheritance_imvd(Super,M,V),
 	sk_not(local_mvd(O,MethSign)),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
@@ -277,7 +277,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
-	inferred_imvd(Super,M,V),
+	inheritance_imvd(Super,M,V),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
 
@@ -289,7 +289,7 @@
 	!,
 	candidate_object_imvd(Super,MethSign,O),
 	flora_funct_arity(M,MethSign),
-	inferred_imvddef(Super,M),
+	inheritance_imvddef(Super,M),
 	sk_not(local_mvd(O,MethSign)),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
@@ -297,7 +297,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
-	inferred_imvddef(Super,M),
+	inheritance_imvddef(Super,M),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
 mvddef(O,M) :-

Index: flreqltrailer.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flreqltrailer.fli,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- flreqltrailer.fli	8 Dec 2002 09:45:33 -0000	1.9
+++ flreqltrailer.fli	9 Dec 2002 06:36:32 -0000	1.10
@@ -294,7 +294,7 @@
 ifd(C,M,V) :-
 	var(M),
 	!,
-	inferred_ifd_eql(Super,M,V),
+	inheritance_ifd_eql(Super,M,V),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_ifd(C,MethSign)),
 	candidate_class_ifd(Super,MethSign,C),
@@ -304,7 +304,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_ifd(C,MethSign)),
 	candidate_class_ifd(Super,MethSign,C),
-	inferred_ifd_eql(Super,M,V),
+	inheritance_ifd_eql(Super,M,V),
 	sk_not(multiple_class_ifd(Super,MethSign,C)).
 
 
@@ -318,7 +318,7 @@
 fd(O,M,V) :-
 	var(M),
 	!,
-	inferred_ifd_eql(Super,M,V),
+	inheritance_ifd_eql(Super,M,V),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_fd(O,MethSign)),
 	candidate_object_ifd(Super,MethSign,O),
@@ -328,7 +328,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_fd(O,MethSign)),
 	candidate_object_ifd(Super,MethSign,O),
-	inferred_ifd_eql(Super,M,V),
+	inheritance_ifd_eql(Super,M,V),
 	sk_not(multiple_object_ifd(Super,MethSign,O)).
 
 
@@ -342,7 +342,7 @@
 imvd(C,M,V) :-
 	var(M),
 	!,
-	inferred_imvd_eql(Super,M,V),
+	inheritance_imvd_eql(Super,M,V),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
@@ -352,7 +352,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
-	inferred_imvd_eql(Super,M,V),
+	inheritance_imvd_eql(Super,M,V),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
 
@@ -362,7 +362,7 @@
 imvddef(C,M) :-
 	var(M),
 	!,
-	inferred_imvddef_eql(Super,M),
+	inheritance_imvddef_eql(Super,M),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
@@ -372,7 +372,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_imvd(C,MethSign)),
 	candidate_class_imvd(Super,MethSign,C),
-	inferred_imvddef_eql(Super,M),
+	inheritance_imvddef_eql(Super,M),
 	sk_not(multiple_class_imvd(Super,MethSign,C)).
 
 imvddef(C,M) :-
@@ -390,7 +390,7 @@
 mvd(O,M,V) :-
 	var(M),
 	!,
-	inferred_imvd_eql(Super,M,V),
+	inheritance_imvd_eql(Super,M,V),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
@@ -400,7 +400,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
-	inferred_imvd_eql(Super,M,V),
+	inheritance_imvd_eql(Super,M,V),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
 
@@ -410,7 +410,7 @@
 mvddef(O,M) :-
 	var(M),
 	!,
-	inferred_imvddef_eql(Super,M),
+	inheritance_imvddef_eql(Super,M),
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
@@ -420,7 +420,7 @@
 	flora_funct_arity(M,MethSign),
 	sk_not(local_mvd(O,MethSign)),
 	candidate_object_imvd(Super,MethSign,O),
-	inferred_imvddef_eql(Super,M),
+	inheritance_imvddef_eql(Super,M),
 	sk_not(multiple_object_imvd(Super,MethSign,O)).
 
 mvddef(O,M) :-

Index: flrcommon.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrcommon.fli,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- flrcommon.fli	8 Dec 2002 09:45:33 -0000	1.8
+++ flrcommon.fli	9 Dec 2002 06:36:32 -0000	1.9
@@ -311,5 +311,15 @@
 %% like sub, but the debugger won't trace it
 silent_sub(C,S) :- sub(C,S).
 
-%% like sub, but the debugger will print it specially
+%% like sub, but the debugger will print it specially and won't trace inside
 inheritance_sub(C,S) :- sub(C,S).
+
+%% Like inferred_* but the debugger will print it specially
+inheritance_ifd(C,M,V) :- inferred_ifd(C,M,V).
+inheritance_imvd(C,M,V) :- inferred_imvd(C,M,V).
+inheritance_imvddef(C,M) :- inferred_imvddef(C,M).
+
+%% Like inferred_* but the debugger will print it specially
+inheritance_ifd_eql(C,M,V) :- inferred_ifd_eql(C,M,V).
+inheritance_imvd_eql(C,M,V) :- inferred_imvd_eql(C,M,V).
+inheritance_imvddef_eql(C,M) :- inferred_imvddef_eql(C,M).

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs1:/tmp/cvs-serv23460

Modified Files:
	flrwraparound.H 
Log Message:
adjustments to make the debugger work again


Index: flrwraparound.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrwraparound.H,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrwraparound.H	8 Dec 2002 09:45:33 -0000	1.2
+++ flrwraparound.H	9 Dec 2002 06:36:33 -0000	1.3
@@ -36,7 +36,7 @@
 
 :- import 
 	FLORA_DB_INSERT_KEYPAIR_PREDICATE/4,
-	FLORA_DB_DELETE_KEYPAIR_PREDICATE/3,
+%%	FLORA_DB_DELETE_KEYPAIR_PREDICATE/3,
 	FLORA_DB_FIND_KEYPAIR_PREDICATE/3
    from storage.
 

Update of /cvsroot/flora/flora2/flrincludes
In directory sc8-pr-cvs1:/tmp/cvs-serv23460/flrincludes

Modified Files:
	flora_wspredicates.flh 
Log Message:
adjustments to make the debugger work again


Index: flora_wspredicates.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_wspredicates.flh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flora_wspredicates.flh	8 Dec 2002 09:45:32 -0000	1.1
+++ flora_wspredicates.flh	9 Dec 2002 06:36:32 -0000	1.2
@@ -128,7 +128,15 @@
 	override_object_imvd/3,
 	candidate_object_imvd/3,
 	multiple_object_imvd/3,
-	diffobjeql/2,
+	diffobjeql/2.
+
+:- WRAP_WITH_WORKSPACE
+	inheritance_ifd/3,
+	inheritance_imvd/3,
+	inheritance_imvddef/2,
+	inheritance_ifd_eql/3,
+	inheritance_imvd_eql/3,
+	inheritance_imvddef_eql/2,
 	silent_sub/2,
 	inheritance_sub/2.
 

Update of /cvsroot/flora/flora2/debugger
In directory sc8-pr-cvs1:/tmp/cvs-serv4871/debugger

Modified Files:
	flrdebugger.P dynamic_data.in 
Log Message:
adjust debugger to new trailer


Index: flrdebugger.P
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/flrdebugger.P,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flrdebugger.P	6 Oct 2002 01:18:59 -0000	1.5
+++ flrdebugger.P	8 Dec 2002 09:46:01 -0000	1.6
@@ -136,10 +136,6 @@
 	-> flora_write_dbg_item('derivable by deduction '),
 	    append(ArgList, ['...'], NewArgList),
 	    flora_write_flogic(Basename,NewArgList,Workspace)
-	; Type == (conflictvalue)
-	-> flora_write_dbg_item('inheritance conflict for '),
-	    append(ArgList, ['...'], NewArgList),
-	    flora_write_flogic(Basename,NewArgList,Workspace)
 	),
 	!.
 
@@ -574,16 +570,9 @@
 	   ; Prefix=super_
 	   -> Basename = Basename1, Type = (flogic), ArgList = ArgList1
 
-	   ; Prefix=defined_inferred_
+	   ; Prefix=derived_
 	   -> Basename = Basename1, Type = (definedvalue), ArgList = ArgList1
 
-	   ; Prefix=conflict_obj_
-	   -> Type = (conflictvalue),
-	       ( Basename1 == ifd -> Basename = WRAP_FD
-	       ; Basename1 == imvd -> Basename = WRAP_MVD
-	       ; Basename = Basename1
-	       ),
-	       ArgList = ArgList1
 	   ;   %% must be a hilog predicate derivative formed by specialization
 	       %% such as FLORA_PREFIX'usermod''main''flapply_#303'
 	       str_cat(WRAP_HILOG,'_',Prefix)

Index: dynamic_data.in
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/dynamic_data.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dynamic_data.in	9 Oct 2002 02:12:00 -0000	1.4
+++ dynamic_data.in	8 Dec 2002 09:46:01 -0000	1.5
@@ -30,197 +30,197 @@
 :- dump '#include "flrheader.flh"'.
 :- dump '#include "flora_terms.flh"'.
 :- dump '#include "flora_wrap.flh"'.
-%% This might not work on windows, but on windows we provide 
-%% a prebuilt .flh file
-#include "flora_terms.flh"
-#include "../closure/includes/flrpred.fli"
+
+#include "flora_wspredicates.flh"
 
 
-:- WRAP_FLOGICSTATIC
+:- WRAP_WITH_WORKSPACE
 	newpredicate/_,
-	tabled_flapply/_,
-	defined_flapply/_,
-	debugging/0,
+	WRAP_TABLED_HILOG/_,
+	WRAP_DYNA_HILOG/_,
+	WRAP_DYNZ_HILOG/_,
+	WRAP_TDYN_HILOG/_,
+	FLDEFINEDPREFIX(WRAP_HILOG)/_,
 	debugger_data_loaded/0.
 
-:- WRAP_FLOGICSTATIC
-	check_isa/2,
-	check_sub/2,
-	check_tran/2,
-	check_meth/2,
-	check_imeth/2,
-	check_fd/3,
-	check_ifd/3,
-	check_mvd/3,
-	check_imvd/3,
-	check_fdsig/3,
-	check_ifdsig/3,
-	check_mvdsig/3,
-	check_imvdsig/3,
-	check_fddef/2,
-	check_ifddef/2,
-	check_mvddef/2,
-	check_imvddef/2.
-
 
 
 /***************************************************************************
-  F-logic facts
+  F-logic predicates that appear in a rule head
 ***************************************************************************/
-flora_hide_this_hide(base_sub/2).
-flora_hide_this_hide(base_isa/2).
-flora_hide_this_hide(base_fd/3).
-flora_hide_this_hide(base_ifd/3).
-flora_hide_this_hide(base_mvd/3).
-flora_hide_this_hide(base_imvd/3).
-flora_hide_this_hide(base_mvddef/2).
-flora_hide_this_hide(base_imvddef/2).
-flora_hide_this_hide(base_fdsig/3).
-flora_hide_this_hide(base_ifdsig/3).
-flora_hide_this_hide(base_mvdsig/3).
-flora_hide_this_hide(base_imvdsig/3).
-flora_hide_this_hide(base_meth/2).
-flora_hide_this_hide(base_imeth/2).
-flora_hide_this_hide(base_tran/2).
-flora_hide_this_hide(base_exists/1).
-flora_hide_this_hide(base_objeql/2).
 
+flora_hide_this_show(FLHEADPREFIX(WRAP_ISA)/2).
+flora_hide_this_show(FLHEADPREFIX(WRAP_SUB)/2).
+flora_hide_this_show(FLHEADPREFIX(WRAP_METH)/2).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IMETH)/2).
+flora_hide_this_show(FLHEADPREFIX(WRAP_FD)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IFD)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_FDSIG)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IFDSIG)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_MVD)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IMVD)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_MVDSIG)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IMVDSIG)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_TRAN)/2).
+flora_hide_this_show(FLHEADPREFIX(WRAP_MVDINC)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IMVDINC)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_MVDTOLIST)/3).
+flora_hide_this_show(FLHEADPREFIX(WRAP_IMVDTOLIST)/3).
 
-/***************************************************************************
-  F-logic predicates that appear in a rule head
-***************************************************************************/
+flora_hide_this_show(FLDYNAPREFIX(WRAP_ISA)/2).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_SUB)/2).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_METH)/2).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IMETH)/2).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_FD)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IFD)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_FDSIG)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IFDSIG)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_MVD)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVD)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_MVDSIG)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVDSIG)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_TRAN)/2).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_MVDINC)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVDINC)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_MVDTOLIST)/3).
+flora_hide_this_show(FLDYNAPREFIX(WRAP_IMVDTOLIST)/3).
 
-flora_hide_this_show(derived_sub/2).
-flora_hide_this_show(derived_isa/2).
-flora_hide_this_show(derived_fd/3).
-flora_hide_this_show(derived_ifd/3).
-flora_hide_this_show(derived_mvd/3).
-flora_hide_this_show(derived_imvd/3).
-flora_hide_this_show(derived_fdsig/3).
-flora_hide_this_show(derived_ifdsig/3).
-flora_hide_this_show(derived_mvdsig/3).
-flora_hide_this_show(derived_imvdsig/3).
-flora_hide_this_show(derived_meth/2).
-flora_hide_this_show(derived_imeth/2).
-flora_hide_this_show(derived_tran/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_ISA)/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_SUB)/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_METH)/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IMETH)/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_FD)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IFD)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_FDSIG)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IFDSIG)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_MVD)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVD)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_MVDSIG)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVDSIG)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_TRAN)/2).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_MVDINC)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVDINC)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_MVDTOLIST)/3).
+flora_hide_this_show(FLDYNZPREFIX(WRAP_IMVDTOLIST)/3).
 
+%% Hide
+flora_hide_this_hide(FLHEADPREFIX(WRAP_FDDEF)/2).
+flora_hide_this_hide(FLHEADPREFIX(WRAP_IFDDEF)/2).
+flora_hide_this_hide(FLHEADPREFIX(WRAP_MVDDEF)/2).
+flora_hide_this_hide(FLHEADPREFIX(WRAP_IMVDDEF)/2).
 
-flora_hide_this_hide(derived_mvddef/2).
-flora_hide_this_hide(derived_imvddef/2).
-flora_hide_this_hide(derived_exists/1).
-flora_hide_this_hide(derived_objeql/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_FDDEF)/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_IFDDEF)/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_MVDDEF)/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_IMVDDEF)/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_OBJEQL)/2).
+flora_hide_this_hide(FLDYNAPREFIX(WRAP_EXISTS)/1).
+
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_FDDEF)/2).
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_IFDDEF)/2).
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_MVDDEF)/2).
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_IMVDDEF)/2).
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_OBJEQL)/2).
+flora_hide_this_hide(FLDYNZPREFIX(WRAP_EXISTS)/1).
 
 
 /***************************************************************************
   F-logic predicates that appear in the trailer
 ***************************************************************************/
-flora_hide_this_show(inferred_sub/2).
-flora_hide_this_show(inferred_isa/2).
-flora_hide_this_show(inferred_fd/3).
-flora_hide_this_show(inferred_ifd/3).
-flora_hide_this_show(inferred_mvd/3).
-flora_hide_this_show(inferred_imvd/3).
-flora_hide_this_show(inferred_meth/2).
-flora_hide_this_show(inferred_imeth/2).
-flora_hide_this_show(inferred_tran/2).
-flora_hide_this_show(inferred_fdsig/3).
-flora_hide_this_show(inferred_ifdsig/3).
-flora_hide_this_show(inferred_mvdsig/3).
-flora_hide_this_show(inferred_imvdsig/3).
-
-flora_hide_this_hide(inferred_mvddef/2).
-flora_hide_this_hide(inferred_imvddef/2).
-flora_hide_this_hide(inferred_exists/1).
-flora_hide_this_hide(inferred_objeql/2).
-
-flora_hide_this_hide(defined_inferred_ifd/2).
-flora_hide_this_hide(defined_inferred_imvd/2).
-flora_hide_this_hide(defined_inferred_fd/2).
-flora_hide_this_hide(defined_inferred_mvd/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_SUB)/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_ISA)/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_FD)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_IFD)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_MVD)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_IMVD)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_METH)/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_IMETH)/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_TRAN)/2).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_FDSIG)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_IFDSIG)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_MVDSIG)/3).
+flora_hide_this_show(FLTRAILERPREFIX(WRAP_IMVDSIG)/3).
 
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_FDDEF)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_IFDDEF)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_MVDDEF)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_IMVDDEF)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_EXISTS)/1).
+flora_hide_this_hide(FLTRAILERPREFIX(WRAP_OBJEQL)/2).
 
-/***************************************************************************
-  F-logic predicates that appear in a rule body
-***************************************************************************/
 
 /*
-flora_hide_this_show(sub/2).
-flora_hide_this_show(isa/2).
-flora_hide_this_show(fd/3).
-flora_hide_this_show(ifd/3).
-flora_hide_this_show(mvd/3).
-flora_hide_this_show(imvd/3).
-flora_hide_this_show(fdsig/3).
-flora_hide_this_show(ifdsig/3).
-flora_hide_this_show(mvdsig/3).
-flora_hide_this_show(imvdsig/3).
-flora_hide_this_show(meth/2).
-flora_hide_this_show(imeth/2).
-flora_hide_this_show(tran/2).
-
-flora_hide_this_show(mvdinc/3).
-flora_hide_this_show(imvdinc/3).
-flora_hide_this_show(mvdtolist/3).
-flora_hide_this_show(imvdtolist/3).
+flora_hide_this_hide(WRAP_SUB/2).
+flora_hide_this_hide(WRAP_ISA/2).
+flora_hide_this_hide(WRAP_FD/3).
+flora_hide_this_hide(WRAP_IFD/3).
+flora_hide_this_hide(WRAP_MVD/3).
+flora_hide_this_hide(WRAP_IMVD/3).
+flora_hide_this_hide(WRAP_METH/2).
+flora_hide_this_hide(WRAP_IMETH/2).
+flora_hide_this_hide(WRAP_TRAN/2).
+flora_hide_this_hide(WRAP_FDSIG/3).
+flora_hide_this_hide(WRAP_IFDSIG/3).
+flora_hide_this_hide(WRAP_MVDSIG/3).
+flora_hide_this_hide(WRAP_IMVDSIG/3).
 */
 
-flora_hide_this_hide(mvddef/2).
-flora_hide_this_hide(imvddef/2).
-flora_hide_this_hide(exists/1).
-flora_hide_this_hide(objeql/2).
-flora_hide_this_hide(fddef/2).
-flora_hide_this_hide(ifddef/2).
+flora_hide_this_hide(WRAP_FDDEF/2).
+flora_hide_this_hide(WRAP_IFDDEF/2).
+flora_hide_this_hide(WRAP_MVDDEF/2).
+flora_hide_this_hide(WRAP_IMVDDEF/2).
+flora_hide_this_hide(WRAP_EXISTS/1).
+flora_hide_this_hide(WRAP_OBJEQL/2).
 
 /***************************************************************************
   intermediate F-logic predicates that appear in the trailer
 ***************************************************************************/
-flora_hide_this_hide(super_sub/2).
-flora_hide_this_hide(super_isa/2).
-flora_hide_this_hide(conflict_ifd/2).
-flora_hide_this_hide(conflict_imvd/2).
-flora_hide_this_hide(conflict_obj_ifd/2).
-flora_hide_this_hide(conflict_obj_imvd/2).
 
 flora_hide_this_hide(silent_sub/2).
-
-flora_show_this_hide(immediate_isa/2).
-flora_show_this_hide(immediate_sub/2).
 flora_show_this_hide(inheritance_sub/2).
 
+/*
+    %% These are no longer used
+    flora_hide_this_hide(super_sub/2).
+    flora_hide_this_hide(super_isa/2).
+    flora_show_this_hide(immediate_isa/2).
+    flora_show_this_hide(immediate_sub/2).
+*/
+
 
 /***************************************************************************
   F-logic predicates that appear only in the trailer with equality maintenance
 ***************************************************************************/
 flora_hide_this_hide(diffobjeql/2).
-flora_hide_this_hide(inferred_sub_eql/2).
-flora_hide_this_hide(inferred_isa_eql/2).
-flora_hide_this_hide(inferred_ifd_eql/3).
-flora_hide_this_hide(inferred_imvd_eql/3).
-flora_hide_this_hide(inferred_imvddef_eql/2).
-flora_hide_this_hide(inferred_fd_eql/3).
-flora_hide_this_hide(inferred_mvd_eql/3).
-flora_hide_this_hide(inferred_mvddef_eql/2).
+flora_hide_this_hide(FLTRAILERPREFIX(sub_eql)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(isa_eql)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(ifd_eql)/3).
+flora_hide_this_hide(FLTRAILERPREFIX(imvd_eql)/3).
+flora_hide_this_hide(FLTRAILERPREFIX(imvddef_eql)/2).
+flora_hide_this_hide(FLTRAILERPREFIX(fd_eql)/3).
+flora_hide_this_hide(FLTRAILERPREFIX(mvd_eql)/3).
+flora_hide_this_hide(FLTRAILERPREFIX(mvddef_eql)/2).
 
 /***************************************************************************
   Flora debugging predicates
 ***************************************************************************/
-flora_hide_this_hide(check_isa/2).
-flora_hide_this_hide(check_sub/2).
-flora_hide_this_hide(check_tran/2).
-flora_hide_this_hide(check_meth/2).
-flora_hide_this_hide(check_imeth/2).
-flora_hide_this_hide(check_fd/3).
-flora_hide_this_hide(check_ifd/3).
-flora_hide_this_hide(check_mvd/3).
-flora_hide_this_hide(check_imvd/3).
-flora_hide_this_hide(check_fdsig/3).
-flora_hide_this_hide(check_ifdsig/3).
-flora_hide_this_hide(check_mvdsig/3).
-flora_hide_this_hide(check_imvdsig/3).
-flora_hide_this_hide(check_fddef/2).
-flora_hide_this_hide(check_ifddef/2).
-flora_hide_this_hide(check_mvddef/2).
-flora_hide_this_hide(check_imvddef/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_ISA)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_SUB)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_TRAN)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_METH)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMETH)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_FD)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IFD)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVD)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVD)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_FDSIG)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IFDSIG)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVDSIG)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVDSIG)/3).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_FDDEF)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IFDDEF)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_MVDDEF)/2).
+flora_hide_this_hide(FLCHECKPREFIX(WRAP_IMVDDEF)/2).
 
 
 /*****************************************************************************
@@ -238,8 +238,11 @@
 %% We put match around because for some reason XSB prepends another _$ to
 %% tabled_flapply, so the goal that the debugger get is diffferent from what
 %% is inside flora_hide_this_show/1.
-flora_hide_this_show(match(tabled_flapply/_)).
-flora_hide_this_hide(match(defined_flapply/_)).
+flora_hide_this_show(match(WRAP_TABLED_HILOG/_)).
+flora_hide_this_show(match(WRAP_DYNA_HILOG/_)).
+flora_hide_this_show(match(WRAP_DYNZ_HILOG/_)).
+flora_hide_this_show(match(WRAP_TDYN_HILOG/_)).
+flora_hide_this_hide(match(FLDEFINEDPREFIX(WRAP_HILOG)/_)).
 
 
 

Update of /cvsroot/flora/flora2
In directory sc8-pr-cvs1:/tmp/cvs-serv4666

Modified Files:
	flrwrapper.P flrwraparound.P flrwraparound.H Makefile 
	CompileChangedFiles.sh 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


Index: flrwrapper.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrwrapper.P,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- flrwrapper.P	26 Nov 2002 05:09:49 -0000	1.10
+++ flrwrapper.P	8 Dec 2002 09:45:33 -0000	1.11
@@ -419,7 +419,7 @@
   (1) PredicateType=flogic, if the predicate is encoded as:
 	'FLORA_PREFIX''FLORA_(USER/SYSTEM)_MODULE''workspace''flogic_wrapper'.
       ModuleName is the Flora user/system module name. WrapPrefix is the
-      prefix of the wrapper (e.g., base_, derived_). PredicateSymbol specifies
+      prefix of the wrapper (e.g., dyna_, derived_). PredicateSymbol specifies
       the type of the F-logic wrapper, e.g., fd, mvd, imvd, etc.
 
   (2) PredicateType=flora, if the predicate is encoded as:

Index: flrwraparound.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrwraparound.P,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flrwraparound.P	19 Sep 2002 02:50:12 -0000	1.4
+++ flrwraparound.P	8 Dec 2002 09:45:33 -0000	1.5
@@ -28,10 +28,11 @@
 
 /*
   This simple wrapper understands the directives
-  :- WRAP_DUMP 'string'                (dump)
-  :- WRAP_FLOGICSTATIC predicate-list. (flogic)
-  :- WRAP_STORAGE predicate-list.      (storage)
-  :- WRAP_DEBUGMODULE predicate.       (debugmodule)
+  :- WRAP_DUMP 'string'                  (dump)
+  :- WRAP_WITH_WORKSPACE predicate-list. (use_workspace)
+  :- WRAP_STORAGE predicate-list.        (storage)
+  :- WRAP_DEBUGMODULE predicate.         (debugmodule)
+  :- WRAP_MODULE predicate.              (module)
 
   Predicates mentioned in these directives are 
   recorded and whenever they occur in other directives or rules
@@ -61,7 +62,7 @@
 
 :- dynamic wrap_arguments_directive/1.
 
-:- op(1100,fy,WRAP_FLOGICSTATIC).
+:- op(1100,fy,WRAP_WITH_WORKSPACE).
 :- op(1100,fy,WRAP_DUMP).
 :- op(1100,fy,WRAP_STORAGE).
 :- op(1100,fy,WRAP_MODULE).
@@ -131,8 +132,8 @@
 process_fli_file.
 
 process_clause(X) :-
-	(is_directive(X,WRAP_FLOGICSTATIC,PredList)
-	-> intern_predicate_specs(PredList,WRAP_FLOGICSTATIC)
+	(is_directive(X,WRAP_WITH_WORKSPACE,PredList)
+	-> intern_predicate_specs(PredList,WRAP_WITH_WORKSPACE)
 	; is_directive(X,WRAP_INDEX2,[PredSpec,Type])
 	-> dump_index2_directive(PredSpec,Type)
 	; is_directive(X,WRAP_INDICES,IndexSpecList)
@@ -153,11 +154,12 @@
 
 
 %% Which macro to use for which type of encoding
-wrapper_macro(WRAP_FLOGICSTATIC,'FLORA_THIS_WORKSPACE').
+wrapper_macro(WRAP_WITH_WORKSPACE,'FLORA_THIS_WORKSPACE').
 
 %% tells how to wrap a predicate spec
 wrapper(P/A, WrappedSpec, Changed) :- !,
-	(FLORA_DB_FIND_KEYPAIR(flora_compile_trie,P/A,EncodingType),
+	(var(A) -> EncodedA = '$var' ; EncodedA = A),
+	(FLORA_DB_FIND_KEYPAIR(flora_compile_trie,P/EncodedA,EncodingType),
 	    wrapper_macro(EncodingType,WrapperMacroName)
 	-> 
 	    flora_concat_items([WrapperMacroName,'(',P,')'],WrappedP),
@@ -179,7 +181,7 @@
 spec2skeleton(Skeleton,Skeleton).
 
 
-is_directive((:- WRAP_FLOGICSTATIC PredList),WRAP_FLOGICSTATIC,PredList) :- !.
+is_directive((:- WRAP_WITH_WORKSPACE PredList),WRAP_WITH_WORKSPACE,PredList) :- !.
 is_directive(':-'(index(PredSpec,Type)),WRAP_INDEX2,[PredSpec,Type]) :- !.
 is_directive((:- WRAP_INDICES IndexSpecList), WRAP_INDICES, IndexSpecList) :- !.
 is_directive((:- WRAP_DUMP Atom),WRAP_DUMP,Atom) :- !.
@@ -196,11 +198,15 @@
 
 %% Insert both the p/a form and p(_,...,_) form
 %% Arity can also be a variable. In this case, it is treated specially and the
-%% predicate spec is dumped without the arity.
+%% predicate spec is inserted simply as p/_.
+%% If p/_ is in the flora_compile_trie, then insert p/'$var' and don't insert
+%% p(_,...,_)
 intern_predicate_spec(P,EncodingType) :-
 	P = '/'(Name,Arity),
 	!,
-	FLORA_DB_INSERT_KEYPAIR(flora_compile_trie,P,EncodingType,_),
+	(var(Arity) -> FLORA_DB_INSERT_KEYPAIR(flora_compile_trie,'/'(Name,'$var'),EncodingType,_)
+	; FLORA_DB_INSERT_KEYPAIR(flora_compile_trie,P,EncodingType,_)
+	),
 	(var(Arity) -> true
 	;   functor(NewP,Name,Arity),
 	    FLORA_DB_INSERT_KEYPAIR(flora_compile_trie,NewP,EncodingType,_)

Index: flrwraparound.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrwraparound.H,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrwraparound.H	18 May 2002 17:43:26 -0000	1.1.1.1
+++ flrwraparound.H	8 Dec 2002 09:45:33 -0000	1.2
@@ -36,6 +36,7 @@
 
 :- import 
 	FLORA_DB_INSERT_KEYPAIR_PREDICATE/4,
+	FLORA_DB_DELETE_KEYPAIR_PREDICATE/3,
 	FLORA_DB_FIND_KEYPAIR_PREDICATE/3
    from storage.
 

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	28 Nov 2002 07:50:09 -0000	1.8
+++ Makefile	8 Dec 2002 09:45:33 -0000	1.9
@@ -67,7 +67,7 @@
 
 # PROLOG is passed as an argument to make. Default is none, to trigger an error
 PROLOG=none
-PROLOG_COMMAND = $(PROLOG) -s -m 2000 -c 2000 -e 'segfault_handler(warn).'
+PROLOG_COMMAND = $(PROLOG) -s -m 40000 -c 4000 -e 'segfault_handler(warn).'
 
 # Make sure warnings are saved in a file.
 SVFILE = '$(FLORADIR)/.flora_top_warn.tmp'

Index: CompileChangedFiles.sh
===================================================================
RCS file: /cvsroot/flora/flora2/CompileChangedFiles.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CompileChangedFiles.sh	18 May 2002 17:43:26 -0000	1.1.1.1
+++ CompileChangedFiles.sh	8 Dec 2002 09:45:33 -0000	1.2
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-PROLOG_COMMAND=$1
+PROLOG_COMMAND=$*
 
 if test "$PROLOG_COMMAND" = "" ; then
     echo "Prolog command not specified. Bug in a Makefile?"
@@ -22,7 +22,7 @@
 split -l 7 cmd... cmd..._
 
 for f in cmd..._*; do
-     cat cmd...hdr $f | "$PROLOG_COMMAND"
+     cat cmd...hdr $f | $PROLOG_COMMAND
 done
 
 rm cmd... cmd...hdr cmd..._*

Update of /cvsroot/flora/flora2/closure
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/closure

Modified Files:
	flrtrailer.fli flrscalareql.fli flreqltrailer.fli 
	flrcommon.fli NMakefile.mak Makefile 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


Index: flrtrailer.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrtrailer.fli,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- flrtrailer.fli	6 Dec 2002 07:30:40 -0000	1.8
+++ flrtrailer.fli	8 Dec 2002 09:45:33 -0000	1.9
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 
-#include "includes/flrpred.fli"
+#include "flora_wspredicates.flh"
 
 
 :- import flora_warning_line/1 from flrprint.

Index: flrscalareql.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrscalareql.fli,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrscalareql.fli	18 May 2002 17:43:27 -0000	1.1.1.1
+++ flrscalareql.fli	8 Dec 2002 09:45:33 -0000	1.2
@@ -11,7 +11,7 @@
 ***************************************************************************/
 
 
-#include "includes/flrpred.fli"
+#include "flora_wspredicates.flh"
 
 
 diffobjeql(X,Y) :- inferred_fd(O,M,X), inferred_fd(O,M,Y), X \= Y.

Index: flreqltrailer.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flreqltrailer.fli,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- flreqltrailer.fli	6 Dec 2002 07:30:40 -0000	1.8
+++ flreqltrailer.fli	8 Dec 2002 09:45:33 -0000	1.9
@@ -16,7 +16,7 @@
 ***************************************************************************/
 
 
-#include "includes/flrpred.fli"
+#include "flora_wspredicates.flh"
 
 :- import flora_warning_line/1 from flrprint.
 :- import flora_funct_arity/2 from flrwrapper.

Index: flrcommon.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrcommon.fli,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- flrcommon.fli	2 Dec 2002 21:53:16 -0000	1.7
+++ flrcommon.fli	8 Dec 2002 09:45:33 -0000	1.8
@@ -9,7 +9,7 @@
 ***************************************************************************/
 
 
-#include "includes/flrpred.fli"
+#include "flora_wspredicates.flh"
 
 
 /***************************************************************************

Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/closure/NMakefile.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
+++ NMakefile.mak	8 Dec 2002 09:45:33 -0000	1.3
@@ -16,7 +16,6 @@
 	-@erase *.flh
 	-@erase *.bak
 	-@erase .#*
-	-@erase includes\*~
 
 .fli.flh:
 	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrutils]. import flCompileInclude/1 from flrutils. flCompileInclude(%|fF). halt."

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/closure/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	5 Sep 2002 03:11:43 -0000	1.2
+++ Makefile	8 Dec 2002 09:45:33 -0000	1.3
@@ -29,15 +29,15 @@
 FLORADIR = ..
 
 ALLOBJS = flrcommon.flh \
-          flrtrailer.flh \
-	  flreqltrailer.flh \
-          flrscalareql.flh
+	flrtrailer.flh \
+	flreqltrailer.flh \
+	flrscalareql.flh
 
 PROLOG = none
 
 PROLOG_COMMAND = $(PROLOG) -s -m 2000 -c 2000 -e 'segfault_handler(warn).'
 
-FLORA_PRED_DEF = includes/flrpred.fli
+FLORA_PRED_DEF = ../flrincludes/flora_wspredicates.flh
 
 # Make sure warnings are saved in a file.
 SVFILE = '$(FLORADIR)/.flora_closure_warn.tmp'

Update of /cvsroot/flora/flora2/closure/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/closure/includes

Removed Files:
	flrpred.fli 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


--- flrpred.fli DELETED ---

Update of /cvsroot/flora/flora2/demos
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/demos

Modified Files:
	Makefile CompileChangedFiles.sh 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/demos/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	23 Nov 2002 06:30:33 -0000	1.6
+++ Makefile	8 Dec 2002 09:45:32 -0000	1.7
@@ -32,7 +32,7 @@
 	clpdemo${PROLOGEXT} default${PROLOGEXT} family_obj${PROLOGEXT} \
 	family_rel${PROLOGEXT} flogic_basics${PROLOGEXT}\
 	metavar${PROLOGEXT} mix${PROLOGEXT} module1${PROLOGEXT}\
-	mod1${PROLOGEXT} clpdemo${PROLOGEXT} \
+	mod1${PROLOGEXT} \
 	mono_inherit${PROLOGEXT} rel_ops${PROLOGEXT}\
 	tree_traversal${PROLOGEXT} diamond${PROLOGEXT}\
 	btupdates${PROLOGEXT} pretty${PROLOGEXT}
@@ -45,7 +45,7 @@
 # Self-make: Version 1.4.1
 #
 PROLOG = none
-PROLOG_COMMAND = $(PROLOG) -i -s -m 2000 -c 2000 -e 'segfault_handler(warn).'
+PROLOG_COMMAND = $(PROLOG) -i -s -m 40000 -c 2000 -e 'segfault_handler(warn).'
 #
 #-----------------------------------------------------------------------#
 
@@ -70,7 +70,7 @@
 
 init:
 	rm -f $(SVFILE)
-	echo Initializing...
+	@echo Initializing...
 	@echo "file_write($(STDWARN),'-------------- Warnings/Errors --------------------'), file_nl($(STDWARN))." >> cmd...
 	@echo "file_write($(STDWARN),'$(HDRMSG)'), file_nl($(STDWARN))." >> cmd...
 	@echo "file_flush($(STDWARN), _)." >> cmd...

Index: CompileChangedFiles.sh
===================================================================
RCS file: /cvsroot/flora/flora2/demos/CompileChangedFiles.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CompileChangedFiles.sh	18 May 2002 17:43:27 -0000	1.1.1.1
+++ CompileChangedFiles.sh	8 Dec 2002 09:45:32 -0000	1.2
@@ -1,13 +1,14 @@
 #! /bin/sh
 
-PROLOG=$1
+PROLOG=$*
+echo $PROLOG
 
 ../touch.sh cmd...
 
 split -l 7 cmd... cmd..._
 
 for f in cmd..._*; do
-     cat cmd...hdr $f | "$PROLOG"
+     cat cmd...hdr $f | $PROLOG
 done
 
 rm cmd... cmd...hdr cmd..._*

Update of /cvsroot/flora/flora2/flrincludes
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/flrincludes

Modified Files:
	flora_wrap.flh flora_prefix.flh flora_porting.flh 
Added Files:
	flora_wspredicates.flh 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


--- NEW FILE: flora_wspredicates.flh ---
/***************************************************************************
  file: flrincludes/flora_wspredicates.flh

  Author(s): Guizhen Yang

  Contact:   flo...@li...

  Copyright (C) The Research Foundation of SUNY, 1999-2002

  This file lists F-logic predicates that require a workspace.
  This file is used by the FLORA's build-time preprocessor, flrwraparound.P,
  to convert .fli files into .flh files.
***************************************************************************/


#include "flora_wrap.flh"
#include "flora_terms.flh"


/***************************************************************************
  F-logic predicates that appear in a rule head
***************************************************************************/
:- WRAP_WITH_WORKSPACE
	FLHEADPREFIX(WRAP_SUB)/2,
	FLHEADPREFIX(WRAP_ISA)/2,
	FLHEADPREFIX(WRAP_FD)/3,
	FLHEADPREFIX(WRAP_IFD)/3,
	FLHEADPREFIX(WRAP_FDDEF)/2,
	FLHEADPREFIX(WRAP_IFDDEF)/2,
	FLHEADPREFIX(WRAP_MVD)/3,
	FLHEADPREFIX(WRAP_IMVD)/3,
	FLHEADPREFIX(WRAP_MVDDEF)/2,
	FLHEADPREFIX(WRAP_IMVDDEF)/2,
	FLHEADPREFIX(WRAP_FDSIG)/3,
	FLHEADPREFIX(WRAP_FDSIGDEF)/2,
	FLHEADPREFIX(WRAP_IFDSIG)/3,
	FLHEADPREFIX(WRAP_IFDSIGDEF)/2,
	FLHEADPREFIX(WRAP_MVDSIG)/3,
	FLHEADPREFIX(WRAP_MVDSIGDEF)/2,
	FLHEADPREFIX(WRAP_IMVDSIG)/3,
	FLHEADPREFIX(WRAP_IMVDSIGDEF)/2,
	FLHEADPREFIX(WRAP_METH)/2,
	FLHEADPREFIX(WRAP_IMETH)/2,
	FLHEADPREFIX(WRAP_TRAN)/2,
	FLHEADPREFIX(WRAP_EXISTS)/1,
	FLHEADPREFIX(WRAP_OBJEQL)/2.


/***************************************************************************
  F-logic predicates that appear in the trailer
***************************************************************************/
:- WRAP_WITH_WORKSPACE
	FLTRAILERPREFIX(WRAP_SUB)/2,
	FLTRAILERPREFIX(WRAP_ISA)/2,
	FLTRAILERPREFIX(WRAP_FD)/3,
	FLTRAILERPREFIX(WRAP_IFD)/3,
	FLTRAILERPREFIX(WRAP_FDDEF)/2,
	FLTRAILERPREFIX(WRAP_IFDDEF)/2,
	FLTRAILERPREFIX(WRAP_MVD)/3,
	FLTRAILERPREFIX(WRAP_IMVD)/3,
	FLTRAILERPREFIX(WRAP_MVDDEF)/2,
	FLTRAILERPREFIX(WRAP_IMVDDEF)/2,
	FLTRAILERPREFIX(WRAP_FDSIG)/3,
	FLTRAILERPREFIX(WRAP_FDSIGDEF)/2,
	FLTRAILERPREFIX(WRAP_IFDSIG)/3,
	FLTRAILERPREFIX(WRAP_IFDSIGDEF)/2,
	FLTRAILERPREFIX(WRAP_MVDSIG)/3,
	FLTRAILERPREFIX(WRAP_MVDSIGDEF)/2,
	FLTRAILERPREFIX(WRAP_IMVDSIG)/3,
	FLTRAILERPREFIX(WRAP_IMVDSIGDEF)/2,
	FLTRAILERPREFIX(WRAP_METH)/2,
	FLTRAILERPREFIX(WRAP_IMETH)/2,
	FLTRAILERPREFIX(WRAP_TRAN)/2,
	FLTRAILERPREFIX(WRAP_EXISTS)/1,
	FLTRAILERPREFIX(WRAP_OBJEQL)/2.


/***************************************************************************
  F-logic predicates that appear in a rule body
***************************************************************************/
:- WRAP_WITH_WORKSPACE
	WRAP_SUB/2,
	WRAP_ISA/2,
	WRAP_FD/3,
	WRAP_IFD/3,
	WRAP_MVD/3,
	WRAP_IMVD/3,
	WRAP_MVDDEF/2,
	WRAP_IMVDDEF/2,
	WRAP_FDSIG/3,
	WRAP_FDSIGDEF/2,
	WRAP_IFDSIG/3,
	WRAP_IFDSIGDEF/2,
	WRAP_MVDSIG/3,
	WRAP_MVDSIGDEF/2,
	WRAP_IMVDSIG/3,
	WRAP_IMVDSIGDEF/2,
	WRAP_METH/2,
	WRAP_IMETH/2,
	WRAP_TRAN/2,
	WRAP_EXISTS/1,
	WRAP_OBJEQL/2,
	WRAP_FDDEF/2,
	WRAP_IFDDEF/2,
	WRAP_MVDINC/3,
	WRAP_IMVDINC/3,
	WRAP_MVDTOLIST/3,
	WRAP_IMVDTOLIST/3.


/***************************************************************************
  intermediate F-logic predicates that appear in both trailers
***************************************************************************/
:- WRAP_WITH_WORKSPACE
	local_ifd/2,
	local_fd/2,
	local_imvd/2,
	local_mvd/2,
	override_class_ifd/3,
	candidate_class_ifd/3,
	multiple_class_ifd/3,
	override_object_ifd/3,
	candidate_object_ifd/3,
	multiple_object_ifd/3,
	override_class_imvd/3,
	candidate_class_imvd/3,
	multiple_class_imvd/3,
	override_object_imvd/3,
	candidate_object_imvd/3,
	multiple_object_imvd/3,
	diffobjeql/2,
	silent_sub/2,
	inheritance_sub/2.


/***************************************************************************
  F-logic predicates that appear only in the trailer with equality maintenance
***************************************************************************/
:- WRAP_WITH_WORKSPACE
	FLTRAILERPREFIX(sub_eql)/2,
	FLTRAILERPREFIX(isa_eql)/2,
	FLTRAILERPREFIX(ifd_eql)/3,
	FLTRAILERPREFIX(fd_eql)/3,
	FLTRAILERPREFIX(imvd_eql)/3,
	FLTRAILERPREFIX(imvddef_eql)/2,
	FLTRAILERPREFIX(mvd_eql)/3,
	FLTRAILERPREFIX(mvddef_eql)/2.

/****************************************************************************
 HiLog and Dynamic stuff
****************************************************************************/

:- WRAP_WITH_WORKSPACE
	WRAP_HILOG/1, WRAP_DYNA_HILOG/1, WRAP_DYNZ_HILOG/1,
	WRAP_HILOG/2, WRAP_DYNA_HILOG/2, WRAP_DYNZ_HILOG/2,
	WRAP_HILOG/3, WRAP_DYNA_HILOG/3, WRAP_DYNZ_HILOG/3,
	WRAP_HILOG/4, WRAP_DYNA_HILOG/4, WRAP_DYNZ_HILOG/4,
	WRAP_HILOG/5, WRAP_DYNA_HILOG/5, WRAP_DYNZ_HILOG/5,
	WRAP_HILOG/6, WRAP_DYNA_HILOG/6, WRAP_DYNZ_HILOG/6,
	WRAP_HILOG/7, WRAP_DYNA_HILOG/7, WRAP_DYNZ_HILOG/7,
	WRAP_HILOG/8, WRAP_DYNA_HILOG/8, WRAP_DYNZ_HILOG/8,
	WRAP_HILOG/9, WRAP_DYNA_HILOG/9, WRAP_DYNZ_HILOG/9,
	WRAP_HILOG/10,WRAP_DYNA_HILOG/10, WRAP_DYNZ_HILOG/10,
	WRAP_HILOG/11,WRAP_DYNA_HILOG/11, WRAP_DYNZ_HILOG/11,
	WRAP_HILOG/12,WRAP_DYNA_HILOG/12, WRAP_DYNZ_HILOG/12,
	WRAP_HILOG/13,WRAP_DYNA_HILOG/13, WRAP_DYNZ_HILOG/13,
	WRAP_HILOG/14,WRAP_DYNA_HILOG/14, WRAP_DYNZ_HILOG/14,
	WRAP_HILOG/15,WRAP_DYNA_HILOG/15, WRAP_DYNZ_HILOG/15,
	WRAP_HILOG/16,WRAP_DYNA_HILOG/16, WRAP_DYNZ_HILOG/16,
	WRAP_HILOG/17,WRAP_DYNA_HILOG/17, WRAP_DYNZ_HILOG/17,
	WRAP_HILOG/18,WRAP_DYNA_HILOG/18, WRAP_DYNZ_HILOG/18,
	WRAP_HILOG/19,WRAP_DYNA_HILOG/19, WRAP_DYNZ_HILOG/19,
	WRAP_HILOG/20,WRAP_DYNA_HILOG/20, WRAP_DYNZ_HILOG/20,
	WRAP_HILOG/21,WRAP_DYNA_HILOG/21, WRAP_DYNZ_HILOG/21.


:- WRAP_WITH_WORKSPACE
        WRAP_TDYN_HILOG/2, WRAP_TDYN_HILOG/3, WRAP_TDYN_HILOG/4,
        WRAP_TDYN_HILOG/5, WRAP_TDYN_HILOG/6, WRAP_TDYN_HILOG/7,
        WRAP_TDYN_HILOG/8, WRAP_TDYN_HILOG/9, WRAP_TDYN_HILOG/10,
        WRAP_TDYN_HILOG/11, WRAP_TDYN_HILOG/12, WRAP_TDYN_HILOG/13,
        WRAP_TDYN_HILOG/14, WRAP_TDYN_HILOG/15, WRAP_TDYN_HILOG/16,
        WRAP_TDYN_HILOG/17, WRAP_TDYN_HILOG/18, WRAP_TDYN_HILOG/19,
        WRAP_TDYN_HILOG/20, WRAP_TDYN_HILOG/21, WRAP_TDYN_HILOG/22.

:- WRAP_WITH_WORKSPACE
        WRAP_TABLED_HILOG/2, WRAP_TABLED_HILOG/3, WRAP_TABLED_HILOG/4,
        WRAP_TABLED_HILOG/5, WRAP_TABLED_HILOG/6, WRAP_TABLED_HILOG/7,
        WRAP_TABLED_HILOG/8, WRAP_TABLED_HILOG/9, WRAP_TABLED_HILOG/10,
        WRAP_TABLED_HILOG/11, WRAP_TABLED_HILOG/12, WRAP_TABLED_HILOG/13,
        WRAP_TABLED_HILOG/14, WRAP_TABLED_HILOG/15, WRAP_TABLED_HILOG/16,
        WRAP_TABLED_HILOG/17, WRAP_TABLED_HILOG/18, WRAP_TABLED_HILOG/19,
        WRAP_TABLED_HILOG/20, WRAP_TABLED_HILOG/21, WRAP_TABLED_HILOG/22.

:- WRAP_WITH_WORKSPACE
	FLHEADPREFIX(WRAP_ISA)/2,
	FLHEADPREFIX(WRAP_SUB)/2,
	FLHEADPREFIX(WRAP_METH)/2,
	FLHEADPREFIX(WRAP_IMETH)/2,
	FLHEADPREFIX(WRAP_FD)/3,
	FLHEADPREFIX(WRAP_IFD)/3,
	FLHEADPREFIX(WRAP_FDSIG)/3,
	FLHEADPREFIX(WRAP_IFDSIG)/3,
	FLHEADPREFIX(WRAP_FDDEF)/2,
	FLHEADPREFIX(WRAP_IFDDEF)/2,
	FLHEADPREFIX(WRAP_MVD)/3,
	FLHEADPREFIX(WRAP_IMVD)/3,
	FLHEADPREFIX(WRAP_MVDSIG)/3,
	FLHEADPREFIX(WRAP_IMVDSIG)/3,
	FLHEADPREFIX(WRAP_MVDDEF)/2,
	FLHEADPREFIX(WRAP_IMVDDEF)/2,
	FLHEADPREFIX(WRAP_TRAN)/2,
	FLHEADPREFIX(WRAP_MVDINC)/3,
	FLHEADPREFIX(WRAP_IMVDINC)/3,
	FLHEADPREFIX(WRAP_MVDTOLIST)/3,
	FLHEADPREFIX(WRAP_IMVDTOLIST)/3.

:- WRAP_WITH_WORKSPACE
	FLDYNAPREFIX(WRAP_ISA)/2,
	FLDYNAPREFIX(WRAP_SUB)/2,
	FLDYNAPREFIX(WRAP_METH)/2,
	FLDYNAPREFIX(WRAP_IMETH)/2,
	FLDYNAPREFIX(WRAP_FD)/3,
	FLDYNAPREFIX(WRAP_IFD)/3,
	FLDYNAPREFIX(WRAP_FDSIG)/3,
	FLDYNAPREFIX(WRAP_IFDSIG)/3,
	FLDYNAPREFIX(WRAP_FDDEF)/2,
	FLDYNAPREFIX(WRAP_IFDDEF)/2,
	FLDYNAPREFIX(WRAP_MVD)/3,
	FLDYNAPREFIX(WRAP_IMVD)/3,
	FLDYNAPREFIX(WRAP_MVDSIG)/3,
	FLDYNAPREFIX(WRAP_IMVDSIG)/3,
	FLDYNAPREFIX(WRAP_MVDDEF)/2,
	FLDYNAPREFIX(WRAP_IMVDDEF)/2,
	FLDYNAPREFIX(WRAP_TRAN)/2,
	FLDYNAPREFIX(WRAP_MVDINC)/3,
	FLDYNAPREFIX(WRAP_IMVDINC)/3,
	FLDYNAPREFIX(WRAP_MVDTOLIST)/3,
	FLDYNAPREFIX(WRAP_IMVDTOLIST)/3,
	FLDYNAPREFIX(WRAP_EXISTS)/1,
	FLDYNAPREFIX(WRAP_OBJEQL)/2.

:- WRAP_WITH_WORKSPACE
	FLDYNZPREFIX(WRAP_ISA)/2,
	FLDYNZPREFIX(WRAP_SUB)/2,
	FLDYNZPREFIX(WRAP_METH)/2,
	FLDYNZPREFIX(WRAP_IMETH)/2,
	FLDYNZPREFIX(WRAP_FD)/3,
	FLDYNZPREFIX(WRAP_IFD)/3,
	FLDYNZPREFIX(WRAP_FDSIG)/3,
	FLDYNZPREFIX(WRAP_IFDSIG)/3,
	FLDYNZPREFIX(WRAP_FDDEF)/2,
	FLDYNZPREFIX(WRAP_IFDDEF)/2,
	FLDYNZPREFIX(WRAP_MVD)/3,
	FLDYNZPREFIX(WRAP_IMVD)/3,
	FLDYNZPREFIX(WRAP_MVDSIG)/3,
	FLDYNZPREFIX(WRAP_IMVDSIG)/3,
	FLDYNZPREFIX(WRAP_MVDDEF)/2,
	FLDYNZPREFIX(WRAP_IMVDDEF)/2,
	FLDYNZPREFIX(WRAP_TRAN)/2,
	FLDYNZPREFIX(WRAP_MVDINC)/3,
	FLDYNZPREFIX(WRAP_IMVDINC)/3,
	FLDYNZPREFIX(WRAP_MVDTOLIST)/3,
	FLDYNZPREFIX(WRAP_IMVDTOLIST)/3,
	FLDYNZPREFIX(WRAP_EXISTS)/1,
	FLDYNZPREFIX(WRAP_OBJEQL)/2.


/*******************************************************************************
  Debugger predicates for checking undefinedness
*******************************************************************************/

:- WRAP_WITH_WORKSPACE debugging/0.

:- WRAP_WITH_WORKSPACE
	 FLDEFINEDPREFIX(WRAP_HILOG)/1,
	 FLDEFINEDPREFIX(WRAP_HILOG)/2,
	 FLDEFINEDPREFIX(WRAP_HILOG)/3,
	 FLDEFINEDPREFIX(WRAP_HILOG)/4,
	 FLDEFINEDPREFIX(WRAP_HILOG)/5,
	 FLDEFINEDPREFIX(WRAP_HILOG)/6,
	 FLDEFINEDPREFIX(WRAP_HILOG)/7,
	 FLDEFINEDPREFIX(WRAP_HILOG)/8,
	 FLDEFINEDPREFIX(WRAP_HILOG)/9,
	 FLDEFINEDPREFIX(WRAP_HILOG)/10,
	 FLDEFINEDPREFIX(WRAP_HILOG)/11,
	 FLDEFINEDPREFIX(WRAP_HILOG)/12,
	 FLDEFINEDPREFIX(WRAP_HILOG)/13,
	 FLDEFINEDPREFIX(WRAP_HILOG)/14,
	 FLDEFINEDPREFIX(WRAP_HILOG)/15,
	 FLDEFINEDPREFIX(WRAP_HILOG)/16,
	 FLDEFINEDPREFIX(WRAP_HILOG)/17,
	 FLDEFINEDPREFIX(WRAP_HILOG)/18,
	 FLDEFINEDPREFIX(WRAP_HILOG)/19,
	 FLDEFINEDPREFIX(WRAP_HILOG)/20,
	 FLDEFINEDPREFIX(WRAP_HILOG)/21.

:- WRAP_WITH_WORKSPACE
	FLDEBUGPREFIX(WRAP_ISA)/2,
	FLDEBUGPREFIX(WRAP_SUB)/2,
	FLDEBUGPREFIX(WRAP_METH)/2,
	FLDEBUGPREFIX(WRAP_IMETH)/2,
	FLDEBUGPREFIX(WRAP_FD)/3,
	FLDEBUGPREFIX(WRAP_IFD)/3,
	FLDEBUGPREFIX(WRAP_FDSIG)/3,
	FLDEBUGPREFIX(WRAP_FDSIGDEF)/2,
	FLDEBUGPREFIX(WRAP_IFDSIG)/3,
	FLDEBUGPREFIX(WRAP_IFDSIGDEF)/2,
	FLDEBUGPREFIX(WRAP_FDDEF)/2,
	FLDEBUGPREFIX(WRAP_IFDDEF)/2,
	FLDEBUGPREFIX(WRAP_MVD)/3,
	FLDEBUGPREFIX(WRAP_IMVD)/3,
	FLDEBUGPREFIX(WRAP_MVDSIG)/3,
	FLDEBUGPREFIX(WRAP_MVDSIGDEF)/2,
	FLDEBUGPREFIX(WRAP_IMVDSIG)/3,
	FLDEBUGPREFIX(WRAP_IMVDSIGDEF)/2,
	FLDEBUGPREFIX(WRAP_MVDDEF)/2,
	FLDEBUGPREFIX(WRAP_IMVDDEF)/2,
	FLDEBUGPREFIX(WRAP_TRAN)/2,
	FLDEBUGPREFIX(WRAP_MVDINC)/3,
	FLDEBUGPREFIX(WRAP_IMVDINC)/3,
	FLDEBUGPREFIX(WRAP_MVDTOLIST)/3,
	FLDEBUGPREFIX(WRAP_IMVDTOLIST)/3.

:- WRAP_WITH_WORKSPACE
	FLCHECKPREFIX(WRAP_ISA)/2, FLDEFINEDPREFIX(WRAP_ISA)/2,
	FLCHECKPREFIX(WRAP_SUB)/2, FLDEFINEDPREFIX(WRAP_SUB)/2,
	FLCHECKPREFIX(WRAP_METH)/2, FLDEFINEDPREFIX(WRAP_METH)/2,
	FLCHECKPREFIX(WRAP_IMETH)/2, FLDEFINEDPREFIX(WRAP_IMETH)/2,
	FLCHECKPREFIX(WRAP_FD)/3, FLDEFINEDPREFIX(WRAP_FD)/3,
	FLCHECKPREFIX(WRAP_IFD)/3, FLDEFINEDPREFIX(WRAP_IFD)/3,
	FLCHECKPREFIX(WRAP_FDDEF)/2, FLDEFINEDPREFIX(WRAP_FDDEF)/2,
	FLCHECKPREFIX(WRAP_IFDDEF)/2, FLDEFINEDPREFIX(WRAP_IFDDEF)/2,
	FLCHECKPREFIX(WRAP_FDSIG)/3, FLDEFINEDPREFIX(WRAP_FDSIG)/3,
	FLCHECKPREFIX(WRAP_FDSIGDEF)/2, FLDEFINEDPREFIX(WRAP_FDSIGDEF)/2,
	FLCHECKPREFIX(WRAP_IFDSIG)/3, FLDEFINEDPREFIX(WRAP_IFDSIG)/3,
	FLCHECKPREFIX(WRAP_IFDSIGDEF)/2, FLDEFINEDPREFIX(WRAP_IFDSIGDEF)/2,
	FLCHECKPREFIX(WRAP_MVD)/3, FLDEFINEDPREFIX(WRAP_MVD)/3,
	FLCHECKPREFIX(WRAP_IMVD)/3, FLDEFINEDPREFIX(WRAP_IMVD)/3,
	FLCHECKPREFIX(WRAP_MVDSIG)/3, FLDEFINEDPREFIX(WRAP_MVDSIG)/3,
	FLCHECKPREFIX(WRAP_MVDSIGDEF)/2, FLDEFINEDPREFIX(WRAP_MVDSIGDEF)/2,
	FLCHECKPREFIX(WRAP_IMVDSIG)/3, FLDEFINEDPREFIX(WRAP_IMVDSIG)/3,
	FLCHECKPREFIX(WRAP_IMVDSIGDEF)/2, FLDEFINEDPREFIX(WRAP_IMVDSIGDEF)/2,
	FLCHECKPREFIX(WRAP_MVDDEF)/2, FLDEFINEDPREFIX(WRAP_MVDDEF)/2,
	FLCHECKPREFIX(WRAP_IMVDDEF)/2, FLDEFINEDPREFIX(WRAP_IMVDDEF)/2,
	FLCHECKPREFIX(WRAP_TRAN)/2, FLDEFINEDPREFIX(WRAP_TRAN)/2.

Index: flora_wrap.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_wrap.flh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flora_wrap.flh	5 Sep 2002 03:20:49 -0000	1.1
+++ flora_wrap.flh	8 Dec 2002 09:45:32 -0000	1.2
@@ -3,10 +3,10 @@
 #define FLIFILE_EXT         fli
 #define FLHFILE_EXT         flh
 
-#define WRAP_FLOGICSTATIC   flogic
-#define WRAP_DUMP           dump
-#define WRAP_INDEX2         index2
-#define WRAP_INDICES        indices
-#define WRAP_STORAGE        storage
-#define WRAP_MODULE         module
+#define WRAP_WITH_WORKSPACE   use_workspace
+#define WRAP_DUMP             dump
+#define WRAP_INDEX2           index2
+#define WRAP_INDICES          indices
+#define WRAP_STORAGE          storage
+#define WRAP_MODULE           module
 

Index: flora_prefix.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_prefix.flh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flora_prefix.flh	26 Nov 2002 05:09:49 -0000	1.4
+++ flora_prefix.flh	8 Dec 2002 09:45:32 -0000	1.5
@@ -96,12 +96,14 @@
   wrappers in the trailers, the user program, base facts, etc.
 ****************************************************************************/
 #define FLHEADPREFIX		'derived_'
+#define FLTRAILERPREFIX		'inferred_'
+#define FLBODYPREFIX		''
+
 #mode save
 #mode nostring "\!#'"
 #define FLHEADPREFIX(X)		'derived_#1'
+#define FLTRAILERPREFIX(X)	'inferred_#1'
 #mode restore
-#define FLBODYPREFIX		''
-#define FLTRAILERPREFIX		'inferred_'
 
 
 /******************************************************************************
@@ -119,12 +121,19 @@
 #define FLDEBUGPREFIX		'd_'
 #define FLDYNAPREFIX		'dyna_'
 #define FLDYNZPREFIX		'dynz_'
-%% This is a 1-argument macro
+%% Prefixes used for checking undefinedness
+#define FLDEFINEDPREFIX		'defined_'
+#define FLCHECKPREFIX		'check_'
+
+%% Corresponding macros
 #mode save
 #mode nostring "\!#'"
 #define FLDEBUGPREFIX(X)        'd_#1'
 #define FLDYNAPREFIX(X)		'dyna_#1'
 #define FLDYNZPREFIX(X)		'dynz_#1'
+
+#define FLDEFINEDPREFIX(X)	'defined_#1'
+#define FLCHECKPREFIX(X)	'check_#1'
 #mode restore
 
 

Index: flora_porting.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_porting.flh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flora_porting.flh	18 May 2002 17:43:28 -0000	1.1.1.1
+++ flora_porting.flh	8 Dec 2002 09:45:32 -0000	1.2
@@ -60,10 +60,13 @@
                                          FLORA_DB_DELETE_BT_PREDICATE(#1,#2,#3)
 
 #define FLORA_DB_INSERT_KEYPAIR_PREDICATE   storage_insert_keypair
+#define FLORA_DB_DELETE_KEYPAIR_PREDICATE   storage_delete_keypair
 #define FLORA_DB_FIND_KEYPAIR_PREDICATE     storage_find_keypair
 
 #deffast FLORA_DB_INSERT_KEYPAIR(Storage,Key,Fact,Status) \
 				 FLORA_DB_INSERT_KEYPAIR_PREDICATE(#1,#2,#3,#4)
+#deffast FLORA_DB_DELETE_KEYPAIR(Storage,Key,Status) \
+				 FLORA_DB_DELETE_KEYPAIR_PREDICATE(#1,#2,#3)
 #deffast FLORA_DB_FIND_KEYPAIR(Storage,Key,Fact)  \
                                  FLORA_DB_FIND_KEYPAIR_PREDICATE(#1,#2,#3)
 

Update of /cvsroot/flora/flora2/genincludes
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/genincludes

Modified Files:
	flrpreddef.fli flrpatch.fli flrindex_P.fli flrdynz.fli 
	flrdyna.fli 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


Index: flrpreddef.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrpreddef.fli,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- flrpreddef.fli	21 Nov 2002 21:45:18 -0000	1.7
+++ flrpreddef.fli	8 Dec 2002 09:45:32 -0000	1.8
@@ -12,45 +12,15 @@
 ***************************************************************************/
 
 
-#include "flora_terms.flh"
-#include "flora_wrap.flh"
-
-
-:- WRAP_FLOGICSTATIC
-	WRAP_ISA/2,FLDEBUGPREFIX(WRAP_ISA)/2,check_isa/2,defined_isa/2,
-	WRAP_SUB/2,FLDEBUGPREFIX(WRAP_SUB)/2,check_sub/2,defined_sub/2,
-	WRAP_METH/2,FLDEBUGPREFIX(WRAP_METH)/2,check_meth/2,defined_meth/2,
-	WRAP_IMETH/2,FLDEBUGPREFIX(WRAP_IMETH)/2,check_imeth/2,defined_imeth/2,
-	WRAP_FD/3,FLDEBUGPREFIX(WRAP_FD)/3,check_fd/3,defined_fd/3,
-	WRAP_IFD/3,FLDEBUGPREFIX(WRAP_IFD)/3,check_ifd/3,defined_ifd/3,
-	WRAP_FDSIG/3,FLDEBUGPREFIX(WRAP_FDSIG)/3,check_fdsig/3,defined_fdsig/3,
-	WRAP_FDSIGDEF/2,FLDEBUGPREFIX(WRAP_FDSIGDEF)/2,check_fdsigdef/2,defined_fdsigdef/2,
-	WRAP_IFDSIG/3,FLDEBUGPREFIX(WRAP_IFDSIG)/3,check_ifdsig/3,defined_ifdsig/3,
-	WRAP_IFDSIGDEF/2,FLDEBUGPREFIX(WRAP_IFDSIGDEF)/2,check_ifdsigdef/2,defined_ifdsigdef/2,
-	WRAP_FDDEF/2,FLDEBUGPREFIX(WRAP_FDDEF)/2,
-	WRAP_IFDDEF/2,FLDEBUGPREFIX(WRAP_IFDDEF)/2,
-	WRAP_MVD/3,FLDEBUGPREFIX(WRAP_MVD)/3,check_mvd/3,defined_mvd/3,
-	WRAP_IMVD/3,FLDEBUGPREFIX(WRAP_IMVD)/3,check_imvd/3,defined_imvd/3,
-	WRAP_MVDSIG/3,FLDEBUGPREFIX(WRAP_MVDSIG)/3,check_mvdsig/3,defined_mvdsig/3,
-	WRAP_MVDSIGDEF/2,FLDEBUGPREFIX(WRAP_MVDSIGDEF)/2,check_mvdsigdef/2,defined_mvdsigdef/2,
-	WRAP_IMVDSIG/3,FLDEBUGPREFIX(WRAP_IMVDSIG)/3,check_imvdsig/3,defined_imvdsig/3,
-	WRAP_IMVDSIGDEF/2,FLDEBUGPREFIX(WRAP_IMVDSIGDEF)/2,check_imvdsigdef/2,defined_imvdsigdef/2,
-	WRAP_MVDDEF/2,FLDEBUGPREFIX(WRAP_MVDDEF)/2,check_mvddef/2,defined_mvddef/2,
-	WRAP_IMVDDEF/2,FLDEBUGPREFIX(WRAP_IMVDDEF)/2,check_imvddef/2,defined_imvddef/2,
-	WRAP_TRAN/2,FLDEBUGPREFIX(WRAP_TRAN)/2,check_tran/2,defined_tran/2,
-	WRAP_MVDINC/3,FLDEBUGPREFIX(WRAP_MVDINC)/3,
-	WRAP_IMVDINC/3,FLDEBUGPREFIX(WRAP_IMVDINC)/3,
-	WRAP_MVDTOLIST/3,FLDEBUGPREFIX(WRAP_MVDTOLIST)/3,
-	WRAP_IMVDTOLIST/3,FLDEBUGPREFIX(WRAP_IMVDTOLIST)/3.
+#include "flora_wspredicates.flh"
 
-:- WRAP_FLOGICSTATIC debugging/0.
 
-:- WRAP_MODULE(rule( debugging/0,flora_debug_module_registry)).
+:- WRAP_MODULE(rule(debugging/0,flora_debug_module_registry)).
 
 FLDEBUGPREFIX(WRAP_ISA)(X,Y) :- 
 	debugging,
-	check_isa(X,Y),
-	check_sub(X,Y),
+	FLCHECKPREFIX(WRAP_ISA)(X,Y),
+	FLCHECKPREFIX(WRAP_SUB)(X,Y),
 	flora_error_undefined(WRAP_ISA(X,Y)).
 
 FLDEBUGPREFIX(WRAP_ISA)(X,Y) :- 
@@ -58,7 +28,7 @@
 	    
 FLDEBUGPREFIX(WRAP_SUB)(X,Y) :- 
 	debugging,
-	check_sub(X,Y),
+	FLCHECKPREFIX(WRAP_SUB)(X,Y),
 	flora_error_undefined(WRAP_SUB(X,Y)).
 
 FLDEBUGPREFIX(WRAP_SUB)(X,Y) :- 
@@ -66,8 +36,8 @@
 
 FLDEBUGPREFIX(WRAP_METH)(X,Y) :-
 	debugging,
-	check_meth(X,Y),
-	check_imeth(X,Y),
+	FLCHECKPREFIX(WRAP_METH)(X,Y),
+	FLCHECKPREFIX(WRAP_IMETH)(X,Y),
 	flora_error_undefined(WRAP_METH(X,Y)).
 
 FLDEBUGPREFIX(WRAP_METH)(X,Y) :-
@@ -75,7 +45,7 @@
 
 FLDEBUGPREFIX(WRAP_IMETH)(X,Y) :-
 	debugging,
-	check_imeth(X,Y),
+	FLCHECKPREFIX(WRAP_IMETH)(X,Y),
 	flora_error_undefined(WRAP_IMETH(X,Y)).
 
 FLDEBUGPREFIX(WRAP_IMETH)(X,Y) :-
@@ -83,8 +53,8 @@
 
 FLDEBUGPREFIX(WRAP_FD)(X,Y,Z) :-
 	debugging,
-	check_fd(X,Y,Z),
-	check_ifd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_FD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFD)(X,Y,Z),
 	flora_error_undefined(WRAP_FD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_FD)(X,Y,Z) :-
@@ -92,7 +62,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IFD)(X,Y,Z) :-
 	debugging,
-	check_ifd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFD)(X,Y,Z),
 	flora_error_undefined(WRAP_IFD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IFD)(X,Y,Z) :-
@@ -100,8 +70,8 @@
 
 FLDEBUGPREFIX(WRAP_FDDEF)(X,Y) :-
 	debugging,
-	check_fd(X,Y,Z),
-	check_ifd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_FD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFD)(X,Y,Z),
 	flora_error_undefined(WRAP_FDDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_FDDEF)(X,Y) :-
@@ -109,7 +79,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IFDDEF)(X,Y) :-
 	debugging,
-	check_ifd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFD)(X,Y,Z),
 	flora_error_undefined(WRAP_IFDDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_IFDDEF)(X,Y) :-
@@ -117,8 +87,8 @@
 
 FLDEBUGPREFIX(WRAP_FDSIG)(X,Y,Z) :-
 	debugging,
-	check_fdsig(X,Y,Z),
-	check_ifdsig(X,Y,Z),
+	FLCHECKPREFIX(WRAP_FDSIG)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFDSIG)(X,Y,Z),
 	flora_error_undefined(WRAP_FDSIG(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_FDSIG)(X,Y,Z) :-
@@ -126,8 +96,8 @@
 	    
 FLDEBUGPREFIX(WRAP_FDSIGDEF)(X,Y) :-
 	debugging,
-	check_fdsigdef(X,Y),
-	check_ifdsigdef(X,Y),
+	FLCHECKPREFIX(WRAP_FDSIGDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_IFDSIGDEF)(X,Y),
 	flora_error_undefined(WRAP_FDSIGDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_FDSIGDEF)(X,Y) :-
@@ -135,7 +105,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IFDSIG)(X,Y,Z) :-
 	debugging,
-	check_ifdsig(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IFDSIG)(X,Y,Z),
 	flora_error_undefined(WRAP_IFDSIG(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IFDSIG)(X,Y,Z) :-
@@ -143,7 +113,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IFDSIGDEF)(X,Y) :-
 	debugging,
-	check_ifdsigdef(X,Y),
+	FLCHECKPREFIX(WRAP_IFDSIGDEF)(X,Y),
 	flora_error_undefined(WRAP_IFDSIGDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_IFDSIGDEF)(X,Y) :-
@@ -151,10 +121,10 @@
 	    
 FLDEBUGPREFIX(WRAP_MVD)(X,Y,Z) :-
 	debugging,
-	check_mvd(X,Y,Z),
-	check_imvd(X,Y,Z),
-	check_mvddef(X,Y),
-	check_imvddef(X,Y),
+	FLCHECKPREFIX(WRAP_MVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_MVDDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y),
 	flora_error_undefined(WRAP_MVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_MVD)(X,Y,Z) :-
@@ -162,8 +132,8 @@
 	    
 FLDEBUGPREFIX(WRAP_IMVD)(X,Y,Z) :-
 	debugging,
-	check_imvd(X,Y,Z),
-	check_imvddef(X,Y),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y),
 	flora_error_undefined(WRAP_IMVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IMVD)(X,Y,Z) :-
@@ -172,10 +142,10 @@
 
 FLDEBUGPREFIX(WRAP_MVDDEF)(X,Y) :-
 	debugging,
-	check_mvddef(X,Y),
-	check_imvddef(X,Y),
-	check_mvd(X,Y,Z),
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_MVDDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_MVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_MVDDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_MVDDEF)(X,Y) :-
@@ -183,8 +153,8 @@
 	    
 FLDEBUGPREFIX(WRAP_IMVDDEF)(X,Y) :-
 	debugging,
-	check_imvddef(X,Y),
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_IMVDDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_IMVDDEF)(X,Y) :-
@@ -192,8 +162,8 @@
 	    
 FLDEBUGPREFIX(WRAP_MVDSIG)(X,Y,Z) :-
 	debugging,
-	check_mvdsig(X,Y,Z),
-	check_imvdsig(X,Y,Z),
+	FLCHECKPREFIX(WRAP_MVDSIG)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVDSIG)(X,Y,Z),
 	flora_error_undefined(WRAP_MVDSIG(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_MVDSIG)(X,Y,Z) :-
@@ -201,8 +171,8 @@
 	    
 FLDEBUGPREFIX(WRAP_MVDSIGDEF)(X,Y) :-
 	debugging,
-	check_mvdsigdef(X,Y),
-	check_imvdsigdef(X,Y),
+	FLCHECKPREFIX(WRAP_MVDSIGDEF)(X,Y),
+	FLCHECKPREFIX(WRAP_IMVDSIGDEF)(X,Y),
 	flora_error_undefined(WRAP_MVDSIGDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_MVDSIGDEF)(X,Y) :-
@@ -210,7 +180,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IMVDSIG)(X,Y,Z) :-
 	debugging,
-	check_imvdsig(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVDSIG)(X,Y,Z),
 	flora_error_undefined(WRAP_IMVDSIG(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IMVDSIG)(X,Y,Z) :-
@@ -218,7 +188,7 @@
 
 FLDEBUGPREFIX(WRAP_IMVDSIGDEF)(X,Y) :-
 	debugging,
-	check_imvdsigdef(X,Y),
+	FLCHECKPREFIX(WRAP_IMVDSIGDEF)(X,Y),
 	flora_error_undefined(WRAP_IMVDSIGDEF(X,Y)).
 
 FLDEBUGPREFIX(WRAP_IMVDSIGDEF)(X,Y) :-
@@ -226,8 +196,8 @@
 
 FLDEBUGPREFIX(WRAP_MVDINC)(X,Y,Z) :-
 	debugging,
-	check_mvd(X,Y,Z),
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_MVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_MVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_MVDINC)(X,Y,Z) :-
@@ -235,7 +205,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IMVDINC)(X,Y,Z) :-
 	debugging,
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_IMVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IMVDINC)(X,Y,Z) :-
@@ -243,8 +213,8 @@
 	    
 FLDEBUGPREFIX(WRAP_MVDTOLIST)(X,Y,Z) :-
 	debugging,
-	check_mvd(X,Y,Z),
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_MVD)(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_MVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_MVDTOLIST)(X,Y,Z) :-
@@ -252,7 +222,7 @@
 	    
 FLDEBUGPREFIX(WRAP_IMVDTOLIST)(X,Y,Z) :-
 	debugging,
-	check_imvd(X,Y,Z),
+	FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z),
 	flora_error_undefined(WRAP_IMVD(X,Y,Z)).
 
 FLDEBUGPREFIX(WRAP_IMVDTOLIST)(X,Y,Z) :-
@@ -260,115 +230,92 @@
 	    
 FLDEBUGPREFIX(WRAP_TRAN)(X,Y) :-
 	debugging,
-	check_tran(X,Y),
+	FLCHECKPREFIX(WRAP_TRAN)(X,Y),
 	flora_error_undefined(WRAP_TRAN(X,Y)).
 
 FLDEBUGPREFIX(WRAP_TRAN)(X,Y) :-
 	WRAP_TRAN(X,Y).
 	    
-check_isa(X,Y) :- defined_isa(X,Y), !, fail.
-check_isa(X,Y).
-
-check_sub(X,Y) :- defined_sub(X,Y), !, fail.
-check_sub(X,Y).
+FLCHECKPREFIX(WRAP_ISA)(X,Y) :- FLDEFINEDPREFIX(WRAP_ISA)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_ISA)(X,Y).
 
-check_meth(X,Y) :- defined_meth(X,Y), !, fail.
-check_meth(X,Y).
+FLCHECKPREFIX(WRAP_SUB)(X,Y) :- FLDEFINEDPREFIX(WRAP_SUB)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_SUB)(X,Y).
 
-check_imeth(X,Y) :- defined_imeth(X,Y), !, fail.
-check_imeth(X,Y).
+FLCHECKPREFIX(WRAP_METH)(X,Y) :- FLDEFINEDPREFIX(WRAP_METH)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_METH)(X,Y).
 
-check_fd(X,Y,Z) :- defined_fd(X,Y,Z), !, fail.
-check_fd(X,Y,Z).
+FLCHECKPREFIX(WRAP_IMETH)(X,Y) :- FLDEFINEDPREFIX(WRAP_IMETH)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_IMETH)(X,Y).
 
-check_ifd(X,Y,Z) :- defined_ifd(X,Y,Z), !, fail.
-check_ifd(X,Y,Z).
+FLCHECKPREFIX(WRAP_FD)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_FD)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_FD)(X,Y,Z).
 
-check_fdsig(X,Y,Z) :- defined_fdsig(X,Y,Z), !, fail.
-check_fdsig(X,Y,Z).
+FLCHECKPREFIX(WRAP_IFD)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_IFD)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_IFD)(X,Y,Z).
 
-check_fdsigdef(X,Y) :- defined_fdsigdef(X,Y), !, fail.
-check_fdsigdef(X,Y).
+FLCHECKPREFIX(WRAP_FDSIG)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_FDSIG)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_FDSIG)(X,Y,Z).
 
-check_ifdsig(X,Y,Z) :- defined_ifdsig(X,Y,Z), !, fail.
-check_ifdsig(X,Y,Z).
+FLCHECKPREFIX(WRAP_FDSIGDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_FDSIGDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_FDSIGDEF)(X,Y).
 
-check_ifdsigdef(X,Y) :- defined_ifdsigdef(X,Y), !, fail.
-check_ifdsigdef(X,Y).
+FLCHECKPREFIX(WRAP_IFDSIG)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_IFDSIG)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_IFDSIG)(X,Y,Z).
 
-check_mvd(X,Y,Z) :- defined_mvd(X,Y,Z), !, fail.
-check_mvd(X,Y,Z).
+FLCHECKPREFIX(WRAP_IFDSIGDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_IFDSIGDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_IFDSIGDEF)(X,Y).
 
-check_imvd(X,Y,Z) :- defined_imvd(X,Y,Z), !, fail.
-check_imvd(X,Y,Z).
+FLCHECKPREFIX(WRAP_MVD)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_MVD)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_MVD)(X,Y,Z).
 
-check_mvdsig(X,Y,Z) :- defined_mvdsig(X,Y,Z), !, fail.
-check_mvdsig(X,Y,Z).
+FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_IMVD)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_IMVD)(X,Y,Z).
 
-check_mvdsigdef(X,Y) :- defined_mvdsigdef(X,Y), !, fail.
-check_mvdsigdef(X,Y).
+FLCHECKPREFIX(WRAP_MVDSIG)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_MVDSIG)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_MVDSIG)(X,Y,Z).
 
-check_imvdsig(X,Y,Z) :- defined_imvdsig(X,Y,Z), !, fail.
-check_imvdsig(X,Y,Z).
+FLCHECKPREFIX(WRAP_MVDSIGDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_MVDSIGDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_MVDSIGDEF)(X,Y).
 
-check_imvdsigdef(X,Y) :- defined_imvdsigdef(X,Y), !, fail.
-check_imvdsigdef(X,Y).
+FLCHECKPREFIX(WRAP_IMVDSIG)(X,Y,Z) :- FLDEFINEDPREFIX(WRAP_IMVDSIG)(X,Y,Z), !, fail.
+FLCHECKPREFIX(WRAP_IMVDSIG)(X,Y,Z).
 
-check_mvddef(X,Y) :- defined_mvddef(X,Y), !, fail.
-check_mvddef(X,Y).
+FLCHECKPREFIX(WRAP_IMVDSIGDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_IMVDSIGDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_IMVDSIGDEF)(X,Y).
 
-check_imvddef(X,Y) :- defined_imvddef(X,Y), !, fail.
-check_imvddef(X,Y).
+FLCHECKPREFIX(WRAP_MVDDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_MVDDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_MVDDEF)(X,Y).
 
-check_tran(X,Y) :- defined_tran(X,Y), !, fail.
-check_tran(X,Y).
+FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y) :- FLDEFINEDPREFIX(WRAP_IMVDDEF)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_IMVDDEF)(X,Y).
 
-:- WRAP_STORAGE(rule(defined_isa/2,WRAP_ISA,fld)).
-:- WRAP_STORAGE(rule(defined_sub/2,WRAP_SUB,fld)).
-:- WRAP_STORAGE(rule(defined_meth/2,WRAP_METH,fld)).
-:- WRAP_STORAGE(rule(defined_imeth/2,WRAP_IMETH,fld)).
-:- WRAP_STORAGE(rule(defined_fd/3,WRAP_FD,fld)).
-:- WRAP_STORAGE(rule(defined_ifd/3,WRAP_IFD,fld)).
-:- WRAP_STORAGE(rule(defined_fdsig/3,WRAP_FDSIG,fld)).
-:- WRAP_STORAGE(rule(defined_fdsigdef/2,WRAP_FDSIGDEF,fld)).
-:- WRAP_STORAGE(rule(defined_ifdsig/3,WRAP_IFDSIG,fld)).
-:- WRAP_STORAGE(rule(defined_ifdsigdef/2,WRAP_IFDSIGDEF,fld)).
-:- WRAP_STORAGE(rule(defined_mvd/3,WRAP_MVD,fld)).
-:- WRAP_STORAGE(rule(defined_imvd/3,WRAP_IMVD,fld)).
-:- WRAP_STORAGE(rule(defined_mvdsig/3,WRAP_MVDSIG,fld)).
-:- WRAP_STORAGE(rule(defined_mvdsigdef/2,WRAP_MVDSIGDEF,fld)).
-:- WRAP_STORAGE(rule(defined_imvdsig/3,WRAP_IMVDSIG,fld)).
-:- WRAP_STORAGE(rule(defined_imvdsigdef/2,WRAP_IMVDSIGDEF,fld)).
-:- WRAP_STORAGE(rule(defined_mvddef/2,WRAP_MVDDEF,fld)).
-:- WRAP_STORAGE(rule(defined_imvddef/2,WRAP_IMVDDEF,fld)).
-:- WRAP_STORAGE(rule(defined_tran/2,WRAP_TRAN,fld)).
+FLCHECKPREFIX(WRAP_TRAN)(X,Y) :- FLDEFINEDPREFIX(WRAP_TRAN)(X,Y), !, fail.
+FLCHECKPREFIX(WRAP_TRAN)(X,Y).
 
-:- WRAP_FLOGICSTATIC
-	WRAP_HILOG/1, defined_flapply/1,
-	WRAP_HILOG/2, defined_flapply/2,
-	WRAP_HILOG/3, defined_flapply/3,
-	WRAP_HILOG/4, defined_flapply/4,
-	WRAP_HILOG/5, defined_flapply/5,
-	WRAP_HILOG/6, defined_flapply/6,
-	WRAP_HILOG/7, defined_flapply/7,
-	WRAP_HILOG/8, defined_flapply/8,
-	WRAP_HILOG/9, defined_flapply/9,
-	WRAP_HILOG/10, defined_flapply/10,
-	WRAP_HILOG/11, defined_flapply/11,
-	WRAP_HILOG/12, defined_flapply/12,
-	WRAP_HILOG/13, defined_flapply/13,
-	WRAP_HILOG/14, defined_flapply/14,
-	WRAP_HILOG/15, defined_flapply/15,
-	WRAP_HILOG/16, defined_flapply/16,
-	WRAP_HILOG/17, defined_flapply/17,
-	WRAP_HILOG/18, defined_flapply/18,
-	WRAP_HILOG/19, defined_flapply/19,
-	WRAP_HILOG/20, defined_flapply/20,
-	WRAP_HILOG/21, defined_flapply/21.
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_ISA)/2,WRAP_ISA,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_SUB)/2,WRAP_SUB,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_METH)/2,WRAP_METH,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMETH)/2,WRAP_IMETH,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_FD)/3,WRAP_FD,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IFD)/3,WRAP_IFD,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_FDSIG)/3,WRAP_FDSIG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_FDSIGDEF)/2,WRAP_FDSIGDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IFDSIG)/3,WRAP_IFDSIG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IFDSIGDEF)/2,WRAP_IFDSIGDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVD)/3,WRAP_MVD,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMVD)/3,WRAP_IMVD,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVDSIG)/3,WRAP_MVDSIG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVDSIGDEF)/2,WRAP_MVDSIGDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMVDSIG)/3,WRAP_IMVDSIG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMVDSIGDEF)/2,WRAP_IMVDSIGDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_MVDDEF)/2,WRAP_MVDDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_IMVDDEF)/2,WRAP_IMVDDEF,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_TRAN)/2,WRAP_TRAN,fld)).
 
 WRAP_HILOG(X01) :-
 	debugging,
-	defined_flapply(X01),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01),
 	!,
 	fail.
 
@@ -378,7 +325,7 @@
 
 WRAP_HILOG(X01,X02) :-
 	debugging,
-	defined_flapply(X01,X02),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02),
 	!,
 	fail.
 
@@ -388,7 +335,7 @@
 
 WRAP_HILOG(X01,X02,X03) :-
 	debugging,
-	defined_flapply(X01,X02,X03),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03),
 	!,
 	fail.
 
@@ -398,7 +345,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04),
 	!,
 	fail.
 
@@ -408,7 +355,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05),
 	!,
 	fail.
 
@@ -418,7 +365,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05,X06) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06),
 	!,
 	fail.
 
@@ -428,7 +375,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07),
 	!,
 	fail.
 
@@ -438,7 +385,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08),
 	!,
 	fail.
 
@@ -448,7 +395,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09),
 	!,
 	fail.
 
@@ -458,7 +405,7 @@
 
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10),
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10),
 	!,
 	fail.
 
@@ -469,7 +416,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11),
 	!,
 	fail.
@@ -483,7 +430,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12),
 	!,
 	fail.
@@ -497,7 +444,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13),
 	!,
 	fail.
@@ -511,7 +458,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14),
 	!,
 	fail.
@@ -525,7 +472,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15),
 	!,
 	fail.
@@ -539,7 +486,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16),
 	!,
 	fail.
@@ -553,7 +500,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16,X17) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16,X17),
 	!,
 	fail.
@@ -567,7 +514,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16,X17,X18) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16,X17,X18),
 	!,
 	fail.
@@ -581,7 +528,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16,X17,X18,X19) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16,X17,X18,X19),
 	!,
 	fail.
@@ -595,7 +542,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16,X17,X18,X19,X20) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16,X17,X18,X19,X20),
 	!,
 	fail.
@@ -609,7 +556,7 @@
 WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 	X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21) :-
 	debugging,
-	defined_flapply(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
+	FLDEFINEDPREFIX(WRAP_HILOG)(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21),
 	!,
 	fail.
@@ -620,24 +567,24 @@
 	flora_error_undefined(WRAP_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
 			 	      X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21)).
 
-:- WRAP_STORAGE(rule(defined_flapply/1,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/2,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/3,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/4,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/5,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/6,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/7,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/8,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/9,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/10,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/11,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/12,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/13,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/14,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/15,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/16,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/17,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/18,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/19,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/20,WRAP_HILOG,fld)).
-:- WRAP_STORAGE(rule(defined_flapply/21,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/1,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/2,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/3,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/4,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/5,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/6,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/7,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/8,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/9,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/10,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/11,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/12,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/13,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/14,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/15,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/16,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/17,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/18,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/19,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/20,WRAP_HILOG,fld)).
+:- WRAP_STORAGE(rule(FLDEFINEDPREFIX(WRAP_HILOG)/21,WRAP_HILOG,fld)).

Index: flrpatch.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrpatch.fli,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flrpatch.fli	21 Nov 2002 05:00:59 -0000	1.4
+++ flrpatch.fli	8 Dec 2002 09:45:32 -0000	1.5
@@ -12,107 +12,39 @@
 ***************************************************************************/
 
 
-#include "flora_terms.flh"
-#include "flora_wrap.flh"
+#include "flora_wspredicates.flh"
 
 
 /**************************************************************************
   F-logic
 ***************************************************************************/
-:- WRAP_FLOGICSTATIC
-	sub/2,		derived_sub/2,
-	isa/2,		derived_isa/2,
-	ifd/3,		derived_ifd/3,
-	imvd/3,		derived_imvd/3,
-	imvddef/2,	derived_imvddef/2,
-	fd/3,		derived_fd/3,
-	mvd/3,		derived_mvd/3,
-	mvddef/2,	derived_mvddef/2,
-	meth/2,		derived_meth/2,
-	imeth/2,	derived_imeth/2,
-	tran/2,		derived_tran/2,
-	fdsig/3,	derived_fdsig/3,
-	fdsigdef/2,	derived_fdsigdef/2,
-	ifdsig/3,	derived_ifdsig/3,
-	ifdsigdef/2,	derived_ifdsigdef/2,
-	mvdsig/3,	derived_mvdsig/3,
-	mvdsigdef/2,	derived_mvdsigdef/2,
-	imvdsig/3,	derived_imvdsig/3,
-	imvdsigdef/2,	derived_imvdsigdef/2,
-	exists/1,	derived_exists/1,
-	objeql/2,	derived_objeql/2.
 
-:- WRAP_STORAGE(rule(derived_sub/2,sub)).
-:- WRAP_STORAGE(rule(derived_isa/2,isa)).
-:- WRAP_STORAGE(rule(derived_ifd/3,ifd)).
-:- WRAP_STORAGE(rule(derived_imvd/3,imvd)).
-:- WRAP_STORAGE(rule(derived_imvddef/2,imvddef)).
-:- WRAP_STORAGE(rule(derived_fd/3,fd)).
-:- WRAP_STORAGE(rule(derived_mvd/3,mvd)).
-:- WRAP_STORAGE(rule(derived_mvddef/2,mvddef)).
-:- WRAP_STORAGE(rule(derived_meth/2,meth)).
-:- WRAP_STORAGE(rule(derived_imeth/2,imeth)).
-:- WRAP_STORAGE(rule(derived_tran/2,tran)).
-:- WRAP_STORAGE(rule(derived_fdsig/3,fdsig)).
-:- WRAP_STORAGE(rule(derived_fdsigdef/2,fdsigdef)).
-:- WRAP_STORAGE(rule(derived_ifdsig/3,ifdsig)).
-:- WRAP_STORAGE(rule(derived_ifdsigdef/2,ifdsigdef)).
-:- WRAP_STORAGE(rule(derived_mvdsig/3,mvdsig)).
-:- WRAP_STORAGE(rule(derived_mvdsigdef/2,mvdsigdef)).
-:- WRAP_STORAGE(rule(derived_imvdsig/3,imvdsig)).
-:- WRAP_STORAGE(rule(derived_imvdsigdef/2,imvdsigdef)).
-:- WRAP_STORAGE(rule(derived_exists/1,exists)).
-:- WRAP_STORAGE(rule(derived_objeql/2,objeql)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_SUB)/2,WRAP_SUB)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_ISA)/2,WRAP_ISA)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IFD)/3,WRAP_IFD)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMVD)/3,WRAP_IMVD)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMVDDEF)/2,WRAP_IMVDDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_FD)/3,WRAP_FD)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVD)/3,WRAP_MVD)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDDEF)/2,WRAP_MVDDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_METH)/2,WRAP_METH)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMETH)/2,WRAP_IMETH)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_TRAN)/2,WRAP_TRAN)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_FDSIG)/3,WRAP_FDSIG)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_FDSIGDEF)/2,WRAP_FDSIGDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IFDSIG)/3,WRAP_IFDSIG)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IFDSIGDEF)/2,WRAP_IFDSIGDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDSIG)/3,WRAP_MVDSIG)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_MVDSIGDEF)/2,WRAP_MVDSIGDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMVDSIG)/3,WRAP_IMVDSIG)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_IMVDSIGDEF)/2,WRAP_IMVDSIGDEF)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_EXISTS)/1,WRAP_EXISTS)).
+:- WRAP_STORAGE(rule(FLHEADPREFIX(WRAP_OBJEQL)/2,WRAP_OBJEQL)).
 
 
 /**************************************************************************
   HiLog
 ***************************************************************************/
-:- WRAP_FLOGICSTATIC
-	WRAP_HILOG/1,
-	WRAP_HILOG/2,
-	WRAP_HILOG/3,
-	WRAP_HILOG/4,
-	WRAP_HILOG/5,
-	WRAP_HILOG/6,
-	WRAP_HILOG/7,
-	WRAP_HILOG/8,
-	WRAP_HILOG/9,
-	WRAP_HILOG/10,
-	WRAP_HILOG/11,
-	WRAP_HILOG/12,
-	WRAP_HILOG/13,
-	WRAP_HILOG/14,
-	WRAP_HILOG/15,
-	WRAP_HILOG/16,
-	WRAP_HILOG/17,
-	WRAP_HILOG/18,
-	WRAP_HILOG/19,
-	WRAP_HILOG/20,
-	WRAP_HILOG/21.
-
-:- WRAP_FLOGICSTATIC
-	WRAP_TABLED_HILOG/2,
-	WRAP_TABLED_HILOG/3,
-	WRAP_TABLED_HILOG/4,
-	WRAP_TABLED_HILOG/5,
-	WRAP_TABLED_HILOG/6,
-	WRAP_TABLED_HILOG/7,
-	WRAP_TABLED_HILOG/8,
-	WRAP_TABLED_HILOG/9,
-	WRAP_TABLED_HILOG/10,
-	WRAP_TABLED_HILOG/11,
-	WRAP_TABLED_HILOG/12,
-	WRAP_TABLED_HILOG/13,
-	WRAP_TABLED_HILOG/14,
-	WRAP_TABLED_HILOG/15,
-	WRAP_TABLED_HILOG/16,
-	WRAP_TABLED_HILOG/17,
-	WRAP_TABLED_HILOG/18,
-	WRAP_TABLED_HILOG/19,
-	WRAP_TABLED_HILOG/20,
-	WRAP_TABLED_HILOG/21,
-	WRAP_TABLED_HILOG/22.
 
 :- table
 	WRAP_TABLED_HILOG/2,

Index: flrindex_P.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrindex_P.fli,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flrindex_P.fli	24 Nov 2002 07:38:26 -0000	1.4
+++ flrindex_P.fli	8 Dec 2002 09:45:32 -0000	1.5
@@ -12,69 +12,45 @@
 ***************************************************************************/
 
 
-#include "flora_terms.flh"
-#include "flora_wrap.flh"
+#include "flora_wspredicates.flh"
 
 
-:- WRAP_FLOGICSTATIC
-	inferred_isa/2,
-	inferred_sub/2,
-	inferred_mvd/3,
-	inferred_imvd/3,
-    	inferred_mvdsig/3,
-    	inferred_mvdsigdef/2,
-    	inferred_imvdsig/3,
-    	inferred_imvdsigdef/2,
-	inferred_fd/3,
-	inferred_ifd/3,
-	inferred_fdsig/3,
-	inferred_fdsigdef/2,
-	inferred_ifdsig/3,
-	inferred_ifdsigdef/2,
-	inferred_meth/2,
-	inferred_imeth/2,
-	inferred_tran/2,
-	%%inferred_itran/2,
-	inferred_objeql/2.
-
 :- indices
-	inferred_isa/2-2,
-	inferred_sub/2-2,
-    	inferred_mvd/3-2,
-    	inferred_imvd/3-2,
-    	inferred_mvdsig/3-2,
-    	inferred_mvdsigdef/2-2,
-    	inferred_imvdsig/3-2,
-    	inferred_imvdsigdef/2-2,
-    	inferred_fd/3-2,
-    	inferred_ifd/3-2,
-	inferred_fdsig/3-2,
-	inferred_fdsigdef/2-2,
-	inferred_ifdsig/3-2,
-	inferred_ifdsigdef/2-2,
-	inferred_meth/2-2,
-	inferred_imeth/2-2,
-	inferred_tran/2-2,
-	%%inferred_itran/2-2,
-	inferred_objeql/2-2.
+	FLTRAILERPREFIX(WRAP_ISA)/2-2,
+	FLTRAILERPREFIX(WRAP_SUB)/2-2,
+    	FLTRAILERPREFIX(WRAP_MVD)/3-2,
+    	FLTRAILERPREFIX(WRAP_IMVD)/3-2,
+    	FLTRAILERPREFIX(WRAP_MVDSIG)/3-2,
+    	FLTRAILERPREFIX(WRAP_MVDSIGDEF)/2-2,
+    	FLTRAILERPREFIX(WRAP_IMVDSIG)/3-2,
+    	FLTRAILERPREFIX(WRAP_IMVDSIGDEF)/2-2,
+    	FLTRAILERPREFIX(WRAP_FD)/3-2,
+    	FLTRAILERPREFIX(WRAP_IFD)/3-2,
+	FLTRAILERPREFIX(WRAP_FDSIG)/3-2,
+	FLTRAILERPREFIX(WRAP_FDSIGDEF)/2-2,
+	FLTRAILERPREFIX(WRAP_IFDSIG)/3-2,
+	FLTRAILERPREFIX(WRAP_IFDSIGDEF)/2-2,
+	FLTRAILERPREFIX(WRAP_METH)/2-2,
+	FLTRAILERPREFIX(WRAP_IMETH)/2-2,
+	FLTRAILERPREFIX(WRAP_TRAN)/2-2,
+	FLTRAILERPREFIX(WRAP_OBJEQL)/2-2.
 
 :- indices
-	inferred_isa/2-1,
-	inferred_sub/2-1,
-    	inferred_mvd/3-1,
-    	inferred_imvd/3-1,
-    	inferred_mvdsig/3-1,
-    	inferred_mvdsigdef/2-1,
-    	inferred_imvdsig/3-1,
-    	inferred_imvdsigdef/2-1,
-    	inferred_fd/3-1,
-    	inferred_ifd/3-1,
-	inferred_fdsig/3-1,
-	inferred_fdsigdef/2-1,
-	inferred_ifdsig/3-1,
-	inferred_ifdsigdef/2-1,
-	inferred_meth/2-1,
-	inferred_imeth/2-1,
-	inferred_tran/2-1,
-	%%inferred_itran/2-1,
-	inferred_objeql/2-1.
+	FLTRAILERPREFIX(WRAP_ISA)/2-1,
+	FLTRAILERPREFIX(WRAP_SUB)/2-1,
+    	FLTRAILERPREFIX(WRAP_MVD)/3-1,
+    	FLTRAILERPREFIX(WRAP_IMVD)/3-1,
+    	FLTRAILERPREFIX(WRAP_MVDSIG)/3-1,
+    	FLTRAILERPREFIX(WRAP_MVDSIGDEF)/2-1,
+    	FLTRAILERPREFIX(WRAP_IMVDSIG)/3-1,
+    	FLTRAILERPREFIX(WRAP_IMVDSIGDEF)/2-1,
+    	FLTRAILERPREFIX(WRAP_FD)/3-1,
+    	FLTRAILERPREFIX(WRAP_IFD)/3-1,
+	FLTRAILERPREFIX(WRAP_FDSIG)/3-1,
+	FLTRAILERPREFIX(WRAP_FDSIGDEF)/2-1,
+	FLTRAILERPREFIX(WRAP_IFDSIG)/3-1,
+	FLTRAILERPREFIX(WRAP_IFDSIGDEF)/2-1,
+	FLTRAILERPREFIX(WRAP_METH)/2-1,
+	FLTRAILERPREFIX(WRAP_IMETH)/2-1,
+	FLTRAILERPREFIX(WRAP_TRAN)/2-1,
+	FLTRAILERPREFIX(WRAP_OBJEQL)/2-1.

Index: flrdynz.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrdynz.fli,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flrdynz.fli	26 Nov 2002 05:03:41 -0000	1.1
+++ flrdynz.fli	8 Dec 2002 09:45:32 -0000	1.2
@@ -12,31 +12,8 @@
 ***************************************************************************/
 
 
-#include "flora_terms.flh"
-#include "flora_wrap.flh"
+#include "flora_wspredicates.flh"
 
-:- WRAP_FLOGICSTATIC
-	WRAP_HILOG/1, WRAP_DYNZ_HILOG/1,
-	WRAP_HILOG/2, WRAP_DYNZ_HILOG/2,
-	WRAP_HILOG/3, WRAP_DYNZ_HILOG/3,
-	WRAP_HILOG/4, WRAP_DYNZ_HILOG/4,
-	WRAP_HILOG/5, WRAP_DYNZ_HILOG/5,
-	WRAP_HILOG/6, WRAP_DYNZ_HILOG/6,
-	WRAP_HILOG/7, WRAP_DYNZ_HILOG/7,
-	WRAP_HILOG/8, WRAP_DYNZ_HILOG/8,
-	WRAP_HILOG/9, WRAP_DYNZ_HILOG/9,
-	WRAP_HILOG/10,WRAP_DYNZ_HILOG/10,
-	WRAP_HILOG/11,WRAP_DYNZ_HILOG/11,
-	WRAP_HILOG/12,WRAP_DYNZ_HILOG/12,
-	WRAP_HILOG/13,WRAP_DYNZ_HILOG/13,
-	WRAP_HILOG/14,WRAP_DYNZ_HILOG/14,
-	WRAP_HILOG/15,WRAP_DYNZ_HILOG/15,
-	WRAP_HILOG/16,WRAP_DYNZ_HILOG/16,
-	WRAP_HILOG/17,WRAP_DYNZ_HILOG/17,
-	WRAP_HILOG/18,WRAP_DYNZ_HILOG/18,
-	WRAP_HILOG/19,WRAP_DYNZ_HILOG/19,
-	WRAP_HILOG/20,WRAP_DYNZ_HILOG/20,
-	WRAP_HILOG/21,WRAP_DYNZ_HILOG/21.
 
 WRAP_HILOG(X01) :-
     WRAP_DYNZ_HILOG(X01).
@@ -123,29 +100,6 @@
     WRAP_DYNZ_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
            X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21).
 
-
-:- WRAP_FLOGICSTATIC
-	FLDYNZPREFIX(WRAP_ISA)/2,FLHEADPREFIX(WRAP_ISA)/2,
-	FLDYNZPREFIX(WRAP_SUB)/2,FLHEADPREFIX(WRAP_SUB)/2,
-	FLDYNZPREFIX(WRAP_METH)/2,FLHEADPREFIX(WRAP_METH)/2,
-	FLDYNZPREFIX(WRAP_IMETH)/2,FLHEADPREFIX(WRAP_IMETH)/2,
-	FLDYNZPREFIX(WRAP_FD)/3,FLHEADPREFIX(WRAP_FD)/3,
-	FLDYNZPREFIX(WRAP_IFD)/3,FLHEADPREFIX(WRAP_IFD)/3,
-	FLDYNZPREFIX(WRAP_FDSIG)/3,FLHEADPREFIX(WRAP_FDSIG)/3,
-	FLDYNZPREFIX(WRAP_IFDSIG)/3,FLHEADPREFIX(WRAP_IFDSIG)/3,
-	FLDYNZPREFIX(WRAP_FDDEF)/2,FLHEADPREFIX(WRAP_FDDEF)/2,
-	FLDYNZPREFIX(WRAP_IFDDEF)/2,FLHEADPREFIX(WRAP_IFDDEF)/2,
-	FLDYNZPREFIX(WRAP_MVD)/3,FLHEADPREFIX(WRAP_MVD)/3,
-	FLDYNZPREFIX(WRAP_IMVD)/3,FLHEADPREFIX(WRAP_IMVD)/3,
-	FLDYNZPREFIX(WRAP_MVDSIG)/3,FLHEADPREFIX(WRAP_MVDSIG)/3,
-	FLDYNZPREFIX(WRAP_IMVDSIG)/3,FLHEADPREFIX(WRAP_IMVDSIG)/3,
-	FLDYNZPREFIX(WRAP_MVDDEF)/2,FLHEADPREFIX(WRAP_MVDDEF)/2,
-	FLDYNZPREFIX(WRAP_IMVDDEF)/2,FLHEADPREFIX(WRAP_IMVDDEF)/2,
-	FLDYNZPREFIX(WRAP_TRAN)/2,FLHEADPREFIX(WRAP_TRAN)/2,
-	FLDYNZPREFIX(WRAP_MVDINC)/3,FLHEADPREFIX(WRAP_MVDINC)/3,
-	FLDYNZPREFIX(WRAP_IMVDINC)/3,FLHEADPREFIX(WRAP_IMVDINC)/3,
-	FLDYNZPREFIX(WRAP_MVDTOLIST)/3,FLHEADPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNZPREFIX(WRAP_IMVDTOLIST)/3,FLHEADPREFIX(WRAP_IMVDTOLIST)/3.
 
 FLHEADPREFIX(WRAP_ISA)(X,Y) :- 
 	FLDYNZPREFIX(WRAP_ISA)(X,Y).

Index: flrdyna.fli
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/flrdyna.fli,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flrdyna.fli	26 Nov 2002 05:03:41 -0000	1.1
+++ flrdyna.fli	8 Dec 2002 09:45:32 -0000	1.2
@@ -12,31 +12,8 @@
 ***************************************************************************/
 
 
-#include "flora_terms.flh"
-#include "flora_wrap.flh"
+#include "flora_wspredicates.flh"
 
-:- WRAP_FLOGICSTATIC
-	WRAP_HILOG/1, WRAP_DYNA_HILOG/1, WRAP_DYNZ_HILOG/1,
-	WRAP_HILOG/2, WRAP_DYNA_HILOG/2, WRAP_DYNZ_HILOG/2,
-	WRAP_HILOG/3, WRAP_DYNA_HILOG/3, WRAP_DYNZ_HILOG/3,
-	WRAP_HILOG/4, WRAP_DYNA_HILOG/4, WRAP_DYNZ_HILOG/4,
-	WRAP_HILOG/5, WRAP_DYNA_HILOG/5, WRAP_DYNZ_HILOG/5,
-	WRAP_HILOG/6, WRAP_DYNA_HILOG/6, WRAP_DYNZ_HILOG/6,
-	WRAP_HILOG/7, WRAP_DYNA_HILOG/7, WRAP_DYNZ_HILOG/7,
-	WRAP_HILOG/8, WRAP_DYNA_HILOG/8, WRAP_DYNZ_HILOG/8,
-	WRAP_HILOG/9, WRAP_DYNA_HILOG/9, WRAP_DYNZ_HILOG/9,
-	WRAP_HILOG/10,WRAP_DYNA_HILOG/10, WRAP_DYNZ_HILOG/10,
-	WRAP_HILOG/11,WRAP_DYNA_HILOG/11, WRAP_DYNZ_HILOG/11,
-	WRAP_HILOG/12,WRAP_DYNA_HILOG/12, WRAP_DYNZ_HILOG/12,
-	WRAP_HILOG/13,WRAP_DYNA_HILOG/13, WRAP_DYNZ_HILOG/13,
-	WRAP_HILOG/14,WRAP_DYNA_HILOG/14, WRAP_DYNZ_HILOG/14,
-	WRAP_HILOG/15,WRAP_DYNA_HILOG/15, WRAP_DYNZ_HILOG/15,
-	WRAP_HILOG/16,WRAP_DYNA_HILOG/16, WRAP_DYNZ_HILOG/16,
-	WRAP_HILOG/17,WRAP_DYNA_HILOG/17, WRAP_DYNZ_HILOG/17,
-	WRAP_HILOG/18,WRAP_DYNA_HILOG/18, WRAP_DYNZ_HILOG/18,
-	WRAP_HILOG/19,WRAP_DYNA_HILOG/19, WRAP_DYNZ_HILOG/19,
-	WRAP_HILOG/20,WRAP_DYNA_HILOG/20, WRAP_DYNZ_HILOG/20,
-	WRAP_HILOG/21,WRAP_DYNA_HILOG/21, WRAP_DYNZ_HILOG/21.
 
 ?- abolish(WRAP_DYNA_HILOG/1).
 ?- abolish(WRAP_DYNZ_HILOG/1).
@@ -189,14 +166,6 @@
     WRAP_DYNA_HILOG(X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
            X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21).
 
-:- WRAP_FLOGICSTATIC
-        WRAP_TDYN_HILOG/2, WRAP_TDYN_HILOG/3, WRAP_TDYN_HILOG/4,
-        WRAP_TDYN_HILOG/5, WRAP_TDYN_HILOG/6, WRAP_TDYN_HILOG/7,
-        WRAP_TDYN_HILOG/8, WRAP_TDYN_HILOG/9, WRAP_TDYN_HILOG/10,
-        WRAP_TDYN_HILOG/11, WRAP_TDYN_HILOG/12, WRAP_TDYN_HILOG/13,
-        WRAP_TDYN_HILOG/14, WRAP_TDYN_HILOG/15, WRAP_TDYN_HILOG/16,
-        WRAP_TDYN_HILOG/17, WRAP_TDYN_HILOG/18, WRAP_TDYN_HILOG/19,
-        WRAP_TDYN_HILOG/20, WRAP_TDYN_HILOG/21, WRAP_TDYN_HILOG/22.
 
 ?- abolish(WRAP_TDYN_HILOG/2).
 ?- abolish(WRAP_TDYN_HILOG/3).
@@ -238,14 +207,6 @@
         WRAP_TDYN_HILOG/17, WRAP_TDYN_HILOG/18, WRAP_TDYN_HILOG/19,
         WRAP_TDYN_HILOG/20, WRAP_TDYN_HILOG/21, WRAP_TDYN_HILOG/22.
 
-:- WRAP_FLOGICSTATIC
-        WRAP_TABLED_HILOG/2, WRAP_TABLED_HILOG/3, WRAP_TABLED_HILOG/4,
-        WRAP_TABLED_HILOG/5, WRAP_TABLED_HILOG/6, WRAP_TABLED_HILOG/7,
-        WRAP_TABLED_HILOG/8, WRAP_TABLED_HILOG/9, WRAP_TABLED_HILOG/10,
-        WRAP_TABLED_HILOG/11, WRAP_TABLED_HILOG/12, WRAP_TABLED_HILOG/13,
-        WRAP_TABLED_HILOG/14, WRAP_TABLED_HILOG/15, WRAP_TABLED_HILOG/16,
-        WRAP_TABLED_HILOG/17, WRAP_TABLED_HILOG/18, WRAP_TABLED_HILOG/19,
-        WRAP_TABLED_HILOG/20, WRAP_TABLED_HILOG/21, WRAP_TABLED_HILOG/22.
 WRAP_TABLED_HILOG(0,X01) :-
     WRAP_TDYN_HILOG(_,X01).
 
@@ -331,51 +292,6 @@
     WRAP_TDYN_HILOG(_,X01,X02,X03,X04,X05,X06,X07,X08,X09,X10,
            X11,X12,X13,X14,X15,X16,X17,X18,X19,X20,X21).
 
-:- WRAP_FLOGICSTATIC
-	FLDYNAPREFIX(WRAP_ISA)/2,FLHEADPREFIX(WRAP_ISA)/2,
-	FLDYNAPREFIX(WRAP_SUB)/2,FLHEADPREFIX(WRAP_SUB)/2,
-	FLDYNAPREFIX(WRAP_METH)/2,FLHEADPREFIX(WRAP_METH)/2,
-	FLDYNAPREFIX(WRAP_IMETH)/2,FLHEADPREFIX(WRAP_IMETH)/2,
-	FLDYNAPREFIX(WRAP_FD)/3,FLHEADPREFIX(WRAP_FD)/3,
-	FLDYNAPREFIX(WRAP_IFD)/3,FLHEADPREFIX(WRAP_IFD)/3,
-	FLDYNAPREFIX(WRAP_FDSIG)/3,FLHEADPREFIX(WRAP_FDSIG)/3,
-	FLDYNAPREFIX(WRAP_IFDSIG)/3,FLHEADPREFIX(WRAP_IFDSIG)/3,
-	FLDYNAPREFIX(WRAP_FDDEF)/2,FLHEADPREFIX(WRAP_FDDEF)/2,
-	FLDYNAPREFIX(WRAP_IFDDEF)/2,FLHEADPREFIX(WRAP_IFDDEF)/2,
-	FLDYNAPREFIX(WRAP_MVD)/3,FLHEADPREFIX(WRAP_MVD)/3,
-	FLDYNAPREFIX(WRAP_IMVD)/3,FLHEADPREFIX(WRAP_IMVD)/3,
-	FLDYNAPREFIX(WRAP_MVDSIG)/3,FLHEADPREFIX(WRAP_MVDSIG)/3,
-	FLDYNAPREFIX(WRAP_IMVDSIG)/3,FLHEADPREFIX(WRAP_IMVDSIG)/3,
-	FLDYNAPREFIX(WRAP_MVDDEF)/2,FLHEADPREFIX(WRAP_MVDDEF)/2,
-	FLDYNAPREFIX(WRAP_IMVDDEF)/2,FLHEADPREFIX(WRAP_IMVDDEF)/2,
-	FLDYNAPREFIX(WRAP_TRAN)/2,FLHEADPREFIX(WRAP_TRAN)/2,
-	FLDYNAPREFIX(WRAP_MVDINC)/3,FLHEADPREFIX(WRAP_MVDINC)/3,
-	FLDYNAPREFIX(WRAP_IMVDINC)/3,FLHEADPREFIX(WRAP_IMVDINC)/3,
-	FLDYNAPREFIX(WRAP_MVDTOLIST)/3,FLHEADPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNAPREFIX(WRAP_IMVDTOLIST)/3,FLHEADPREFIX(WRAP_IMVDTOLIST)/3.
-
-:- WRAP_FLOGICSTATIC
-	FLDYNZPREFIX(WRAP_ISA)/2,
-	FLDYNZPREFIX(WRAP_SUB)/2,
-	FLDYNZPREFIX(WRAP_METH)/2,
-	FLDYNZPREFIX(WRAP_IMETH)/2,
-	FLDYNZPREFIX(WRAP_FD)/3,
-	FLDYNZPREFIX(WRAP_IFD)/3,
-	FLDYNZPREFIX(WRAP_FDSIG)/3,
-	FLDYNZPREFIX(WRAP_IFDSIG)/3,
-	FLDYNZPREFIX(WRAP_FDDEF)/2,
-	FLDYNZPREFIX(WRAP_IFDDEF)/2,
-	FLDYNZPREFIX(WRAP_MVD)/3,
-	FLDYNZPREFIX(WRAP_IMVD)/3,
-	FLDYNZPREFIX(WRAP_MVDSIG)/3,
-	FLDYNZPREFIX(WRAP_IMVDSIG)/3,
-	FLDYNZPREFIX(WRAP_MVDDEF)/2,
-	FLDYNZPREFIX(WRAP_IMVDDEF)/2,
-	FLDYNZPREFIX(WRAP_TRAN)/2,
-	FLDYNZPREFIX(WRAP_MVDINC)/3,
-	FLDYNZPREFIX(WRAP_IMVDINC)/3,
-	FLDYNZPREFIX(WRAP_MVDTOLIST)/3,
-	FLDYNZPREFIX(WRAP_IMVDTOLIST)/3.
 
 ?- abolish(FLDYNAPREFIX(WRAP_ISA)/2).
 ?- abolish(FLDYNAPREFIX(WRAP_SUB)/2).

Update of /cvsroot/flora/flora2/syslib
In directory sc8-pr-cvs1:/tmp/cvs-serv4666/syslib

Modified Files:
	CompileChangedFiles.sh 
Log Message:
moved closire/includes/flrpred.fli
to flrincludes/flora_wspredicates.flh
All WRAP_WITH_WORKSPACE declarations are now there.
Eliminated many duplications in declarations.
Use wrapped macros instead of fd/mdv/etc/


Index: CompileChangedFiles.sh
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/CompileChangedFiles.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CompileChangedFiles.sh	18 May 2002 17:43:28 -0000	1.1.1.1
+++ CompileChangedFiles.sh	8 Dec 2002 09:45:32 -0000	1.2
@@ -1,13 +1,13 @@
 #! /bin/sh
 
-XSB=$1
+XSB=$*
 
 ../touch.sh cmd...
 
 split -l 7 cmd... cmd..._
 
 for f in cmd..._*; do
-     cat cmd...hdr $f | "$XSB"
+     cat cmd...hdr $f | $XSB
 done
 
 rm cmd... cmd...hdr cmd..._*