flora-commits Mailing List for Flora-2

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

Modified Files:
	NMakefile.mak Makefile .cvsignore 
Log Message:
added a preliminary xml package


Index: .cvsignore
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- .cvsignore	18 May 2002 17:43:28 -0000	1.1.1.1
+++ .cvsignore	20 Dec 2004 07:01:36 -0000	1.2
@@ -1,2 +1 @@
 *.xwam
-*.O

Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/NMakefile.mak,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- NMakefile.mak	26 Sep 2004 03:58:45 -0000	1.13
+++ NMakefile.mak	20 Dec 2004 07:01:36 -0000	1.14
@@ -37,6 +37,7 @@
 	   flrtrim$(OBJEXT) \
 	   flrexport$(OBJEXT) \
 	   flroptimize$(OBJEXT) \
+	   flrnewoid$(OBJEXT) \
 	   flrimport$(OBJEXT)
 
 OPTIONS = [optimize]

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	26 Sep 2004 08:43:44 -0000	1.19
+++ Makefile	20 Dec 2004 07:01:36 -0000	1.20
@@ -64,6 +64,7 @@
 	  flrexport$(OBJEXT) \
 	  flrdbmodule$(OBJEXT) \
 	  flroptimize$(OBJEXT) \
+	  flrnewoid$(OBJEXT) \
 	  flrimport$(OBJEXT)
 
 FLORA_INCLUDES_DIR = ../flrincludes

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

Modified Files:
	flora2.P 
Log Message:
added a preliminary xml package


Index: flora2.P
===================================================================
RCS file: /cvsroot/flora/flora2/flora2.P,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- flora2.P	26 Sep 2004 08:34:04 -0000	1.11
+++ flora2.P	20 Dec 2004 07:01:39 -0000	1.12
@@ -122,10 +122,11 @@
 	  !,
 	  asserta(library_directory(FloraDir)),
 	  [flrversion],
-	  flora_assert_directories([syslib,lib,debugger,pkgs,p2h])
+	  flora_assert_directories([syslib,lib,debugger,pkgs,'pkgs/prolog',p2h])
 	;
 	  %% running FLORA as an XSB package
-	  bootstrap_package([flora2,syslib,lib,debugger,pkgs,p2h],flora),
+	  bootstrap_package([flora2,syslib,lib,debugger,pkgs,'pkgs/prolog',p2h],
+			    flora),
 	  [flrversion]
 	),
 	!,

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

Modified Files:
	flora2.tex 
Log Message:
added a preliminary xml package


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- flora2.tex	6 Nov 2004 07:39:57 -0000	1.114
+++ flora2.tex	20 Dec 2004 07:01:38 -0000	1.115
@@ -2303,43 +2303,53 @@
 \subsubsection{Calling \FLORA from a Prolog Module}
 
 To call \FLORA from within a Prolog program, say {\tt test.P}, the
-  following must be done:
+following must be done:
+%%
+\begin{enumerate}
+\item  The query 
   %%
-  \begin{enumerate}
-  \item  The query 
-    %%
-    \begin{quote}
-      {\tt ?- [flora2], bootstrap\_flora} 
-    \end{quote}
-    %%
-    must be executed \emph{before compiling or loading} {\tt test.P} ---
-    otherwise, the program will not compile or load.
-  \item The directive
-    %%
-    \begin{quote}
-      {\tt :- import (flImport)/1 from flora2.}    
-    \end{quote}
-    %%
-    must appear near the top of {\tt test.P}, \emph{prior to any call} to
-    \FLORA predicates.
-  \end{enumerate}
+  \begin{quote}
+    {\tt ?- [flora2], bootstrap\_flora} 
+  \end{quote}
   %%
-  
-  The first form for {\tt flImport} above is used to both import the
-  predicate and also load the program file defining it into a given \FLORA
-  user module. The second syntax is used when the flora program is already
-  loaded into a module and we only need to import the corresponding
-  predicate.
-  
-  The imported predicate must be given a name by which the imported
-  predicate will be known in Prolog.  (This name can be the same as the
-  name used in \FLORA.)  It is important, however, that the Prolog name be
-  specified as shown, {\it i.e.}, as a predicate skeleton with the same
-  number of arguments as in the \FLORA predicate. For instance, {\tt
-    foo(\_,\_,\_)} will do, but {\tt foo/3} will not.
+  must be executed \emph{before compiling or loading} {\tt test.P} ---
+  otherwise, the program will not compile or load.
+\item The directive
+  %%
+  \begin{quote}
+    {\tt :- import (flImport)/1 from flora2.}    
+  \end{quote}
+  %%
+  must appear near the top of {\tt test.P}, \emph{prior to any call} to
+  \FLORA predicates.
+\end{enumerate}
+%%
 
-Once the predicate is imported, it can be used under its Prolog name as a
-regular predicate.
+The first form for {\tt flImport} above is used to both import the
+predicate and also load the program file defining it into a given \FLORA
+user module. The second syntax is used when the flora program is already
+loaded into a module and we only need to import the corresponding
+predicate.
+
+In {\tt flImport}, \emph{flora-predicate} is the name of the imported
+predicate as it is known in the \FLORA module. For non-tabled predicates,
+whose name starts with {\tt \#}  in \FLORA, \emph{flora-predicate} should have the
+following syntax: {\tt \#(predicate-name)}. For instance, to import a \FLORA
+predicate {\tt \#foobar} of arity 3 one can use the following statement: 
+%%
+\begin{verbatim}
+   ?- flImport #(foobar)/3 as foobar(_,_,_) from mymodule.
+\end{verbatim}
+%%
+
+  
+The imported predicate must be given a name by which the imported
+predicate will be known in Prolog.  (This name can be the same as the
+name used in \FLORA.)  It is important, however, that the Prolog name be
+specified as shown, {\it i.e.}, as a predicate skeleton with the same
+number of arguments as in the \FLORA predicate. For instance, {\tt
+  foo(\_,\_,\_)} will do, but {\tt foo/3} will not.  Once the predicate
+is imported, it can be used under its Prolog name as a regular predicate.
 
 Prolog programs can also load and compile \FLORA programs using the following
 queries (again, bootstrap\_ {\tt flora} must be executed in advance): 

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

Modified Files:
	NMakefile.mak Makefile 
Added Files:
	flrxml_aux.flr 
Log Message:
added a preliminary xml package


--- NEW FILE: flrxml_aux.flr ---
#flrnewoid(X) :- newoid{X}.

#flrelement(C, X, C1, M) :-
	newoid{C1}, 
	if flLoadedModule(M)  then true else  newmodule{M}, 
	insert{C[X->>{C1}]@M}.
#flrattribute(C, X, Y, M) :- 
	if flLoadedModule(M)  then true else  newmodule{M}, 
	insert{C[X->Y]@M}.

#flrattributefunc(C, X, Y, Z, M):- 
	if flLoadedModule(M)  then true else  newmodule{M}, 
	insert{C[X(Y)->Z]@M}.

#parse_xpath(X, Y, Z) :- parse_xpath(X, Y, Z)@prologall(xpath).


#load_xml_structure(X, Y, M) :-	#load_structure(X, Y, [dialect(xml)], M).

#load_sgml_structure(X, Y, M) :- #load_structure(X, Y, [dialect(sgml)], M).

#load_html_structure(X, Y, M) :-
	dtd(html,Dtd)@prologall(sgml),
	#load_structure(X, Y, [Dtd, dialect(sgml)], M).

#load_structure(X, Y, Z, M) :- load_structure(X, Y1, Z)@prologall(sgml),
	p2h{Y1, Y}, 
	xml_parse_doc(Y, M)@prologall(flrxml),
	insertrule_z{
	    (O1['$tag' -> Tag] :- _[Tag->>{O1}])@M,
	    (O2['$parent' -> O21] :- O21[_->>{O2}])@M,
	    (O3['$tag'(N) -> Tag] :- O3['$child'(N) -> _['$tag' -> Tag ]])@M,
	    (O4['$childrenList' -> ChildrenList]:-
		( O4[_->>_]@M,
		  ChildrenList = collectset{Child | O4['$child'(_)->Child]@M}
		))@M,
	    (O5['$tagList' -> TagList ] :- 
		( O5[_->>_]@M, 
		  TagList = collectset{Tags | 
					O5['$child'(_)->_['$tag'-> Tags]]@M}
		))@M,
	    (O6['$childrenNum' -> Counter ]:- 
		( O6[_->>_]@M,
		  Counter is count{Children | O6['$child'(_)->Children]@M}
	        ))@M
	}.

Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/pkgs/NMakefile.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NMakefile.mak	20 Jun 2004 08:13:25 -0000	1.6
+++ NMakefile.mak	20 Dec 2004 07:01:37 -0000	1.7
@@ -7,7 +7,7 @@
 OBJEXT = .xwam
 PROLOGEXT = .P
 
-ALLOBJS =
+ALLOBJS = flrxml_aux$(PROLOGEXT)
 
 OPTIONS=[optimize]
 
@@ -16,8 +16,8 @@
 ALL: $(ALLOBJS)
 
 
-.flr$(PROLOGEXT):
-	$(PROLOG) -e "asserta(library_directory('..')). ['..\flora2']. import bootstrap_flora/0 from flora2. bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF)."
+flrxml_aux.flr$(PROLOGEXT):
+	$(PROLOG) -e "asserta(library_directory('..')). ['..\flora2']. import bootstrap_flora/0 from flora2. bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF >> flrxml)."
 
 
 CLEAN:

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/pkgs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	31 Aug 2004 17:53:02 -0000	1.4
+++ Makefile	20 Dec 2004 07:01:38 -0000	1.5
@@ -29,7 +29,7 @@
 
 FLORADIR=..
 
-ALL = 	
+ALL = 	flrxml_aux${PROLOGEXT}
 
 Option = [optimize]
 
@@ -61,8 +61,8 @@
 	@rm cmd...
 	@cat $(SVFILE)
 
-.flr$(PROLOGEXT):
-	echo 'import (flCompile)/1 from flora2. flCompile($*).' >> cmd...
+flrxml_aux$(PROLOGEXT):
+	echo 'import (flCompile)/1 from flora2. flCompile($* >> flrxml).' >> cmd...
 
 init:
 	/bin/rm -f $(SVFILE)

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

Added Files:
	flrxml.P .cvsignore 
Log Message:
added a preliminary xml package


--- NEW FILE: .cvsignore ---
*.xwam

--- NEW FILE: flrxml.P ---
:-import (flImport)/1 from flora2.
:-flImport #(flrelement)/4 as flrelement(_,_,_, _) from flrxml_aux >> flrxml.
:-flImport #(flrattribute)/4 as flrattribute(_,_,_, _)
	   from flrxml_aux >> flrxml.
:-flImport #(flrnewoid)/1 as flrnewoid(_) from flrxml_aux >> flrxml.
:-flImport #(flrattributefunc)/5 as flrattributefunc(_,_,_,_,_)
	   from flrxml_aux >> flrxml.
:-export xml_parse_doc/2.


xml_parse_doc(D, M) :- 
	flrnewoid(C), 
	flrattribute(C, '$order', 0, M),  
	xml_parse_root(C, D, leftmost, 1, _, 0, M).

xml_parse_root(C, [X|Y], Left, Oin, Oout, Child, M) :- 
	parse_xml_element(C, X, C1, Oin, Otemp, M),
	flrattributefunc(C, '$child', Child, C1, M),
	Child1 is Child + 1,	
	(Left = leftmost ->  
	    true 
	;flrattribute(Left, '$rightsibling', C1, M),
	    flrattribute(C1, '$leftsibling', Left, M)
	),	
	xml_parse_root(C, Y, C1, Otemp,  Oout, Child1, M). 

xml_parse_root(_, [], _, Oin, Oin, _, _).

parse_xml_element(C, element(X,Y,Z), C1, Oin, Oout, M):- 
	\+is_element_text(Z), 
	flrelement(C, X, C1, M),
	flrattribute(C1, '$order', Oin, M),
	Otemp is Oin + 1,
	parse_xml_attribute(C1, Y, M),
	flrattribute(C1, '$content', Z, M),
	flrelement(C1, '$text', C2, M),
	flrattributefunc(C1, '$child', 0, C2, M),
	flrattribute(C2, '$order', Otemp, M),
	Oout is Otemp+1,
	flrattribute(C2, '$string', Z, M),
	!.


parse_xml_element(C, element(X,Y,Z), C1, Oin, Oout, M):- 
	flrelement(C, X, C1, M),
	flrattribute(C1, '$order', Oin, M),
	Otemp is Oin + 1, 
	parse_xml_attribute(C1, Y, M),  
	xml_parse_root(C1, Z, leftmost, Otemp, Oout, 0, M),	!.

is_element_text([element(_,_,_)]).

parse_xml_element(C, X, C1, Oin, Oout, M) :- 
	flrelement(C, '$text', C1, M),
	flrattribute(C1, '$order', Oin, M),
	Oout is Oin + 1,
	flrattribute(C1, '$string', X, M).


parse_xml_attribute(C1, [ X = Y |Z], M):- 
	flrattribute(C1, X, Y, M), 
	parse_xml_attribute(C1, Z, M).

parse_xml_attribute(_, [], _). 

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

Log Message:
Directory /cvsroot/flora/flora2/pkgs/prolog added to the repository

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

Modified Files:
	flrcoder.P 
Log Message:
fix a bug in generating dependency warnings

Index: flrcoder.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcoder.P,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- flrcoder.P	10 Oct 2004 01:55:32 -0000	1.38
+++ flrcoder.P	5 Dec 2004 02:43:45 -0000	1.39
@@ -1556,19 +1556,19 @@
 	!,
 	( is_pratomlit(P,[A],Ind) ->
 	      PF=WRAP_TABLED_HILOG,
-	      is_prlist(PArgs,[PRATOM(A,Ind)],[],_I)
+	      is_prlist(PArgs,[PRATOM(A,Ind)],[],NO_INDEX)
 
 	; is_pratomlit(P,[A,CallerVar],Ind) ->
 	      PF=WRAP_TABLED_HILOG,
-	      is_prlist(PArgs,[PRATOM(A,Ind),CallerVar],[],_I)
+	      is_prlist(PArgs,[PRATOM(A,Ind),CallerVar],[],NO_INDEX)
 
 	; is_prtermlit(P,FObj,Arity,ObjList) ->
             ( is_pratom(FObj,FL_TRAN,_Index) ->
                 PF=WRAP_HILOG,
-                is_prlist(PArgs,[FObj|ObjList],[],_I)
+                is_prlist(PArgs,[FObj|ObjList],[],NO_INDEX)
             ;
 	        PF=WRAP_TABLED_HILOG,
-	        is_prlist(PArgs,[FObj|ObjList],[],_I)
+	        is_prlist(PArgs,[FObj|ObjList],[],NO_INDEX)
             )
 	
 	%% Case of X@Y, where X is a variable
@@ -1580,7 +1580,7 @@
 	;
 	  is_flogic(P,Wrap,Arity,ObjList),
 	  flora_concat_atoms([Prefix,Wrap],PF),
-	  is_prlist(PArgs,ObjList,[],_I)
+	  is_prlist(PArgs,ObjList,[],NO_INDEX)
 	),
 	!,
 	( Lib == FLLIBMODLIT ->