flora-commits Mailing List for Flora-2

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

Modified Files:
	flrconfig.P 
Log Message:
commented out memory options


Index: flrconfig.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrconfig.P,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- flrconfig.P	20 Jun 2006 16:26:14 -0000	1.19
+++ flrconfig.P	27 Dec 2006 02:00:03 -0000	1.20
@@ -80,7 +80,7 @@
        writeln('@echo OFF'),
        write('@set FLORADIR="'), writeq(FloraDir), writeln('"'),
        write('@set PROLOG='), write(ConfigBinDir), writeln('\\xsb'),
-       write('@set PROLOGOPTIONS="'), write(PrologOptions), writeln('"'),
+       write('REM @set PROLOGOPTIONS="'), write(PrologOptions), writeln('"'),
        writeln('@%PROLOG% %PROLOGOPTIONS% -e "asserta(library_directory(%FLORADIR%)). [flora2]. flora_shell." %1 %2 %3 %4 %5 %6 %7')
    ;
        tell('runflora'),
@@ -101,7 +101,7 @@
        ),
        writeln('"'),
        write('PROLOG='), write(ConfigBinDir), writeln('/xsb'),
-       write('PROLOGOPTIONS="'), write(PrologOptions), writeln('"'),
+       write('#PROLOGOPTIONS="'), write(PrologOptions), writeln('"'),
        writeln('$PROLOG $PROLOGOPTIONS -e "asserta(library_directory($FLORADIR)). [flora2]. flora_shell." $extra_args')
    ),
    told,

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

Modified Files:
	flrdecode.P 
Log Message:
fixed bug in printing variables


Index: flrdecode.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdecode.P,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- flrdecode.P	29 Aug 2006 06:12:57 -0000	1.46
+++ flrdecode.P	27 Dec 2006 01:59:32 -0000	1.47
@@ -147,6 +147,7 @@
 	!,
 	write_flat_code(Stream,H),
 	write_flat_code(Stream,T).
+/*
 write_flat_code(Stream,[H|T]) :-
 	!,	
 	(var(H) ->
@@ -156,6 +157,11 @@
 	 write(Stream,H)
 	),
 	write_flat_code(Stream,T).
+*/
+write_flat_code(Stream,[H|T]) :-
+	!,	
+	write(Stream,H),
+	write_flat_code(Stream,T).
 
 write_flat_code_without_ws(_,[]) :- !.
 
@@ -1186,7 +1192,7 @@
  for strings, replace every occurency of \ with \\ so that \n is printed
  as it is instead of being interpreted
  ****************************************************************************/
-escape(NL,NL) :-
+escape(NL,['?', NL]) :-
         var(NL),
         !.
 

Update of /cvsroot/flora/flora-testsuite/general_tests
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24715/general_tests

Modified Files:
	tabledupdates.flr pretty_old 
Log Message:
updated


Index: pretty_old
===================================================================
RCS file: /cvsroot/flora/flora-testsuite/general_tests/pretty_old,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pretty_old	22 Dec 2005 23:31:10 -0000	1.6
+++ pretty_old	27 Dec 2006 01:53:23 -0000	1.7
@@ -1,4 +1,5 @@
 Self info: 
+'student'	:  'string'.
 'student'	:  'symbol'.
 'student'[
     canteach *-> {''},
@@ -14,6 +15,7 @@
 ].
 
 Class info: 
+'student'	:  'string'.
 'student'	:  'symbol'.
 'student'[
     canteach *-> {''},
@@ -29,8 +31,10 @@
 ].
 
 'john'	:  'student'.
+'john'	:  'string'.
 'john'	:  'symbol'.
 'john'[
+    advisor -> {'ad1'},
     canteach -> {[cse127, cse230, cse214]},
     defense -> {'nottaken'},
     first -> {'John'},
@@ -40,7 +44,6 @@
     quals -> {'ql1'},
     remarks -> {''},
     rpe -> {'rp1'},
-    advisor -> {'ad1'},
     status -> {'st1'},
     taught -> {'tt11','tt12'},
     active,
@@ -48,8 +51,10 @@
 ].
 
 'mary'	:  'student'.
+'mary'	:  'string'.
 'mary'	:  'symbol'.
 'mary'[
+    advisor -> {'ad2'},
     canteach -> {''},
     defense -> {'df2'},
     first -> {'Mary'},
@@ -60,7 +65,6 @@
     quals -> {'ql2'},
     remarks -> {''},
     rpe -> {'rp2'},
-    advisor -> {'ad2'},
     status -> {'st3'},
     support -> {'sp2','sp3'},
     active,

Index: tabledupdates.flr
===================================================================
RCS file: /cvsroot/flora/flora-testsuite/general_tests/tabledupdates.flr,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tabledupdates.flr	22 Dec 2005 23:31:10 -0000	1.9
+++ tabledupdates.flr	27 Dec 2006 01:53:23 -0000	1.10
@@ -52,7 +52,7 @@
         else writeln(passed)@prolog().
 
 %test7 :- write('tst7: ')@prolog(),
-	if (a:?X, ?X \= symbol)
+	if (a:?X, \+ member(?X, [string,symbol])@prolog(basics))
         then  writeln(failed)@prolog()
         else writeln(passed)@prolog().
 

Update of /cvsroot/flora/flora2/java/API/examples/fooExample
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java/API/examples/fooExample

Modified Files:
	fooExample.java foo.java 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: foo.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/examples/fooExample/foo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- foo.java	10 Sep 2006 18:53:46 -0000	1.5
+++ foo.java	25 Dec 2006 00:13:29 -0000	1.6
@@ -66,717 +66,717 @@
     // Java proxy methods for FLORA-2 methods
     public boolean getBDI_boolean()
     {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       return sourceFloraObject.getboolean(moduleName,"boolean",INHERITABLE,DATA,pars);
     }
 
     public Iterator getBDIall_boolean()
     {
-      Vector pars = new Vector();
[...1216 lines suppressed...]
       pars.add(year);
       pars.add(month);
       return sourceFloraObject.deletevalue(moduleName,"bonus",NONINHERITABLE,SIGNATURE,pars,value);
@@ -1101,14 +1101,14 @@
 
     public boolean deleteVSN_bonus(Object year, Object month,Object value)
     {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       pars.add(month);
       return sourceFloraObject.deletevalue(moduleName,"bonus",NONINHERITABLE,SIGNATURE,pars,value);
     }
 
     public boolean deleteVSN_bonus(Object year, Object month)    {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       pars.add(month);
       return sourceFloraObject.deletevalue(moduleName,"bonus",NONINHERITABLE,SIGNATURE,pars);

Index: fooExample.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/examples/fooExample/fooExample.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fooExample.java	12 Sep 2006 13:41:08 -0000	1.5
+++ fooExample.java	25 Dec 2006 00:13:29 -0000	1.6
@@ -65,10 +65,10 @@
 	}
 
 	 
-	Vector vars = new Vector();
+	Vector<String> vars = new Vector<String>();
 	vars.add("?X");
 	vars.add("?Y");
-		
+
 	// Use of ExecuteQuery/2
 	Iterator allmatches = session.ExecuteQuery("?X : ?Y @ example.",vars);
 	HashMap firstmatch;
@@ -119,7 +119,7 @@
 	    System.out.println("John's age: "+ageValues.next());
 	}
 		
-	Vector ancestors = new Vector();
+	Vector<String> ancestors = new Vector<String>();
 	ancestors.add("mary");
 	ancestors.add("sally");
 		

Update of /cvsroot/flora/flora2/java/API/net/sourceforge/flora/javaAPI/src
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java/API/net/sourceforge/flora/javaAPI/src

Modified Files:
	FloraSession.java FloraObject.java 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: FloraSession.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/net/sourceforge/flora/javaAPI/src/FloraSession.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FloraSession.java	2 Jun 2006 04:52:16 -0000	1.3
+++ FloraSession.java	25 Dec 2006 00:13:29 -0000	1.4
@@ -79,7 +79,7 @@
     */
     public Iterator FindAllMatches(String query,Vector vars)
     {
-	Vector retBindings = new Vector();
+	Vector<HashMap<String,FloraObject>> retBindings = new Vector<HashMap<String,FloraObject>>();
 	Object[] bindings = null;
 		
 	try {
@@ -88,7 +88,7 @@
 	    for (int i=0; i<bindings.length; i++) {
 				
 		TermModel tm = (TermModel)bindings[i];
-		HashMap currBinding = new HashMap();
+		HashMap<String,FloraObject> currBinding = new HashMap<String,FloraObject>();
 		for (int j=0; j<vars.size(); j++) {
 		    String varValue = (String)vars.elementAt(j);
 
@@ -154,10 +154,10 @@
     */
     public Iterator ExecuteQuery(String query)
     {
-	Vector retBindings = new Vector();
+	Vector<FloraObject> retBindings = new Vector<FloraObject>();
 	Object[] bindings = null;
 		
-	Vector vars = new Vector();
+	Vector<String> vars = new Vector<String>();
 	vars.add("?");
 	try {
 	    bindings = flora.FloraCommand(query,vars);

Index: FloraObject.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/net/sourceforge/flora/javaAPI/src/FloraObject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FloraObject.java	2 Jun 2006 04:52:16 -0000	1.4
+++ FloraObject.java	25 Dec 2006 00:13:29 -0000	1.5
@@ -137,7 +137,7 @@
 	String paramList = makeParameterListString(parameters);
 	
 	// add variable arguments of method to get their bindings out
-	Vector argList = new Vector();
+	Vector<String> argList = new Vector<String>();
 	int noOfPars = parameters.size();
 	for (int i=0; i<noOfPars; i++) {
 	    String param = parameters.elementAt(i).toString();
@@ -293,7 +293,7 @@
 	String paramList = makeParameterListString(parameters);
 	
 	// add variable arguments of method to get their bindings out
-	Vector argList = new Vector();
+	Vector<String> argList = new Vector<String>();
 	int noOfPars = parameters.size();
 	for (int i=0; i<noOfPars; i++) {
 	    String param = parameters.elementAt(i).toString();
@@ -444,7 +444,7 @@
 	String paramList = makeParameterListString(parameters);
 	
 	// add variable arguments of method to get their bindings out
-	Vector argList = new Vector();
+	Vector<String> argList = new Vector<String>();
 	int noOfPars = parameters.size();
 	for (int i=0; i<noOfPars; i++) {
 	    String param = parameters.elementAt(i).toString();
@@ -781,7 +781,7 @@
     */
     public Iterator getMethods(String moduleName)
     {
-	Vector allMethods = new Vector();
+	Vector<FloraMethod> allMethods = new Vector<FloraMethod>();
 		
 	Iterator methodIter = getMethods(moduleName,NONINHERITABLE,VALUE);
 	while(methodIter.hasNext())
@@ -838,7 +838,7 @@
 		    NONINHERIT_SIGNATURE_ARROW + PROCEDURAL_METHOD_SYMBOL;
 	}
 			
-	Vector vars = new Vector();
+	Vector<String> vars = new Vector<String>();
 	vars.add("?Method");
 	vars.add("?Value"); // shouldn't matter if ?Value is not used
 	vars.add("?Arguments");
@@ -851,7 +851,7 @@
 	    + ")" + AT_MODULE_SYMBOL + moduleName + ".";
 		
 	Iterator methodMatches;
-	Vector returnMethodVec = new Vector();
+	Vector<FloraMethod> returnMethodVec = new Vector<FloraMethod>();
 	try {
 	    methodMatches = session.FindAllMatches(floraQueryString,vars);
 	    HashMap firstmatch;
@@ -867,7 +867,7 @@
 		TermModel methodArgs =
 		    ((FloraObject)firstmatch.get("?Arguments")).floraOID;
 				
-		Vector methodPars = new Vector();
+		Vector<FloraObject> methodPars = new Vector<FloraObject>();
 		while (!methodArgs.isLeaf()) {
 		    methodPars.add(new FloraObject((TermModel)methodArgs.getChild(0),session));
 		    methodArgs = (TermModel) methodArgs.getChild(1);

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

Modified Files:
	javaAPI.flr 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: javaAPI.flr
===================================================================
RCS file: /cvsroot/flora/flora2/pkgs/javaAPI.flr,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- javaAPI.flr	10 Sep 2006 18:53:45 -0000	1.7
+++ javaAPI.flr	25 Dec 2006 00:13:29 -0000	1.8
@@ -367,8 +367,8 @@
     
 %valueMethodSetProto(?Method,?Inherit,?DataOrSign) :-
 	?Method =.. [?H|?FnArgs],
-	if ?H = hilog(?FnName) then ?Msg = ',Vector value)'
-        else (?H = ?FnName, ?Msg = 'Vector value)'),
+	if ?H = hilog(?FnName) then ?Msg = ',Vector<Object> value)'
+        else (?H = ?FnName, ?Msg = 'Vector<Object> value)'),
 	(?DataOrSign==DATA, !, ?Modifier1=D ; ?Modifier1=S),
 	(?Inherit==INHERITABLE, !, ?Modifier2=I ; ?Modifier2=N),
 	%indent(1),
@@ -417,8 +417,8 @@
 
 %valueMethodDeleteProto(?Method,?Inherit,?DataOrSign) :-
 	?Method =.. [?H|?FnArgs],
-	if ?H = hilog(?FnName) then ?Msg = ',Vector value)'
-        else (?H = ?FnName, ?Msg = 'Vector value)'),
+	if ?H = hilog(?FnName) then ?Msg = ',Vector<Object> value)'
+        else (?H = ?FnName, ?Msg = 'Vector<Object> value)'),
 	(?DataOrSign==DATA, !, ?Modifier1=D ; ?Modifier1=S),
 	(?Inherit==INHERITABLE, !, ?Modifier2=I ; ?Modifier2=N),
 	%indent(1),
@@ -486,7 +486,7 @@
 
 %writeVectorParsInit:-
 	%indent(2),
-        writeln('Vector pars = new Vector();')@prolog().
+        writeln('Vector<Object> pars = new Vector<Object>();')@prolog().
 
 %writeProxySetCall(?FnName,?Inherit,?Type,?DataOrSign) :-    
 	(?Inherit==INHERITABLE, !, ?Modifier=I ; ?Modifier=N),

Update of /cvsroot/flora/flora2/java
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java

Modified Files:
	unixVariables.sh interprolog.jar 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: unixVariables.sh
===================================================================
RCS file: /cvsroot/flora/flora2/java/unixVariables.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unixVariables.sh	24 May 2006 20:33:56 -0000	1.1
+++ unixVariables.sh	25 Dec 2006 00:13:32 -0000	1.2
@@ -45,7 +45,7 @@
 	JAVA_BIN=`dirname "$JAVA_PROG"`
 	echo "** Using Java executable in $JAVA_BIN"
 	$JAVA_BIN/java -version
-	echo "** Please make sure that your Java version is 1.4.2 or newer"
+	echo "** Please make sure that your Java version is 1.5 or newer"
     fi
 fi
 

Index: interprolog.jar
===================================================================
RCS file: /cvsroot/flora/flora2/java/interprolog.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsegz5Z0 and /tmp/cvsZZ5EwH differ

Update of /cvsroot/flora/flora2/java/API/examples
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java/API/examples

Modified Files:
	buildExample.sh 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: buildExample.sh
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/examples/buildExample.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- buildExample.sh	22 Aug 2006 16:32:31 -0000	1.3
+++ buildExample.sh	25 Dec 2006 00:13:32 -0000	1.4
@@ -38,4 +38,4 @@
 ../../../runflora -e "flLoad('${FLORA_FILE}'>>example),flLoad(javaAPI),%write(${FLORA_CLASS},example,'${JAVA_FILE}'),flHalt." 
  
 # add -Xlint after convertion to Java 1.5
-${JAVA_BIN}/javac -classpath ..:../../interprolog.jar ${1}/*.java 
+${JAVA_BIN}/javac -deprecation -Xlint:unchecked -classpath ..:../../interprolog.jar ${1}/*.java 

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

Modified Files:
	flora-flrjava.tex 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: flora-flrjava.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-flrjava.tex,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- flora-flrjava.tex	12 Sep 2006 13:41:34 -0000	1.10
+++ flora-flrjava.tex	25 Dec 2006 00:13:32 -0000	1.11
@@ -198,7 +198,7 @@
         }
 
         /* Example of ExecuteQuery with two arguments */
-        Vector vars = new Vector();
+        Vector<String> vars = new Vector<String>();
         vars.add("?X");
         vars.add("?Y");
 

Update of /cvsroot/flora/flora2/java/API/examples/flogicbasicsExample
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java/API/examples/flogicbasicsExample

Modified Files:
	person.java flogicbasicsExample.java 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: person.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/examples/flogicbasicsExample/person.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- person.java	10 Sep 2006 18:53:46 -0000	1.5
+++ person.java	25 Dec 2006 00:13:29 -0000	1.6
@@ -66,1046 +66,1046 @@
     // Java proxy methods for FLORA-2 methods
     public boolean getBDI_married(Object year)
     {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       return sourceFloraObject.getboolean(moduleName,"married",INHERITABLE,DATA,pars);
     }
 
     public Iterator getBDIall_married(Object year)
     {
[...1237 lines suppressed...]
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       return sourceFloraObject.deletevalue(moduleName,"salary",NONINHERITABLE,SIGNATURE,pars,value);
     }
 
     public boolean deleteVSN_salary(Object year,Object value)
     {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       return sourceFloraObject.deletevalue(moduleName,"salary",NONINHERITABLE,SIGNATURE,pars,value);
     }
 
     public boolean deleteVSN_salary(Object year)    {
-      Vector pars = new Vector();
+      Vector<Object> pars = new Vector<Object>();
       pars.add(year);
       return sourceFloraObject.deletevalue(moduleName,"salary",NONINHERITABLE,SIGNATURE,pars);
     }

Index: flogicbasicsExample.java
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/examples/flogicbasicsExample/flogicbasicsExample.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flogicbasicsExample.java	12 Sep 2006 13:41:08 -0000	1.6
+++ flogicbasicsExample.java	25 Dec 2006 00:13:30 -0000	1.7
@@ -65,7 +65,7 @@
 	}
 
 	/* Example of query with two variables */
-	Vector vars = new Vector();
+	Vector<String> vars = new Vector<String>();
 	vars.add("?X");
 	vars.add("?Y");
 		

Update of /cvsroot/flora/flora2/java/API
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30108/java/API

Modified Files:
	build.sh 
Log Message:
update for JDK 1.5.
got rid of warnings
now is safe for Java generics
Now requires JDK 1.5 or later


Index: build.sh
===================================================================
RCS file: /cvsroot/flora/flora2/java/API/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- build.sh	22 Aug 2006 16:32:31 -0000	1.2
+++ build.sh	25 Dec 2006 00:13:32 -0000	1.3
@@ -32,5 +32,5 @@
 rm -f net/sourceforge/flora/javaAPI/src/*.class
 
 # add -Xlint when we convert to Java 1.5 completely
-${JAVA_BIN}/javac -classpath ..:../interprolog.jar net/sourceforge/flora/javaAPI/util/*.java net/sourceforge/flora/javaAPI/src/*.java  
+${JAVA_BIN}/javac -deprecation -Xlint:unchecked -classpath ..:../interprolog.jar net/sourceforge/flora/javaAPI/util/*.java net/sourceforge/flora/javaAPI/src/*.java  
 

Update of /cvsroot/flora/flora2/flrincludes
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv423/flrincludes

Modified Files:
	flora_terms.flh 
Log Message:
bug fix in the interaction with the db package


Index: flora_terms.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_terms.flh,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- flora_terms.flh	1 Oct 2006 13:35:16 -0000	1.67
+++ flora_terms.flh	4 Dec 2006 10:16:05 -0000	1.68
@@ -653,10 +653,6 @@
    wrap=arity denotes the arity of the wrapper.
    wrap < Number means that Number-1 is the max arity of the wrapper
    supported in FLORA-2. The latter is used for HiLog only.
-
-   Only base wrappers are included. The derived ones, like WRAP_MVDSIGDEF,
-   WRAP_IMVDSIGDEF, WRAP_MVDCONDEF, WRAP_IMVDCONDEF are not included, since
-   they are never stored.
 */
 #define MAX_HILOG_ARITY         24
 #define WRAP_LIST               [WRAP_TABLED_HILOG<MAX_HILOG_ARITY, \
@@ -675,9 +671,11 @@
                                  WRAP_MVDSIG=3, \
 				 WRAP_MVDSIGDEF=2, \
                                  WRAP_MVDCON=4, \
+				 WRAP_MVDCONDEF=4, \
                                  WRAP_IMVDSIG=3, \
 				 WRAP_IMVDSIGDEF=2, \
                                  WRAP_IMVDCON=4, \
+				 WRAP_IMVDCONDEF=4, \
                                  WRAP_EXISTS=1, \
                                  WRAP_MVDDEF=2, \
                                  WRAP_IMVDDEF=2, \

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

Modified Files:
	flora2.tex 
Log Message:
small fixes


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- flora2.tex	1 Oct 2006 13:35:16 -0000	1.156
+++ flora2.tex	4 Dec 2006 10:14:15 -0000	1.157
@@ -7192,20 +7192,20 @@
 binds {\tt ?Y} to {\tt \_"http://www.AAA.com/ab\%20"}. 
 
 Note that prefix definitions are local to the module where they are
-defined. If we execute
+defined. If we define the following prefixes in module {\tt foo}:
 %% 
 \begin{verbatim}
-  ?- (prefix W3="foow3/", W4="w4/")@foo.
+  ?- prefix W3="http://www.w3.org/", W4="w4/".
 \end{verbatim}
 %% 
 and then load the following file into module {\tt main} 
 %% 
 \begin{verbatim}
-  :- prefix W3 = "mainW3/".
-  C[a->_"foow3/a"].
-  D[a->_"mainW3/a"].
-  r(?X):-?X[a->(W3#a)@foo].
-  s(?X):-?X[a->W3#a].
+  :- prefix W3 = "http://w3.org/".
+  C[a->_"http://www.w3.org/abc"].
+  D[a->_"http://w3.org/cde"].
+  r(?X):-?X[a->(W3#abc)@foo].
+  s(?X):-?X[a->W3#cde].
 \end{verbatim}
 %% 
 then  the different occurrences of {\tt W3} will have different expansions.
@@ -7221,9 +7221,8 @@
   ?- s(?X).
 \end{verbatim}
 %% 
-will be {\tt D}.  Note that a reference to {\tt W3\#c} in another module,
-might result in an error, if {\tt W3} is not defined as a prefix in that
-module. 
+will be {\tt D}.  Note that a reference to {\tt W3\#...} in a module
+where the prefix {\tt W3} is not defined will result in an error.
 
 
 

Update of /cvsroot/flora/flora2/closure
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31554/closure

Modified Files:
	flrtypes.fli 
Log Message:
add string builtin type


Index: flrtypes.fli
===================================================================
RCS file: /cvsroot/flora/flora2/closure/flrtypes.fli,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- flrtypes.fli	30 Aug 2006 03:51:31 -0000	1.15
+++ flrtypes.fli	4 Dec 2006 10:12:40 -0000	1.16
@@ -15,6 +15,7 @@
 %% integer or float
 silent_isa(X,number,_Caller) :- number(X).
 silent_isa(X,symbol,_Caller) :- atom(X).
+silent_isa(X,string,_Caller) :- atom(X).
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Type combinators