[Flora-commits] flora2/syslib flrprefixdef.P,NONE,1.1 Makefile,1.21,1.22 flrdecode.P,1.39,1.40 flrim

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

Modified Files:
	Makefile flrdecode.P flrimportedcalls.P 
Added Files:
	flrprefixdef.P 
Log Message:
1, Supports for URIs (http://www.daml.org/services/swsl-rules/1.0/#swsl-rules-basic-defs);
2, More specific error reporting in flrcoder;
3, Fix bugs in syntax error reporting about underscore.



--- NEW FILE: flrprefixdef.P ---
/* File:      flrprefixdef.P
**
** Author(s): Hui Wan
**
** Contact:   flo...@li...
**
** Copyright (C) The Research Foundation of SUNY, 1999-2001
**
** 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.
** 
** 
*/


:- compiler_options([xpp_on]).

#include "flora_terms.flh"
#include "flora_exceptions.flh"


:- import flora_concat_atoms/2
	from flrporting.

:- import flora_shell_prefixdef/3 from flrregistry.

:- export
	FLLIBPREFIXDEF/3.


FLLIBPREFIXDEF(Mod,NameCode,StrCode) :-
	flora_concat_atoms(['flora_prefix_',NameCode],PrefixCode),
	(flora_shell_prefixdef(Mod,PrefixCode,_)->retract(flora_shell_prefixdef(Mod,PrefixCode,_));true),
	assert(flora_shell_prefixdef(Mod,PrefixCode,StrCode)).

Index: flrimportedcalls.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrimportedcalls.P,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- flrimportedcalls.P	26 Sep 2004 03:58:45 -0000	1.9
+++ flrimportedcalls.P	17 Oct 2005 05:25:33 -0000	1.10
@@ -34,6 +34,7 @@
 ?- import FLLIBCATCH/3, FLLIBTHROW/1 from flrerrhandler.
 
 ?- import FLLIBEXPORT/1 from flrexport.
+?- import FLLIBPREFIXDEF/3 from flrprefixdef.
 
 %% These two are not strictly necessary, because flrutils.P and prolog2hilog
 %% are loaded in the beginning

Index: Makefile
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	3 Apr 2005 06:37:52 -0000	1.21
+++ Makefile	17 Oct 2005 05:25:33 -0000	1.22
@@ -66,7 +66,8 @@
 	  flrdbmodule$(OBJEXT) \
 	  flroptimize$(OBJEXT) \
 	  flrnewoid$(OBJEXT) \
-	  flrimport$(OBJEXT)
+	  flrimport$(OBJEXT) \
+	  flrprefixdef$(OBJEXT)
 
 FLORA_INCLUDES_DIR = ../flrincludes
 DYN_INCLUDES_DIR = ../includes

Index: flrdecode.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdecode.P,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- flrdecode.P	30 Aug 2005 04:58:46 -0000	1.39
+++ flrdecode.P	17 Oct 2005 05:25:33 -0000	1.40
@@ -774,6 +774,10 @@
         !,
         decode_literal_internal(Term,Code,Level,Depth).
 
+decode_literal_internal(FL_URI(Term),['_',Code],Level,Depth) :-
+        !,
+        decode_literal_internal(Term,Code,Level,Depth).
+
 decode_literal_internal(FLLIBNEWMODULE(_ThisModule,NewModuleName),
 			[ReifyStart,FL_NEWMODULE,'{',NewModuleName,'}',ReifyEnd],
 			Level,_Depth) :-