flora-commits Mailing List for Flora-2

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

Modified Files:
	flrdecode.P flranswer.P 
Log Message:
fixed typos in writing out atoms with special symbols


Index: flrdecode.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdecode.P,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- flrdecode.P	25 Jun 2007 13:56:30 -0000	1.53
+++ flrdecode.P	23 Dec 2007 07:56:09 -0000	1.54
@@ -183,9 +183,9 @@
 	      write(Stream,FL_VARSYM),
 	      write(Stream,H)	      
 	    ;
-	    write(Stream,H)
+		write(Stream,H)
 	    ),
-	   write_flat_code_without_ws(Stream,T)
+	     write_flat_code_without_ws(Stream,T)
 	   )
 	).
 		
@@ -792,12 +792,18 @@
         decode_literal_internal(Term,Code,Level,Depth).
 
 %% data types
-decode_literal_internal(FL_DATATYPE(Term,Type), Code, _Level,_Depth) :-
+decode_literal_internal(FL_DATATYPE(Term,Type), Code, Level,Depth) :-
         !,
 	(var(Term) -> Code = ['?', Term, FL_DATATYPE_CONNECTOR, Type]
 	;
 	    flora_printable_type_representation(Term,[TypeName,TypeLit]),
-	    Code = ['"',TypeLit,'"',FL_DATATYPE_CONNECTOR,TypeName]
+	    (TypeLit=FL_DATATYPELIST(TypeLit2)
+	    ->
+		decode_literal_internal(TypeLit2,TypeLitDecoded,Level,Depth),
+		Code = [TypeLitDecoded,FL_DATATYPE_CONNECTOR,TypeName]
+	    ;
+		Code = ['"',TypeLit,'"',FL_DATATYPE_CONNECTOR,TypeName]
+	    )
 	).
 
 decode_literal_internal(FLLIBNEWMODULE(_ThisModule,NewModuleName),
@@ -1237,6 +1243,12 @@
         special_character(H,HC),
         !,
         escape(L,EL,_Flag).
+escape([CH_BACKSLASH,CH_QUOTE|L],[CH_QUOTE,CH_QUOTE|EL],escaped) :-
+	!,
+	escape(L,EL,_).
+escape([CH_QUOTE|L],[CH_QUOTE,CH_QUOTE|EL],escaped) :-
+	!,
+	escape(L,EL,_).
 %% Backslash before special character is escaped: '\\n' is internally 
 %% translated as \ n and is printed as '\\n'
 escape([CH_BACKSLASH,H|L],[CH_BACKSLASH,CH_BACKSLASH,H|EL],escaped) :-

Index: flranswer.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flranswer.P,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flranswer.P	28 Mar 2007 22:51:20 -0000	1.4
+++ flranswer.P	23 Dec 2007 07:56:09 -0000	1.5
@@ -132,7 +132,7 @@
 	    ;
 		flora_write_No
 	    ),
-	flora_reclaim_storage_space
+	    flora_reclaim_storage_space
 	).
 
 

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

Modified Files:
	flora_datatype_symbols.flh 
Log Message:
added list datatype
deleted _number


Index: flora_datatype_symbols.flh
===================================================================
RCS file: /cvsroot/flora/flora2/flrincludes/flora_datatype_symbols.flh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flora_datatype_symbols.flh	5 Jun 2007 06:51:06 -0000	1.4
+++ flora_datatype_symbols.flh	23 Dec 2007 07:55:33 -0000	1.5
@@ -29,6 +29,7 @@
 /* Data types */
 #define FL_DATATYPE_CONNECTOR   '^^'
 #define FL_DATATYPE		'_datatype' 
+#define FL_DATATYPELIST		'_datatypelist' 
 #define FL_URI			'_uri' 
 #define FL_IRI			'_iri' 
 #define FL_DATETIME		'_dateTime' 
@@ -43,7 +44,6 @@
 #define FL_REAL                 '_real'
 #define FL_FLOAT                '_float'
 #define FL_DOUBLE               '_double'
-#define FL_NUMBER               '_number'
 #define FL_LONG                 '_long'
 #define FL_DECIMAL              '_decimal'
 #define FL_STRING               '_string'

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

Modified Files:
	flora2.tex 
Log Message:
fixed some mistakes


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- flora2.tex	21 Nov 2007 01:16:19 -0000	1.186
+++ flora2.tex	23 Dec 2007 07:53:28 -0000	1.187
@@ -9435,7 +9435,8 @@
 {\tt ?X}.    
 %%
 \begin{verbatim}
-    ?O:flight[from->?F, to->?T] :- newoid{?O}, flight(?F,?T).
+    %convert_rel_to_oo :-
+         flight(?F,?T), newoid{?O}, insert{?O:flight[from->?F,to->?T]}.
 \end{verbatim}
 %%
 This approach is not as declarative as the first one, but it saves the user

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

Modified Files:
	flrutils.P flrcoder.H 
Log Message:
minor changes


Index: flrutils.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.P,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- flrutils.P	31 May 2007 18:18:27 -0000	1.87
+++ flrutils.P	23 Dec 2007 07:52:49 -0000	1.88
@@ -1520,13 +1520,12 @@
 	valid_flora_module_name(Module),
 	
 	( flora_locate_file(File,FLORA_FILE_EXT,FlrFile) ->
-	    flora_message_line('replacing the old ~w',
-	      [FlrFile]),
+	    flora_message_line('replacing the old ~w', [FlrFile]),
+	    flora_save_module_to_file(Module,FlrFile)
+	; 
+	    flora_FLR_filename(File,FlrFile),
+	    flora_message_line('~w is created',[FlrFile]),
 	    flora_save_module_to_file(Module,FlrFile)
-	  ; 
-	  flora_FLR_filename(File,FlrFile),
-	  flora_message_line('~w is created',[FlrFile]),
-	  flora_save_module_to_file(Module,FlrFile)
 	),	
 	!.	
 

Index: flrcoder.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrcoder.H,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- flrcoder.H	3 Aug 2007 14:17:52 -0000	1.24
+++ flrcoder.H	23 Dec 2007 07:52:49 -0000	1.25
@@ -30,7 +30,7 @@
 
 :- import format/2 from format.
 
-:- import append/3 from basics.
+:- import append/3, member/2 from basics.
 
 :- import
 	flora_write_quoted_atom/1,

Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29287

Modified Files:
	documentation.php 
Log Message:
typo fixes


Index: documentation.php
===================================================================
RCS file: /cvsroot/flora/flora-website/documentation.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- documentation.php	30 May 2007 16:19:56 -0000	1.9
+++ documentation.php	17 Dec 2007 18:55:50 -0000	1.10
@@ -16,7 +16,7 @@
   and are distributed with the system.
   In addition, <a href="visualizer.html">FLORA-2 Visualizer and editor</a>
   has its own documentation, which is accessible
-  href="visualizer.html">here</a>.
+  <a href="visualizer.html">here</a>.
 </p>
   
 <p>
@@ -33,6 +33,10 @@
     <a href="docs/floraPackages.pdf">FLORA-2 Packages</a> - Various packages
     that extend the core system.
   </li>
+  <li>  
+     <a href="tutorial.php">FLORA-2 Tutorial</a> - This tutorial has two parts:
+     Foundations and Programming.
+  </li>
 </ul>
 </p>
 <p>

Update of /cvsroot/flora/flora-website
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21722

Modified Files:
	index.php floratop.html 
Log Message:
colorscheme


Index: floratop.html
===================================================================
RCS file: /cvsroot/flora/flora-website/floratop.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- floratop.html	10 Sep 2007 06:58:51 -0000	1.1
+++ floratop.html	7 Dec 2007 21:57:36 -0000	1.2
@@ -1,14 +1,16 @@
 <html>
-&nbsp;&nbsp;&nbsp;
-<a href="download.php" target="right_window">Download</a>
-&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="documentation.php" target="right_window">Documentation</a>
-&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="http://sourceforge.net/mail/?group_id=50604" target="right_window">Mailing lists</a>
-&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="http://sourceforge.net/tracker/?atid=460329&group_id=50604&func=browse"
-   target="right_window">Bug tracking</a>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<a href="http://sourceforge.net/projects/flora/"
-  target="right_window">Project info</a>
+  <body bgcolor="#7999af">
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="download.php" target="right_window">Download</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="documentation.php" target="right_window">Documentation</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="http://sourceforge.net/mail/?group_id=50604" target="right_window">Mailing lists</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="http://sourceforge.net/tracker/?atid=460329&group_id=50604&func=browse"
+       target="right_window">Bug tracking</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="http://sourceforge.net/projects/flora/"
+       target="right_window">Project info</a>
+    </body>
 </html>

Index: index.php
===================================================================
RCS file: /cvsroot/flora/flora-website/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.php	10 Sep 2007 06:58:51 -0000	1.12
+++ index.php	7 Dec 2007 21:57:36 -0000	1.13
@@ -5,10 +5,10 @@
     representation, database, meta-data, meta-programming">
 <link rel="shortcut icon" href="images/flora.ico">
 <title> FLORA-2 </title>
-<frameset cols="20%,80%" frameborder="yes" border="1" framespacing="0"> 
+<frameset cols="20%,80%" frameborder="no" border="1" framespacing="0"> 
     <frame SRC="florabar.php" NAME="left_window" SCROLLING="auto"
            NORESIZE MARGINWIDTH="15" MARGINHEIGHT="15">
-    <frameset rows="7%,93%" frameborder="yes" border="1" framespacing="0">
+    <frameset rows="7%,93%" frameborder="no" border="1" framespacing="0">
       <frame SRC="floratop.html" NAME="top_window" SCROLLING="no"
              NORESIZE MARGINWIDTH="15" MARGINHEIGHT="15">
       <frame SRC="florahome.php" NAME="right_window"