flora-commits Mailing List for Flora-2 (Page 117)

Update of /cvsroot/flora/flora-website/images
In directory usw-pr-cvs1:/tmp/cvs-serv26939/images

Added Files:
	xsblogo.jpg sblogo.gif new.gif flora.gif 
Log Message:
moved from ../


--- NEW FILE: xsblogo.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: sblogo.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: new.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: flora.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/flora/flora-website/images
In directory usw-pr-cvs1:/tmp/cvs-serv25169/images

Log Message:
Directory /cvsroot/flora/flora-website/images added to the repository

Update of /cvsroot/flora/flora2/debugger
In directory usw-pr-cvs1:/tmp/cvs-serv30532/debugger

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:29 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,11 +1,12 @@
 # Make file for Microsoft NMAKE
 
+!include ..\.prolog_path
+
 OBJEXT = .O
 
 ALLOBJS=  flrdebugger$(OBJEXT) dynamic_data.dat static_data.dat
 
 OPTIONS=[optimize]
-PROLOG=..\..\..\config\x86-pc-windows\bin\xsb.exe
 
 .SUFFIXES:  .in .dat .P .H $(OBJEXT)
 
@@ -19,12 +20,12 @@
 	-@erase *.bak
 
 .P$(OBJEXT):
-	$(PROLOG) -e "bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
 
 static_data.dat: static_data.in
 	copy static_data.in static_data.dat
 
 dynamic_data.dat: dynamic_data.in
-	$(PROLOG) -e "bootstrap_flora. [flrwraparound]. import flrWrapAround/1 from flrwraparound. flWrapAround(%|fF). halt.
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrwraparound]. import flrWrapAround/1 from flrwraparound. flWrapAround(%|fF). halt.
 
 

Update of /cvsroot/flora/flora2/demos
In directory usw-pr-cvs1:/tmp/cvs-serv30532/demos

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/demos/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:27 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,13 +1,13 @@
 # Make file for Microsoft NMAKE
 
+!include ..\.prolog_path
+
 OBJEXT = .xwam
 
 ALLOBJS = aggregate.P benchmark.P default.P family_obj.P \
 	  family_rel.P flogic_basics.P metavar.P mix.P module1.P mod1.P \
 	  mono_inherit.P rel_ops.P tree_traversal.P
 
-PROLOG = ..\..\..\config\x86-pc-windows\bin\xsb.exe
-
 OPTIONS = [optimize]
 
 .SUFFIXES: .P .flr
@@ -16,16 +16,16 @@
 
 
 .flr.P:
-	$(PROLOG) -e "bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF). halt."
 
 
 CLEAN:
-	-@del *~
-	-@del *$(OBJEXT)
-	-@del *.P
-	-@del *.P_gpp
-	-@del *.fdb
-	-@del *.fld
-	-@del *.bak
-	-@del .#*
+	-@erase *~
+	-@erase *$(OBJEXT)
+	-@erase *.P
+	-@erase *.P_gpp
+	-@erase *.fdb
+	-@erase *.fld
+	-@erase *.bak
+	-@erase .#*
 

Update of /cvsroot/flora/flora2/docs
In directory usw-pr-cvs1:/tmp/cvs-serv30532/docs

Modified Files:
	flora2.tex 
Log Message:
fixed configuration problems under windows


Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flora2.tex	21 May 2002 23:35:03 -0000	1.4
+++ flora2.tex	27 May 2002 07:59:22 -0000	1.5
@@ -230,6 +230,7 @@
 released in-between the releases of XSB). The installation instructions are
 somewhat different in these two cases.
 
+\paragraph{Installting \FLORA under UNIX.}
 To configure a version of \FLORA that was downloaded as part of the
 distribution of XSB, simply configure XSB as usual:
 %%
@@ -246,12 +247,13 @@
 %%
 \begin{verbatim}
  cd packages/flora2
+ makeflora clean
  makeflora
 \end{verbatim}
 %%
 
 To install the bleeding edge version of \FLORA from {\tt
-http://flora.sourceforge.net} you must downloaded it (either as a tarball
+http://flora.sourceforge.net} you must download it (either as a tarball
 or from CVS) into a separate directory \emph{outside} of the XSB
 installation tree. After unpacking (or checking out from CVS) the \FLORA
 sources will be placed in the subdirectory called {\tt flora2}. To
@@ -259,13 +261,13 @@
 %%
 \begin{verbatim}
  cd flora2
- make clean
+ makeflora clean
  makeflora
 \end{verbatim}
 %%
 (assuming that XSB has been already installed and configured separately).
 If an XSB executable is not on your program search {\tt PATH}, then you
-might need to provide the XSB installation directory to {\tt makeflora} as
+need to provide the XSB installation directory to {\tt makeflora} as
 an argument, {\it e.g.},
 %%
 \begin{verbatim}
@@ -273,16 +275,20 @@
 \end{verbatim}
 %%
 
-To build \FLORA in Windows, you need Microsoft's {\tt nmake} or
-compatible installed. Then use the following two commands to configure
+\paragraph{Installing \FLORA in Windows.}
+First, you need Microsoft's {\tt nmake}.
+Then use the following commands to configure
 \FLORA (assuming that XSB is installed and configured):
 %%
 \begin{verbatim}
    cd flora2
-   nmake clean
-   nmake /f NMakefile.mak
+   makeflora clean
+   makeflora path-to-prolog-executable
 \end{verbatim}
 %%
+
+
+\paragraph{Running \FLORA.}
 \FLORA is fully integrated into the underlying Prolog engine, including its
 module system. In particular, \FLORA modules can invoke predicates defined in
 other Prolog modules, and Prolog modules can query the objects defined in
@@ -335,7 +341,7 @@
 or even
 %%
 \begin{verbatim}
- foo>~~xsb -e "[flora2]. flora_shell."
+ foo>  xsb -e "[flora2]. flora_shell."
 \end{verbatim}
 %%
 
@@ -365,8 +371,8 @@
 For instance, 
 %%
 \begin{verbatim}
- foo>~~flora2 -e "flHelp."
- foo>~~runflora -e "flHelp."
+ foo>  flora2 -e "flHelp."
+ foo>  runflora -e "flHelp."
 \end{verbatim}
 %%
 will cause the system to execute the help command right after after the

Update of /cvsroot/flora/flora2/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30532/lib

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/lib/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -4,7 +4,7 @@
 
 ALLOBJS = flrprettyprint.P flrio.P flrstorage.P flrsystem.P
 
-XSB = ..\..\..\config\x86-pc-windows\bin\xsb.exe
+!include ..\.prolog_path
 
 OPTIONS = [optimize]
 
@@ -14,14 +14,14 @@
 
 
 .flr.P:
-	$(XSB) -e "bootstrap_flora. import flora_compile_system_module/1 from flrutils. flora_compile_system_module(%|fF). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. import flora_compile_system_module/1 from flrutils. flora_compile_system_module(%|fF). halt."
 
 
 CLEAN:
-	-@del *~
-	-@del *$(OBJEXT)
-	-@del *.P
-	-@del *.fdb
-	-@del *.fld
-	-@del *.bak
-	-@del .#*
+	-@erase *~
+	-@erase *$(OBJEXT)
+	-@erase *.P
+	-@erase *.fdb
+	-@erase *.fld
+	-@erase *.bak
+	-@erase .#*

Update of /cvsroot/flora/flora2/emacs
In directory usw-pr-cvs1:/tmp/cvs-serv30532/emacs

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/emacs/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,8 +1,9 @@
 # Make file for prolog2hilog.dll
 
-XSBDIR = ..\..\..
 MYPROGRAM = prolog2hilog
 
+!include ..\.prolog_path
+
 
 CPP = cl.exe
 OUTDIR = .
@@ -17,8 +18,8 @@
 	-@erase *.bak
 
 
-CPP_PROJ = /nologo /MT /W3 /GX /O2 /I "$(XSBDIR)\config\x86-pc-windows" \
-		 /I "$(XSBDIR)\emu" /I "$(XSBDIR)\prolog_includes" \
+CPP_PROJ = /nologo /MT /W3 /GX /O2 /I "$(PROLOGDIR)\config\x86-pc-windows" \
+		 /I "$(PROLOGDIR)\emu" /I "$(PROLOGDIR)\prolog_includes" \
 		 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" \
 		 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /c 
 	
@@ -33,7 +34,7 @@
 		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
 		odbc32.lib odbccp32.lib xsb.lib /nologo /dll \
 		/machine:I386 /out:"$(OUTDIR)\$(MYPROGRAM).dll" \
-		/libpath:"$(XSBDIR)\config\x86-pc-windows\bin" 
+		/libpath:"$(PROLOGDIR)\config\x86-pc-windows\bin" 
 LINK32_OBJS =  "$(INTDIR)\$(MYPROGRAM).obj"
 
 "$(OUTDIR)\$(MYPROGRAM).dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

Update of /cvsroot/flora/flora2
In directory usw-pr-cvs1:/tmp/cvs-serv30532

Modified Files:
	flrconfig.P NMakefile.mak Makefile .cvsignore 
Added Files:
	makeflora.bat 
Log Message:
fixed configuration problems under windows


--- NEW FILE: makeflora.bat ---
@echo off

REM  Arg 1 is a path to prolog or `clean'
REM  In the latter case, cleans the distribution

@set PROLOG=%1

@echo.
if "%PROLOG%" == "" echo Usage:  makeflora full-path-to-prolog
if "%PROLOG%" == "" goto end

if "%PROLOG%" == "clean" nmake /f NMakefile.mak clean
if "%PROLOG%" == "clean" goto end

if not exist .prolog_path  echo. > .prolog_path
if not exist .flora_path   echo. > .flora_path

REM  Generate the files that contain the Prolog & Flora installation directories
REM  Generates runflora.bat file that can be used to run flora

if exist runflora.bat  del runflora.bat
call %PROLOG% -e "[flrconfig]. halt."

nmake /f NMakefile.mak

:end
@echo.

REM Local Variables:
REM coding-system-for-write:  iso-2022-7bit-dos
REM End:

Index: flrconfig.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrconfig.P,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrconfig.P	21 May 2002 23:35:03 -0000	1.2
+++ flrconfig.P	27 May 2002 07:59:22 -0000	1.3
@@ -2,22 +2,38 @@
 %% Records Prolog and Flora installation directories
 
 :- import path_sysop/3 from file_io.
-:- import xsb_configuration/2 from xsb_configuration.
+:- import
+	xsb_configuration/2,
+	windows_os/0
+   from xsb_configuration.
 
 ?- path_sysop(expand,'.',FloraDir),
-   xsb_configuration(config_bindir,InstallDir),
+   xsb_configuration(install_dir,InstallDir),
+   xsb_configuration(config_bindir,ConfigBinDir),
    telling(F),
    tell('.prolog_path'),
-   writeln(InstallDir),
+   (windows_os
+   -> write('PROLOG = '), write(ConfigBinDir), writeln('\xsb'),
+      write('PROLOGDIR = '), writeln(InstallDir)
+   ;
+      writeln(ConfigBinDir)
+   ),
    told,
    tell('.flora_path'),
-   write('#define FLORA_INSTALL_DIR  '),
-   writeq(FloraDir), nl,
+   write('#define FLORA_INSTALL_DIR  '), writeq(FloraDir), nl,
    told,
-   tell('runflora'),
-   writeln('#! /bin/sh'),
-   write('FLORADIR="'), writeq(FloraDir), write('"'), nl,
-   write('PROLOG='), write(InstallDir), writeln('/xsb'),
-   writeln('$PROLOG -e "asserta(library_directory($FLORADIR)). [flora2devel]. flora_shell." $*'),
+   (windows_os
+   -> tell('runflora.bat'),
+      writeln('@echo OFF'),
+      write('@set FLORADIR="'), writeq(FloraDir), write('"'), nl,
+      write('@set PROLOG='), write(ConfigBinDir), writeln('\xsb'),
+      writeln('@%PROLOG% -e "asserta(library_directory(%FLORADIR%)). [flora2devel]. flora_shell." %1 %2 %3 %4 %5 %6 %7')
+   ;
+      tell('runflora'),
+      writeln('#! /bin/sh'),
+      write('FLORADIR="'), writeq(FloraDir), write('"'), nl,
+      write('PROLOG='), write(ConfigBinDir), writeln('/xsb'),
+      writeln('$PROLOG -e "asserta(library_directory($FLORADIR)). [flora2devel]. flora_shell." $*')
+   ),
    told,
    tell(F).

Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:26 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:23 -0000	1.2
@@ -1,28 +1,59 @@
-# Make file for Microsoft NMAKE
+## File:      flora2/NMakefile.mak -- Make file for Microsoft NMAKE
+##
+## Author(s): Michael Kifer
+##
+## Contact:   flo...@li...
+## 
+## Copyright (C) The Research Foundation of SUNY, 1999-2002
+## 
+## FLORA-2 is free software; you can redistribute it and/or modify it under the
+## terms of the GNU Library General Public License as published by the Free
+## Software Foundation; either version 2 of the License, or (at your option)
+## any later version.
+## 
+## FLORA-2 is distributed in the hope that it will be useful, but WITHOUT ANY
+## WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU Library General Public License for
+## more details.
+## 
+## You should have received a copy of the GNU Library General Public License
+## along with FLORA-2; if not, write to the Free Software Foundation,
+## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## $Id$
+## 
+##
 
 OBJEXT = .xwam
 
-ALLOBJS =  flroperator$(OBJEXT) \
-	   flrnodefp$(OBJEXT) \
-	   flrnowsp$(OBJEXT) \
-	   flrarguments$(OBJEXT) \
-	   flrprolog$(OBJEXT) \
-	   flrfirstorder$(OBJEXT) \
-	   flrprint$(OBJEXT) \
-	   flrlibman$(OBJEXT) \
-	   flrlexer$(OBJEXT) \
-	   flrcomposer$(OBJEXT) \
-	   flrparser$(OBJEXT) \
-	   flrcompiler$(OBJEXT) \
-	   flrcoder$(OBJEXT) \
-	   flrutils$(OBJEXT) \
-	   flrwrapper$(OBJEXT) \
-	   flrwraparound$(OBJEXT) \
-	   flrundefhook$(OBJEXT) \
-	   flrshell$(OBJEXT)
+ALLOBJS = flrarguments$(OBJEXT) \
+	  flrcomposer$(OBJEXT) \
+	  flrcompiler$(OBJEXT) \
+	  flrcoder$(OBJEXT) \
+	  flrdependency$(OBJEXT) \
+	  flora2devel$(OBJEXT) \
+	  flrfirstorder$(OBJEXT) \
+	  flrlexer$(OBJEXT) \
+	  flrlibman$(OBJEXT) \
+	  flrnodefp$(OBJEXT) \
+	  flrnowsp$(OBJEXT) \
+	  flroperator$(OBJEXT) \
+	  flrparser$(OBJEXT) \
+	  flrporting$(OBJEXT) \
+	  flrprettyprint$(OBJEXT) \
+	  flrprint$(OBJEXT) \
+	  flrprolog$(OBJEXT) \
+	  flrregistry$(OBJEXT) \
+	  flrshell$(OBJEXT) \
+	  flrundefined$(OBJEXT) \
+	  flrundefhook$(OBJEXT) \
+	  flrutils$(OBJEXT) \
+	  flrwraparound$(OBJEXT) \
+	  flrwrapper$(OBJEXT)
 
 OPTIONS = [optimize]
-PROLOG = ..\..\config\x86-pc-windows\bin\xsb.exe
+
+!include .prolog_path
 
 .SUFFIXES: .P $(OBJEXT)
 
@@ -77,6 +108,6 @@
 
 
 .P$(OBJEXT):
-	$(PROLOG) -e "bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
+	$(PROLOG) -e "[flora2devel]. import bootstrap_flora/0 from flora2. bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
 
 

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	18 May 2002 21:01:25 -0000	1.2
+++ Makefile	27 May 2002 07:59:23 -0000	1.3
@@ -29,30 +29,30 @@
 
 FLORADIR = .
 
-ALLOBJS = flroperator${OBJEXT} \
-	  flrnodefp${OBJEXT} \
-	  flrnowsp${OBJEXT} \
-	  flrarguments${OBJEXT} \
-	  flrprolog${OBJEXT} \
-	  flrfirstorder${OBJEXT} \
-	  flrprint${OBJEXT} \
-	  flrlibman${OBJEXT} \
-	  flrlexer${OBJEXT} \
+ALLOBJS = flrarguments${OBJEXT} \
 	  flrcomposer${OBJEXT} \
-          flrparser${OBJEXT} \
 	  flrcompiler${OBJEXT} \
-	  flrdependency${OBJEXT} \
 	  flrcoder${OBJEXT} \
-	  flrundefined${OBJEXT} \
-	  flrutils${OBJEXT} \
-	  flrwrapper${OBJEXT} \
-	  flrwraparound${OBJEXT} \
-	  flrprettyprint${OBJEXT} \
-	  flrundefhook${OBJEXT} \
+	  flrdependency${OBJEXT} \
+	  flora2devel${OBJEXT} \
+	  flrfirstorder${OBJEXT} \
+	  flrlexer${OBJEXT} \
+	  flrlibman${OBJEXT} \
+	  flrnodefp${OBJEXT} \
+	  flrnowsp${OBJEXT} \
+	  flroperator${OBJEXT} \
+          flrparser${OBJEXT} \
 	  flrporting${OBJEXT} \
+	  flrprettyprint${OBJEXT} \
+	  flrprint${OBJEXT} \
+	  flrprolog${OBJEXT} \
 	  flrregistry${OBJEXT} \
 	  flrshell${OBJEXT} \
-	  flora2devel${OBJEXT}
+	  flrundefined${OBJEXT} \
+	  flrundefhook${OBJEXT} \
+	  flrutils${OBJEXT} \
+	  flrwraparound${OBJEXT} \
+	  flrwrapper${OBJEXT}
 
 
 FLORA_CHAR_DEFS = $(FLORADIR)/flrincludes/flora_characters.flh
@@ -226,14 +226,16 @@
 	cd trailer; $(MAKE) clean
 	cd pkgs; $(MAKE) clean
 	cd demos; $(MAKE) clean
-	cd docs; $(MAKE) clean
-	cd emacs; $(MAKE) clean
 	/bin/rm -f headerinc/*~ headerinc/.*~
 	/bin/rm -f syslibinc/*~ syslibinc/.*~
 	/bin/rm -f libinc/*~ libinc/.*~
 	/bin/rm -f includes/*~ includes/.*~
 	/bin/rm -f flrincludes/*~ flrincludes/.*~
 	/bin/rm -f $(HOME)/.xsb/flora/*.P $(HOME)/.xsb/flora/*${OBJEXT}
+
+veryclean: clean
+	cd docs; $(MAKE) clean
+	cd emacs; $(MAKE) clean
 
 
 .DONE:

Index: .cvsignore
===================================================================
RCS file: /cvsroot/flora/flora2/.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:25 -0000	1.1.1.1
+++ .cvsignore	27 May 2002 07:59:23 -0000	1.2
@@ -5,3 +5,4 @@
 .prolog_path
 .flora_path
 runflora
+runflora.bat

Update of /cvsroot/flora/flora2/closure
In directory usw-pr-cvs1:/tmp/cvs-serv30532/closure

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/closure/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:27 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -5,7 +5,7 @@
 	  flreqltrailer.flh \
           flrscalareql.flh
 
-PROLOG_COMMAND = ..\..\..\config\x86-pc-windows\bin\xsb.exe
+!include ..\.prolog_path
 
 .SUFFIXES: .flh .fli
 
@@ -19,5 +19,5 @@
 	-@erase includes\*~
 
 .fli.flh:
-	$(PROLOG_COMMAND) -e "bootstrap_flora. [flrutils]. import flCompileInclude/1 from flrutils. flCompileInclude(%|fF). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrutils]. import flCompileInclude/1 from flrutils. flCompileInclude(%|fF). halt."
 

Update of /cvsroot/flora/flora2/genincludes
In directory usw-pr-cvs1:/tmp/cvs-serv30532/genincludes

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/genincludes/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,9 +1,9 @@
 # Make file for Microsoft NMAKE
 
 
-ALLOBJS = flrpatch.flh
+ALLOBJS = flrpatch.flh flrpreddef.flh flrindex_P.flh
 
-XSB = ..\..\..\config\x86-pc-windows\bin\xsb.exe
+!include ..\.prolog_path
 
 .SUFFIXES: .fli .flh
 
@@ -15,7 +15,13 @@
 	-@erase *.flh
 	-@erase *.bak
 
+flrpreddef.flh:
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrwraparound]. flWrapAround(flrpreddef). halt."
+
+flrindex_P.flh:
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrwraparound]. flWrapAround(flrindex_P). halt."
+
 
 .fli.flh:
-	$(XSB) -e "bootstrap_flora. [flrutils]. import flCompileInclude/1 from flrutils. flCompileInclude(%|fF). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrutils]. import flCompileInclude/1 from flrutils. flCompileInclude(%|fF). halt."
 

Update of /cvsroot/flora/flora2/trailer
In directory usw-pr-cvs1:/tmp/cvs-serv30532/trailer

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/trailer/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:21 -0000	1.2
@@ -1,14 +1,15 @@
 # Make file for Microsoft NMAKE
 
+!include ..\.prolog_path
+
 OBJEXT = .O
 
 OPTIONS = [optimize]
-XSB = ..\..\..\config\x86-pc-windows\bin\xsb.exe
 
 .SUFFIXES: .P .O
 
 ALL:: 
-	$(XSB) -e "bootstrap_flora. [flrutils]. import flsetuptrailer/1, flsetuppatch/0 from flrutils. flsetuptrailer(none). flsetuptrailer(basic). flsetuptrailer(flogic). flsetuppatch. halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. [flrutils]. import flsetuptrailer/1, flsetuppatch/0 from flrutils. flsetuptrailer(none). flsetuptrailer(basic). flsetuptrailer(flogic). flsetuppatch. halt."
 
 CLEAN :
 	-@erase *~

Update of /cvsroot/flora/flora2/syslib
In directory usw-pr-cvs1:/tmp/cvs-serv30532/syslib

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:21 -0000	1.2
@@ -1,5 +1,7 @@
 # Make file for Microsoft NMAKE
 
+!include ..\.prolog_path
+
 OBJEXT = .xwam
 
 ALLOBJS =  flranswer$(OBJEXT) \
@@ -23,7 +25,6 @@
 	   flrexpunge$(OBJEXT)
 
 OPTIONS = [optimize]
-XSB = ..\..\..\config\x86-pc-windows\bin\xsb.exe
 
 .SUFFIXES: .P $(OBJEXT)
 
@@ -37,6 +38,6 @@
 
 
 .P$(OBJEXT):
-	$(XSB) -e "bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora,mc(%|fF,$(OPTIONS)). halt."
 
 

Update of /cvsroot/flora/flora2/pkgs
In directory usw-pr-cvs1:/tmp/cvs-serv30532/pkgs

Modified Files:
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/pkgs/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,11 +1,11 @@
 # Make file for Microsoft NMAKE
 
+!include ..\.prolog_path
+
 OBJEXT = .xwam
 
 ALLOBJS =
 
-XSB=..\..\..\config\x86-pc-windows\bin\xsb.exe
-
 OPTIONS=[optimize]
 
 .SUFFIXES: .P .flr
@@ -14,14 +14,14 @@
 
 
 .flr.P:
-	$(XSB) -e "bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF)."
+	$(PROLOG) -e "['..\flora2devel']. import bootstrap_flora/0 from flora2. bootstrap_flora. import (flCompile)/1 from flora2. flCompile(%|fF)."
 
 
 CLEAN:
-	-@del *~
-	-@del *$(OBJEXT)
-	-@del *.P
-	-@del *.fdb
-	-@del *.fld
-	-@del *.bak
-	-@del .#*
+	-@erase *~
+	-@erase *$(OBJEXT)
+	-@erase *.P
+	-@erase *.fdb
+	-@erase *.fld
+	-@erase *.bak
+	-@erase .#*

Update of /cvsroot/flora/flora2/p2h
In directory usw-pr-cvs1:/tmp/cvs-serv30532/p2h

Modified Files:
	prolog2hilog.lib prolog2hilog.exp prolog2hilog.dll 
	NMakefile.mak 
Log Message:
fixed configuration problems under windows


Index: prolog2hilog.lib
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/prolog2hilog.lib,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsJ35eEu and /tmp/cvsyx0t1O differ

Index: prolog2hilog.exp
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/prolog2hilog.exp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs6d6V9v and /tmp/cvsAtfOcS differ

Index: prolog2hilog.dll
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/prolog2hilog.dll,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvslXLnsv and /tmp/cvsWrNWGQ differ

Index: NMakefile.mak
===================================================================
RCS file: /cvsroot/flora/flora2/p2h/NMakefile.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NMakefile.mak	18 May 2002 17:43:28 -0000	1.1.1.1
+++ NMakefile.mak	27 May 2002 07:59:22 -0000	1.2
@@ -1,7 +1,8 @@
 # Make file for prolog2hilog.dll
 
 
-XSBDIR = ..\..\..
+!include ..\.prolog_path
+
 MYPROGRAM = prolog2hilog
 
 
@@ -20,8 +21,8 @@
 	-@erase *.bak
 
 
-CPP_PROJ = /nologo /MT /W3 /GX /O2 /I "$(XSBDIR)\config\x86-pc-windows" \
-		 /I "$(XSBDIR)\emu" /I "$(XSBDIR)\prolog_includes" \
+CPP_PROJ = /nologo /MT /W3 /GX /O2 /I "$(PROLOGDIR)\config\x86-pc-windows" \
+		 /I "$(PROLOGDIR)\emu" /I "$(PROLOGDIR)\prolog_includes" \
 		 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" \
 		 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /c 
 	
@@ -36,7 +37,7 @@
 		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
 		odbc32.lib odbccp32.lib xsb.lib /nologo /dll \
 		/machine:I386 /out:"$(OUTDIR)\$(MYPROGRAM).dll" \
-		/libpath:"$(XSBDIR)\config\x86-pc-windows\bin" 
+		/libpath:"$(PROLOGDIR)\config\x86-pc-windows\bin" 
 LINK32_OBJS =  "$(INTDIR)\$(MYPROGRAM).obj"
 
 "$(OUTDIR)\$(MYPROGRAM).dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

Update of /cvsroot/flora/flora-website
In directory usw-pr-cvs1:/tmp/cvs-serv29668

Modified Files:
	installation.html download.php 
Log Message:
windows instructions


Index: installation.html
===================================================================
RCS file: /cvsroot/flora/flora-website/installation.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- installation.html	21 May 2002 06:24:45 -0000	1.2
+++ installation.html	27 May 2002 07:57:20 -0000	1.3
@@ -13,13 +13,17 @@
   have to download it into a separate directory, which is <EM>outside</EM> of
   the XSB directory tree, e.g., <tt>~/bleeding-edge-flora</tt>.
   After unpacking (or checking out from CVS) the FLORA-2
-  sources will be placed in the subdirectory called <tt>flora2</tt>. To
-  configure FLORA-2, do the following:
+  sources will be placed in the subdirectory called <tt>flora2</tt>.
+</p>
+
+<h3>To configure FLORA-2 under UNIX:</h3>
+<p>
+  Execute the following commands:
 </p>
 
 <pre>
  cd ~/bleeding-edge-flora/flora2
- make clean
+ makeflora clean
  makeflora
 </pre>
 
@@ -35,17 +39,28 @@
 </pre>
 
 <p>
-To build FLORA-2 in Windows, you need Microsoft's <tt>nmake</tt> or
-compatible installed. Then use the following commands to configure
-FLORA-2 (assuming that XSB is installed and configured and FLORA is installed
-in D:\bleeding-edge-flora\flora2):
+  If everything went well, you can run FLORA-2 by typing
+  ~/bleeding-edge-flora/flora2/runflora
+</p>
+
+<h3>To configure FLORA-2 under Windows:</h3>
+<p>
+You need Microsoft's <tt>nmake</tt> installed. Then use the following commands
+to configure FLORA-2 (assuming that XSB is installed and configured, its
+executable is in D:\XSB\bin\xsb.bat, and FLORA is installed in
+D:\bleeding-edge-flora\flora2): 
 </p>
 
 <pre>
    cd D:\bleeding-edge-flora\flora2
-   nmake clean
-   nmake /f NMakefile.mak
+   makeflora  clean
+   makeflora  D:\XSB\bin\xsb.bat
 </pre>
+
+<p>
+  You can then run FLORA-2 using the command
+  D:\bleeding-edge-flora\flora2\runflora
+</p>
 
 
 

Index: download.php
===================================================================
RCS file: /cvsroot/flora/flora-website/download.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- download.php	22 May 2002 03:40:27 -0000	1.3
+++ download.php	27 May 2002 07:57:20 -0000	1.4
@@ -39,6 +39,14 @@
   instructions</a>.
 </p>
 <p>
+  <b>Note:</b>XSB 2.5 has a bug, which precludes running external programs
+  under Windows. If you are working under Windows, please download the file
+  <a
+  href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/xsb/XSB/emu/dynwin32_xsb_i.h">http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/xsb/XSB/emu/dynwin32_xsb_i.h</a>
+  from the XSB CVS repository, use it instead of the file emu\dynwin32_xsb_i.h
+  that you currently have, and recompile XSB before configuring FLORA-2.
+</p>
+<p>
   Please take a look at the <a href="release_notes.html#interim"
   target="new_window">release notes</a> for the list of changes, bug fixes, and
   incompatibilities.

Update of /cvsroot/flora/flora2/debugger
In directory usw-pr-cvs1:/tmp/cvs-serv16496/debugger

Modified Files:
	flrdebugger.P 
Log Message:
fixed display of control constructs


Index: flrdebugger.P
===================================================================
RCS file: /cvsroot/flora/flora2/debugger/flrdebugger.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrdebugger.P	18 May 2002 17:43:29 -0000	1.1.1.1
+++ flrdebugger.P	25 May 2002 21:53:31 -0000	1.2
@@ -228,27 +228,31 @@
 	flora_write_goal(Handler),
 	print_item(')').
 
-flora_write_goal(FL_IF(IfCall)) :-
+flora_write_goal(FLLIBIFTHENELSE(Cond,Then,Else)) :-
 	!,
-	flora_print_if_statement(IfCall).
+	flora_print_if_statement(Cond,Then,Else).
 
-flora_write_goal(FL_UNLESS(FL_DO(Cond,Action))) :-
+flora_write_goal(FLLIBIFTHEN(Cond,Then)) :-
+	!,
+	flora_print_if_statement(Cond,Then).
+
+flora_write_goal(FLLIBUNLESSDO(Cond,Action)) :-
 	!,
 	flora_print_unless(Cond,Action).
 
-flora_write_goal(FL_WHILE(FL_DO(Cond,Action))) :-
+flora_write_goal(FLLIBWHILEDO(Cond,Action)) :-
 	!,
 	flora_print_while('DO',Cond,Action).
 
-flora_write_goal(FL_WHILE(FL_LOOP(Cond,Action))) :-
+flora_write_goal(FLLIBWHILELOOP(Cond,Action)) :-
 	!,
 	flora_print_while('LOOP',Cond,Action).
 
-flora_write_goal(FL_DO(FL_UNTIL(Action,Cond))) :-
+flora_write_goal(FLLIBDOUNTIL(Action,Cond)) :-
 	!,
 	flora_print_until('DO',Action,Cond).
 
-flora_write_goal(FL_LOOP(FL_UNTIL(Action,Cond))) :-
+flora_write_goal(FLLIBLOOPUNTIL(Action,Cond)) :-
 	!,
 	flora_print_until('LOOP',Action,Cond).
 
@@ -437,24 +441,20 @@
 
 %%%%%%%%%%%%%%%%%%%%%% IF %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-flora_print_if_statement(FL_THEN(Cond,Action)) :-
-	!,
+flora_print_if_statement(Cond,Then) :-
 	print_item('IF ('),
 	flora_write_goal(Cond),
-	write_if_body(Action).
-flora_print_if_statement(_) :-
-	abort('Ill-formed IF statement').
-
-write_if_body(FL_ELSE(Then,Else)) :-
-	!,
 	print_item(') THEN ('),
 	flora_write_goal(Then),
-	print_item(') ELSE ('),
-	flora_write_goal(Else),
 	print_item(')').
-write_if_body(Then) :-
+
+flora_print_if_statement(Cond,Then,Else) :-
+	print_item('IF ('),
+	flora_write_goal(Cond),
 	print_item(') THEN ('),
 	flora_write_goal(Then),
+	print_item(') ELSE ('),
+	flora_write_goal(Else),
 	print_item(')').
 
 %%%%%%%%%%%%%%%%%%%%%% UNLESS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Update of /cvsroot/flora/flora2
In directory usw-pr-cvs1:/tmp/cvs-serv32740

Modified Files:
	flrcompiler.P flrcompiler.H 
Log Message:
better error reporting when trying to override an active module


Index: flrcompiler.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.P,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flrcompiler.P	25 May 2002 07:20:41 -0000	1.3
+++ flrcompiler.P	25 May 2002 18:08:19 -0000	1.4
@@ -1756,12 +1756,21 @@
 	compile_fllist(L,T,I,ObjList,_OidCode,OCode,Status),
 	( Status == [] ->
 	    thismodule_struct(Mod),
-            flora_get_counter(RULE_NUM, Rule_num), 
 	    %% This is the file being compiled
 	    (flora_compiler_environment(file,ProgramFile), !
 	    ; ProgramFile=userin
 	    ),
-	    florasyslib_struct(FLLIBLOAD,4,[ObjList,ProgramFile,Mod,Rule_num],LCode),
+	    %% "I" is a token index
+	    flora_nth_token(I,Token),
+	    flora_token_text(Token,_TextStr,BLN,BCN,_ELN,_ECN),
+	    %% Encode location of the literal [file>>mod]
+	    %% Location is used for error checking in flrload.P to make sure
+	    %% that loading of a file doesn't override the program
+	    %% in which the loading statement occurs
+	    list_struct([BLN,BCN],[],PositionCode),
+	    florasyslib_struct(FLLIBLOAD,
+			       4,
+			       [ObjList,ProgramFile,Mod,PositionCode],LCode),
 	    conjunct_code([OCode,LCode],Code)
 	;
 	  true

Index: flrcompiler.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.H,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrcompiler.H	25 May 2002 07:20:41 -0000	1.2
+++ flrcompiler.H	25 May 2002 18:08:19 -0000	1.3
@@ -54,6 +54,14 @@
 	flora_define_flogicstatic/2
    from flrfirstorder.
 
+:- import
+	flora_token_text/6
+    from flrlexer.
+
+:- import
+	flora_nth_token/2
+   from flrcomposer.
+
 :- import 
 	flora_is_dynamic_flogic_base/2
    from flrwrapper.

Update of /cvsroot/flora/flora2/syslib
In directory usw-pr-cvs1:/tmp/cvs-serv32740/syslib

Modified Files:
	flrload.P 
Log Message:
better error reporting when trying to override an active module


Index: flrload.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrload.P,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- flrload.P	25 May 2002 07:20:40 -0000	1.3
+++ flrload.P	25 May 2002 18:08:19 -0000	1.4
@@ -55,28 +55,30 @@
 /********************************************************************/
 fllibload([],_HostFile,_HostMod,_Rulenum) :- !.
 
-fllibload([T|L],HostFile,HostMod,RuleNum) :-
+fllibload([T|L],HostFile,HostMod,Location) :-
 	!,
-	flora_load_file(T,HostFile,HostMod,RuleNum),
-	fllibload(L,HostFile,HostMod,RuleNum).
+	flora_load_file(T,HostFile,HostMod,Location),
+	fllibload(L,HostFile,HostMod,Location).
 
 
 /*********************************************************************
-  flora_load_file(+FileName,+HostFile,+HostMod,+RuleNum)
-  flora_load_file(FL_RIGHTTO(+FileName,+Workspace),+HostFile,+HostMod,+RuleNum)
+  flora_load_file(+FileName,+HostFile,+HostMod,+Location)
+  flora_load_file(FL_RIGHTTO(+FileName,+Workspace),+HostFile,+HostMod,+Location)
 
   Filename: file being loaded
   Workspace: module into which it is loaded
   HostFile: program file from which this call was made
   HostMod: module into which host program was loaded
+  Location: of the form [Line,Char] indicates the line and char
+            where the loading literal occurs in the program
 
   Note: Runtime checking of file and workspace names is needed, since
         the load list can be constructed at runtime.
 *********************************************************************/
-flora_load_file(T,HostFile,HostMod,RuleNum) :-
+flora_load_file(T,HostFile,HostMod,Location) :-
 	atom(T),
 	!,
-	flora_check__module_overriding(T,FLORA_DEFAULT_WORKSPACE,HostFile,HostMod,RuleNum),
+	flora_check__module_overriding(T,FLORA_DEFAULT_WORKSPACE,HostFile,HostMod,Location),
 	flora_load_module_internal(T).
 
 flora_load_file(T,_,_,_) :-
@@ -86,9 +88,9 @@
 	flora_error_line('file name unbound at time of loading'),
 	fail.
 
-flora_load_file(FL_RIGHTTO(FileName,Workspace),HostFile,HostMod,RuleNum) :-
+flora_load_file(FL_RIGHTTO(FileName,Workspace),HostFile,HostMod,Location) :-
 	!,
-	flora_check__module_overriding(FileName,Workspace,HostFile,HostMod,RuleNum),
+	flora_check__module_overriding(FileName,Workspace,HostFile,HostMod,Location),
 	( atom(FileName) ->
 	    ( atom(Workspace) ->
 		flora_load_module_internal(FileName,Workspace)
@@ -126,17 +128,16 @@
 	!,
 	fail.
 
-flora_check__module_overriding(_LoadFile,_Workspace,userin,main,_RuleNum) :-
+flora_check__module_overriding(_LoadFile,_Workspace,userin,main,_Location) :-
 	!.
 
-flora_check__module_overriding(LoadFile,Workspace,HostFile,HostMod,RuleNum) :-
+flora_check__module_overriding(LoadFile,Workspace,HostFile,HostMod,[Line,Char]) :-
 	HostMod == Workspace,
 	!,
 	flora_stderr_nl,
-	RealRuleNum is RuleNum - 1,
 	flora_file_op(basename,HostFile,HostFileBasename),
-	flora_error_line('~w.flr: Statement [~w >> ~w] in rule ~w overrides the program in which it occurs',
-			 [HostFileBasename,LoadFile,HostMod,RealRuleNum]),
+	flora_error_line('~w.flr: Literal [~w >> ~w] near line(~w)/char(~w) overrides the program in which it occurs',
+			 [HostFileBasename,LoadFile,HostMod,Line,Char]),
 	fail.
 
-flora_check__module_overriding(_LoadFile,_Workspace,_HostFile,_HostMod,_RuleNum).
+flora_check__module_overriding(_LoadFile,_Workspace,_HostFile,_HostMod,_Location).

Update of /cvsroot/flora/flora2
In directory usw-pr-cvs1:/tmp/cvs-serv13486

Modified Files:
	flrutils.P flrutils.H flrcompiler.P flrcompiler.H 
Log Message:
better run-time checks to see if a load-file statement
overrides the module into which it is loaded


Index: flrutils.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrutils.P	18 May 2002 17:43:26 -0000	1.1.1.1
+++ flrutils.P	25 May 2002 07:20:41 -0000	1.2
@@ -823,6 +823,8 @@
 	flora_reset_firstorder,
 	flora_reset_compiler,
 	flora_set_counter(flora_shell_mode,0),
+	retractall(flora_compiler_environment(_,_)),
+	assert(flora_compiler_environment(file,FullFileName)),
 	!.
 
 
@@ -833,7 +835,9 @@
 	flora_reset_lexer,
 	flora_reset_composer,
 	flora_reset_compiler,
-	flora_set_counter(flora_shell_mode,1).
+	flora_set_counter(flora_shell_mode,1),
+	retractall(flora_compiler_environment(_,_)),
+	assert(flora_compiler_environment(file,userin)).
 
 
 /*************************************************************************

Index: flrutils.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrutils.H,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrutils.H	18 May 2002 17:43:26 -0000	1.1.1.1
+++ flrutils.H	25 May 2002 07:20:41 -0000	1.2
@@ -162,6 +162,8 @@
 :- dynamic flora_maxerr(_).
 :- index(flora_maxerr/1,trie).
 
+:- dynamic flora_compiler_environment(_,_).
+
 :- export
 	flMaxerr/1,
 	flHalt/0,
@@ -198,6 +200,8 @@
 	flora_reclaim_storage_space/0,
 	flora_commit_storage/0,
 	flora_load_dyn_data/3,
+
+	flora_compiler_environment/2,
 
 	flora_read_canonical_and_insert/2,
 	flora_compile_system_module_by_ID/1,

Index: flrcompiler.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.P,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrcompiler.P	25 May 2002 03:10:33 -0000	1.2
+++ flrcompiler.P	25 May 2002 07:20:41 -0000	1.3
@@ -652,6 +652,12 @@
 	newoid_struct(Name,Index,OidObject).
 
 
+/****************************************************************************
+  reset_rulenum
+
+****************************************************************************/
+reset_rulenum :- flora_set_counter(RULE_NUM,1).
+
 
 /****************************************************************************
   allvars(+CompilerTerm,-Vars)
@@ -971,6 +977,7 @@
 ****************************************************************************/
 flora_reset_compiler :-
 	reset_newpredicate,
+	reset_rulenum,
 	reset_newoid.
 
 
@@ -1750,7 +1757,11 @@
 	( Status == [] ->
 	    thismodule_struct(Mod),
             flora_get_counter(RULE_NUM, Rule_num), 
-	    florasyslib_struct(FLLIBLOAD,3,[ObjList,Mod,Rule_num],LCode),
+	    %% This is the file being compiled
+	    (flora_compiler_environment(file,ProgramFile), !
+	    ; ProgramFile=userin
+	    ),
+	    florasyslib_struct(FLLIBLOAD,4,[ObjList,ProgramFile,Mod,Rule_num],LCode),
 	    conjunct_code([OCode,LCode],Code)
 	;
 	  true

Index: flrcompiler.H
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.H,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrcompiler.H	18 May 2002 17:43:26 -0000	1.1.1.1
+++ flrcompiler.H	25 May 2002 07:20:41 -0000	1.2
@@ -58,6 +58,10 @@
 	flora_is_dynamic_flogic_base/2
    from flrwrapper.
 
+:- import
+	flora_compiler_environment/2
+   from flrutils.
+
 :- export 
 	flora_reset_compiler/0, 
 	flora_compile/4.

Update of /cvsroot/flora/flora2/syslib
In directory usw-pr-cvs1:/tmp/cvs-serv13486/syslib

Modified Files:
	flrload.P 
Log Message:
better run-time checks to see if a load-file statement
overrides the module into which it is loaded


Index: flrload.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrload.P,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flrload.P	25 May 2002 03:10:33 -0000	1.2
+++ flrload.P	25 May 2002 07:20:40 -0000	1.3
@@ -45,42 +45,50 @@
 
 :- import flora_display_error/1 from flrdisplay.
 
-:- import flora_get_counter/2 from flrporting.
+:- import
+	flora_get_counter/2,
+	flora_file_op/3
+   from flrporting.
 
 
 
 /********************************************************************/
-fllibload([],_Mod,_Rulenum) :- !.
+fllibload([],_HostFile,_HostMod,_Rulenum) :- !.
 
-fllibload([T|L],Mod,RuleNum) :-
+fllibload([T|L],HostFile,HostMod,RuleNum) :-
 	!,
-	flora_load_file(T,Mod,RuleNum),
-	fllibload(L,Mod,RuleNum).
+	flora_load_file(T,HostFile,HostMod,RuleNum),
+	fllibload(L,HostFile,HostMod,RuleNum).
 
 
 /*********************************************************************
-  flora_load_file(+FileName)
-  flora_load_file(FL_RIGHTTO(+FileName,+Workspace))
+  flora_load_file(+FileName,+HostFile,+HostMod,+RuleNum)
+  flora_load_file(FL_RIGHTTO(+FileName,+Workspace),+HostFile,+HostMod,+RuleNum)
+
+  Filename: file being loaded
+  Workspace: module into which it is loaded
+  HostFile: program file from which this call was made
+  HostMod: module into which host program was loaded
 
   Note: Runtime checking of file and workspace names is needed, since
         the load list can be constructed at runtime.
 *********************************************************************/
-flora_load_file(T,Mod,RuleNum) :-
+flora_load_file(T,HostFile,HostMod,RuleNum) :-
 	atom(T),
-	flora_check__module_overriding(T,FLORA_DEFAULT_WORKSPACE,Mod,RuleNum),
 	!,
+	flora_check__module_overriding(T,FLORA_DEFAULT_WORKSPACE,HostFile,HostMod,RuleNum),
 	flora_load_module_internal(T).
 
-flora_load_file(T,_,_) :-
+flora_load_file(T,_,_,_) :-
 	var(T),
 	!,
 	flora_stderr_nl,
 	flora_error_line('file name unbound at time of loading'),
 	fail.
 
-flora_load_file(FL_RIGHTTO(FileName,Workspace),Mod,RuleNum) :-
+flora_load_file(FL_RIGHTTO(FileName,Workspace),HostFile,HostMod,RuleNum) :-
 	!,
-	flora_check__module_overriding(FileName,Workspace,Mod,RuleNum),
+	flora_check__module_overriding(FileName,Workspace,HostFile,HostMod,RuleNum),
 	( atom(FileName) ->
 	    ( atom(Workspace) ->
 		flora_load_module_internal(FileName,Workspace)
@@ -108,7 +116,7 @@
 	  fail
         ).
 
-flora_load_file(X) :-
+flora_load_file(X,_,_,_) :-
 	flora_stderr_nl,
 	flora_error_heading,
 	flora_stderr_string('file name '),
@@ -118,16 +126,17 @@
 	!,
 	fail.
 
-flora_check__module_overriding(_FileName,_Workspace,_Mod,_RuleNum) :-
-	flora_get_counter(flora_shell_mode,1),
+flora_check__module_overriding(_LoadFile,_Workspace,userin,main,_RuleNum) :-
 	!.
 
-flora_check__module_overriding(FileName,Workspace,Mod,RuleNum) :-
-	Mod == Workspace,
+flora_check__module_overriding(LoadFile,Workspace,HostFile,HostMod,RuleNum) :-
+	HostMod == Workspace,
 	!,
 	flora_stderr_nl,
 	RealRuleNum is RuleNum - 1,
-	flora_error_line('Loading file `~w'' into module `~w'' on line ~w would override the program in which the load statement occurs',
-			 [FileName,RealRuleNum,Mod]),
+	flora_file_op(basename,HostFile,HostFileBasename),
+	flora_error_line('~w.flr: Statement [~w >> ~w] in rule ~w overrides the program in which it occurs',
+			 [HostFileBasename,LoadFile,HostMod,RealRuleNum]),
 	fail.
-flora_check__module_overriding(_FileName,_Workspace,_Mod,_RuleNum).
+
+flora_check__module_overriding(_LoadFile,_Workspace,_HostFile,_HostMod,_RuleNum).

Update of /cvsroot/flora/flora2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv13486/includes

Modified Files:
	flrdefinition.flh 
Log Message:
better run-time checks to see if a load-file statement
overrides the module into which it is loaded


Index: flrdefinition.flh
===================================================================
RCS file: /cvsroot/flora/flora2/includes/flrdefinition.flh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrdefinition.flh	18 May 2002 17:43:28 -0000	1.1.1.1
+++ flrdefinition.flh	25 May 2002 07:20:41 -0000	1.2
@@ -7,8 +7,12 @@
 ************************************************************************/
 
 
-:- import storage_delete_all/1 from storage.
-:- import storage_find_fact/2 from storage.
+:- import
+        storage_delete_all/1,
+   	storage_find_fact/2,
+	storage_insert_fact/3,
+	storage_delete_fact/3 
+   from storage.
 :- import
 	flora_load_dyndata_for_user_modules/1,
 	FLORA_SYMBOL('debugger_loaded')/0
@@ -19,8 +23,9 @@
 	  flora_in_debug_mode/1
    from flrregistry.
 
+:- import flora_set_counter/2 from flrporting.
+
 :- import flora_error_undefined/1 from flrundefined.
-:- import storage_insert_fact/3,storage_delete_fact/3 from storage.
 
 ?- storage_delete_all(FLORA_THIS_FLD_STORAGE).
 ?- flora_in_debug_mode(_), !,
@@ -40,5 +45,6 @@
       ;  true
       )
    ).
+
 
 /***********************************************************************/

Update of /cvsroot/flora/flora2
In directory usw-pr-cvs1:/tmp/cvs-serv1579

Modified Files:
	flrcompiler.P 
Log Message:
added run-time checks to see if a load-file statement in file F
overrides the module into which F is loaded


Index: flrcompiler.P
===================================================================
RCS file: /cvsroot/flora/flora2/flrcompiler.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrcompiler.P	18 May 2002 17:43:27 -0000	1.1.1.1
+++ flrcompiler.P	25 May 2002 03:10:33 -0000	1.2
@@ -1748,7 +1748,9 @@
 	%% since complex terms aren't allowed in load lists, we ignore OidCode
 	compile_fllist(L,T,I,ObjList,_OidCode,OCode,Status),
 	( Status == [] ->
-	    florasyslib_struct(FLLIBLOAD,1,[ObjList],LCode),
+	    thismodule_struct(Mod),
+            flora_get_counter(RULE_NUM, Rule_num), 
+	    florasyslib_struct(FLLIBLOAD,3,[ObjList,Mod,Rule_num],LCode),
 	    conjunct_code([OCode,LCode],Code)
 	;
 	  true
@@ -4017,12 +4019,6 @@
 
 compile_execdirect(DirectTerm,Code) :-
 	(
-	%%  is_flprolog(DirectTerm,Funct,Arity) ->
-	%%  (var(Funct) -> new_varobj(FunctCode); FunctCode=Funct),
-	%%  (var(Arity) -> new_varobj(ArityCode); ArityCode=Arity),
-	%%  florasyslib_struct(FLLIBSHDIRECT,3,[FL_PROLOG,FunctCode,ArityCode],Code)
-	%%;
-	
 	  is_flfirstorder(DirectTerm,Funct,Arity) ->
 	    %% Both Funct and Arity could be a variable because of the parsing
 	    %% of the directive firstorderall.

Update of /cvsroot/flora/flora2/syslib
In directory usw-pr-cvs1:/tmp/cvs-serv1579/syslib

Modified Files:
	flrload.P 
Log Message:
added run-time checks to see if a load-file statement in file F
overrides the module into which F is loaded


Index: flrload.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrload.P,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- flrload.P	18 May 2002 17:43:28 -0000	1.1.1.1
+++ flrload.P	25 May 2002 03:10:33 -0000	1.2
@@ -34,6 +34,7 @@
 	flora_stderr_nl/0,
 	flora_stderr_string/1,
 	flora_error_line/1,
+	flora_error_line/2,
 	flora_error_heading/0
    from flrprint.
 
@@ -44,15 +45,17 @@
 
 :- import flora_display_error/1 from flrdisplay.
 
+:- import flora_get_counter/2 from flrporting.
+
 
 
 /********************************************************************/
-fllibload([]) :- !.
+fllibload([],_Mod,_Rulenum) :- !.
 
-fllibload([T|L]) :-
+fllibload([T|L],Mod,RuleNum) :-
 	!,
-	flora_load_file(T),
-	fllibload(L).
+	flora_load_file(T,Mod,RuleNum),
+	fllibload(L,Mod,RuleNum).
 
 
 /*********************************************************************
@@ -62,20 +65,22 @@
   Note: Runtime checking of file and workspace names is needed, since
         the load list can be constructed at runtime.
 *********************************************************************/
-flora_load_file(T) :-
+flora_load_file(T,Mod,RuleNum) :-
 	atom(T),
+	flora_check__module_overriding(T,FLORA_DEFAULT_WORKSPACE,Mod,RuleNum),
 	!,
 	flora_load_module_internal(T).
 
-flora_load_file(T) :-
+flora_load_file(T,_,_) :-
 	var(T),
 	!,
 	flora_stderr_nl,
 	flora_error_line('file name unbound at time of loading'),
 	fail.
 
-flora_load_file(FL_RIGHTTO(FileName,Workspace)) :-
+flora_load_file(FL_RIGHTTO(FileName,Workspace),Mod,RuleNum) :-
 	!,
+	flora_check__module_overriding(FileName,Workspace,Mod,RuleNum),
 	( atom(FileName) ->
 	    ( atom(Workspace) ->
 		flora_load_module_internal(FileName,Workspace)
@@ -112,3 +117,17 @@
 	flora_stderr_nl,
 	!,
 	fail.
+
+flora_check__module_overriding(_FileName,_Workspace,_Mod,_RuleNum) :-
+	flora_get_counter(flora_shell_mode,1),
+	!.
+
+flora_check__module_overriding(FileName,Workspace,Mod,RuleNum) :-
+	Mod == Workspace,
+	!,
+	flora_stderr_nl,
+	RealRuleNum is RuleNum - 1,
+	flora_error_line('Loading file `~w'' into module `~w'' on line ~w would override the program in which the load statement occurs',
+			 [FileName,RealRuleNum,Mod]),
+	fail.
+flora_check__module_overriding(_FileName,_Workspace,_Mod,_RuleNum).

Update of /cvsroot/flora/flora-testsuite
In directory usw-pr-cvs1:/tmp/cvs-serv14724

Modified Files:
	testall.sh 
Log Message:
added apptests


Index: testall.sh
===================================================================
RCS file: /cvsroot/flora/flora-testsuite/testall.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- testall.sh	18 May 2002 16:08:36 -0000	1.1.1.1
+++ testall.sh	24 May 2002 07:10:18 -0000	1.2
@@ -86,7 +86,7 @@
 
 # float_tests: don't pass. --mk
 # regmatch_tests: don't pass on solaris
-default_testlist="general_tests"
+default_testlist="general_tests apptests"
 
 if test -z "$only_tests"; then
     testlist="$default_testlist $added_tests"

Update of /cvsroot/flora/flora-testsuite/apptests/auxiliary
In directory usw-pr-cvs1:/tmp/cvs-serv14429/apptests/auxiliary

Removed Files:
	GradingPolicy.flr Grade.flr Class.flr .cvsignore 
Log Message:
removed


--- GradingPolicy.flr DELETED ---

--- Grade.flr DELETED ---

--- Class.flr DELETED ---

--- .cvsignore DELETED ---