XRM r92: Updates for Stratego/XT 0.17M2.

3 Dec 2006

Repository: https://svn.lrde.epita.fr/svn/xrm

ChangeLog:
2006-12-03  SIGOURE Benoit  <sigoure.benoit@lrde.epita.fr>

	Updates for Stratego/XT 0.17M2.
	* Makefile.am (dist-hook): Use find -exec instead of xargs.
	* configure.ac (AM_INIT_AUTOMAKE): Remove -Wall.
	* src/lib/native/Makefile.am: Fix CLEANFILES.
	* src/lib/prism/pp/Makefile.am,
	* src/lib/xpctl/pp/Makefile.am,
	* src/lib/xrm/pp/Makefile.am,
	* src/lib/pctl/pp/Makefile.am: Fix CLEANFILES and DISTCLEANFILES.

	* src/str/reals.str: Fix call to pow for integers.

	* src/syn/prism/Makefile.am,
	* src/syn/xpctl/Makefile.am,
	* src/syn/xrm/Makefile.am,
	* src/syn/pctl/Makefile.am: Generate the .sdf version of prefixed
          grammar.

	* src/str/xrm-front.str,
	* src/lib/pctl/pp/pctl-to-abox.str,
	* src/lib/prism/pp/prism-to-abox.str,
	* src/lib/xpctl/pp/xpctl-to-abox.str,
	* src/lib/xrm/pp/xrm-to-abox.str,
	* src/tools/parse-pctl.str,
	* src/tools/parse-prism.str,
	* src/tools/parse-xpctl.str,
	* src/tools/parse-xrm.str,
	* src/tools/pp-pctl.str,
	* src/tools/pp-prism.str,
	* src/tools/pp-xpctl.str,
	* src/tools/pp-xrm.str: Import libstratego-xtc and libstratego-lib
          instead of libxtclib.

 Makefile.am                        |    4 ++--
 configure.ac                       |    4 ++--
 src/lib/native/Makefile.am         |    4 +++-
 src/lib/pctl/pp/Makefile.am        |    4 +++-
 src/lib/pctl/pp/pctl-to-abox.str   |    3 ++-
 src/lib/prism/pp/Makefile.am       |    4 +++-
 src/lib/prism/pp/prism-to-abox.str |    3 ++-
 src/lib/xpctl/pp/Makefile.am       |    4 +++-
 src/lib/xpctl/pp/xpctl-to-abox.str |    3 ++-
 src/lib/xrm/pp/Makefile.am         |    4 +++-
 src/lib/xrm/pp/xrm-to-abox.str     |    3 ++-
 src/str/reals.str                  |    1 +
 src/str/xrm-front.str              |    1 +
 src/syn/pctl/Makefile.am           |    4 ++--
 src/syn/prism/Makefile.am          |    4 ++--
 src/syn/xpctl/Makefile.am          |    4 ++--
 src/syn/xrm/Makefile.am            |    4 ++--
 src/tools/parse-pctl.str           |    3 ++-
 src/tools/parse-prism.str          |    3 ++-
 src/tools/parse-xpctl.str          |    3 ++-
 src/tools/parse-xrm.str            |    3 ++-
 src/tools/pp-pctl.str              |    1 +
 src/tools/pp-prism.str             |    1 +
 src/tools/pp-xpctl.str             |    1 +
 src/tools/pp-xrm.str               |    1 +
 25 files changed, 49 insertions(+), 25 deletions(-)

Index: src/tools/parse-pctl.str
===================================================================

--- src/tools/parse-pctl.str	(revision 91)
+++ src/tools/parse-pctl.str	(working copy)
@@ -1,6 +1,7 @@
 module parse-pctl
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   parser-common
 
Index: src/tools/parse-xrm.str
===================================================================
--- src/tools/parse-xrm.str	(revision 91)
+++ src/tools/parse-xrm.str	(working copy)
@@ -1,6 +1,7 @@
 module parse-xrm
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   parser-common
 
Index: src/tools/pp-pctl.str
===================================================================
--- src/tools/pp-pctl.str	(revision 91)
+++ src/tools/pp-pctl.str	(working copy)
@@ -3,6 +3,7 @@
 module pp-pctl
 imports
   libstratego-lib
+  libstratego-xtc
   tool-doc
   libstratego-gpp
   pp-pctl-to-box
Index: src/tools/parse-prism.str
===================================================================
--- src/tools/parse-prism.str	(revision 91)
+++ src/tools/parse-prism.str	(working copy)
@@ -1,6 +1,7 @@
 module parse-prism
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   parser-common
 
Index: src/tools/parse-xpctl.str
===================================================================
--- src/tools/parse-xpctl.str	(revision 91)
+++ src/tools/parse-xpctl.str	(working copy)
@@ -1,6 +1,7 @@
 module parse-xpctl
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   parser-common
 
Index: src/tools/pp-xrm.str
===================================================================
--- src/tools/pp-xrm.str	(revision 91)
+++ src/tools/pp-xrm.str	(working copy)
@@ -3,6 +3,7 @@
 module pp-xrm
 imports
   libstratego-lib
+  libstratego-xtc
   tool-doc
   libstratego-gpp
   pp-xrm-to-box
Index: src/tools/pp-prism.str
===================================================================
--- src/tools/pp-prism.str	(revision 91)
+++ src/tools/pp-prism.str	(working copy)
@@ -3,6 +3,7 @@
 module pp-prism
 imports
   libstratego-lib
+  libstratego-xtc
   tool-doc
   libstratego-gpp
   pp-prism-to-box
Index: src/tools/pp-xpctl.str
===================================================================
--- src/tools/pp-xpctl.str	(revision 91)
+++ src/tools/pp-xpctl.str	(working copy)
@@ -3,6 +3,7 @@
 module pp-xpctl
 imports
   libstratego-lib
+  libstratego-xtc
   tool-doc
   libstratego-gpp
   pp-xpctl-to-box
Index: src/lib/pctl/pp/pctl-to-abox.str
===================================================================
--- src/lib/pctl/pp/pctl-to-abox.str	(revision 91)
+++ src/lib/pctl/pp/pctl-to-abox.str	(working copy)
@@ -1,6 +1,7 @@
 module pctl-to-abox
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   pp-pctl-to-box
 
Index: src/lib/pctl/pp/Makefile.am
===================================================================
--- src/lib/pctl/pp/Makefile.am	(revision 91)
+++ src/lib/pctl/pp/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Sat Jun 10 03:59:11 2006 SIGOURE Benoit
-## Last update Sat Jun 10 04:00:21 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:17:20 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -28,6 +28,8 @@
 BUILT_SOURCES = pctl-parenthesize.str
 
 EXTRA_DIST = $(wildcard *.str) $(wildcard *.meta)
+CLEANFILES = $(pctl_to_abox_SOURCES) $(BUILT_SOURCES)
+DISTCLEANFILES = $(wildcard *.dep)
 
 pctl-parenthesize.str: $(top_builddir)/src/syn/pctl/PCTL.def
 	$(SDF_TOOLS)/bin/sdf2parenthesize -i $< -o $@ \
Index: src/lib/native/Makefile.am
===================================================================
--- src/lib/native/Makefile.am	(revision 91)
+++ src/lib/native/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Wed May 10 19:27:12 2006 SIGOURE Benoit
-## Last update Tue Jun  6 15:13:38 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:19:46 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -24,6 +24,8 @@
 
 BUILT_SOURCES = import-libstr-reals.c
 
+CLEANFILES = $(BUILT_SOURCES)
+
 import-libstr-reals.c: Makefile
 	echo "/* code generated; used for strc --C-include \"'$@'\" */" > $@
 	for f in $(libstr_reals_la_SOURCES); do		\
Index: src/lib/xrm/pp/xrm-to-abox.str
===================================================================
--- src/lib/xrm/pp/xrm-to-abox.str	(revision 91)
+++ src/lib/xrm/pp/xrm-to-abox.str	(working copy)
@@ -1,6 +1,7 @@
 module xrm-to-abox
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   pp-xrm-to-box
 
Index: src/lib/xrm/pp/Makefile.am
===================================================================
--- src/lib/xrm/pp/Makefile.am	(revision 91)
+++ src/lib/xrm/pp/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Wed May 10 19:27:12 2006 SIGOURE Benoit
-## Last update Sun Jun 11 04:08:22 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:21:02 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -28,6 +28,8 @@
 BUILT_SOURCES = xrm-parenthesize.str
 
 EXTRA_DIST = $(wildcard *.str) $(wildcard *.meta)
+CLEANFILES = $(xrm_to_abox_SOURCES) $(BUILT_SOURCES)
+DISTCLEANFILES = $(wildcard *.dep)
 
 xrm-parenthesize.str: $(top_builddir)/src/syn/xrm/XRM.def
 	$(SDF_TOOLS)/bin/sdf2parenthesize -i $< -o $@ \
Index: src/lib/prism/pp/prism-to-abox.str
===================================================================
--- src/lib/prism/pp/prism-to-abox.str	(revision 91)
+++ src/lib/prism/pp/prism-to-abox.str	(working copy)
@@ -1,6 +1,7 @@
 module prism-to-abox
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   pp-prism-to-box
 
Index: src/lib/prism/pp/Makefile.am
===================================================================
--- src/lib/prism/pp/Makefile.am	(revision 91)
+++ src/lib/prism/pp/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Wed May 10 19:27:12 2006 SIGOURE Benoit
-## Last update Sun Jun 11 02:59:46 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:21:02 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -27,6 +27,8 @@
 BUILT_SOURCES = prism-parenthesize.str
 
 EXTRA_DIST = $(wildcard *.str) $(wildcard *.meta)
+CLEANFILES = $(prism_to_abox_SOURCES) $(BUILT_SOURCES)
+DISTCLEANFILES = $(wildcard *.dep)
 
 prism-parenthesize.str: $(top_builddir)/src/syn/prism/PRISM.def
 	$(SDF_TOOLS)/bin/sdf2parenthesize -i $< -o $@ \
Index: src/lib/xpctl/pp/xpctl-to-abox.str
===================================================================
--- src/lib/xpctl/pp/xpctl-to-abox.str	(revision 91)
+++ src/lib/xpctl/pp/xpctl-to-abox.str	(working copy)
@@ -1,6 +1,7 @@
 module xpctl-to-abox
 imports
-  libxtclib // FIXME: import libstratego-xtc for strc 0.17
+  libstratego-xtc
+  libstratego-lib
   tool-doc
   pp-xpctl-to-box
 
Index: src/lib/xpctl/pp/Makefile.am
===================================================================
--- src/lib/xpctl/pp/Makefile.am	(revision 91)
+++ src/lib/xpctl/pp/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Sat Jun 10 03:59:11 2006 SIGOURE Benoit
-## Last update Sun Jun 11 04:08:59 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:21:02 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -30,6 +30,8 @@
 BUILT_SOURCES = xpctl-parenthesize.str
 
 EXTRA_DIST = $(wildcard *.str) $(wildcard *.meta)
+CLEANFILES = $(xpctl_to_abox_SOURCES) $(BUILT_SOURCES)
+DISTCLEANFILES = $(wildcard *.dep)
 
 xpctl-parenthesize.str: $(top_builddir)/src/syn/xpctl/XPCTL.def
 	$(SDF_TOOLS)/bin/sdf2parenthesize -i $< -o $@ \
Index: src/str/xrm-front.str
===================================================================
--- src/str/xrm-front.str	(revision 91)
+++ src/str/xrm-front.str	(working copy)
@@ -2,6 +2,7 @@
 
 imports
   libstratego-xtc
+  libstratego-lib
   tool-doc
   xrm-to-prism
   prism-desugar
Index: src/str/reals.str
===================================================================
--- src/str/reals.str	(revision 91)
+++ src/str/reals.str	(working copy)
@@ -22,6 +22,7 @@
   maxR  = where((string-to-real, string-to-real); maxr)
   minR  = where((string-to-real, string-to-real); minr)
 
+  powI = id
   pow   = powR <+ powI
 
   /** Let (x, y) be a tuple of reals, this strategy returns the value of x
Index: src/syn/pctl/Makefile.am
===================================================================
--- src/syn/pctl/Makefile.am	(revision 91)
+++ src/syn/pctl/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Sat Jun 10 00:17:31 2006 SIGOURE Benoit
-## Last update Sat Jun 10 00:36:56 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:22:28 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/Transformers.mk
@@ -37,7 +37,7 @@
 		$(wildcard *.dep)		\
 		PCTL.{c,str,c.dep}		\
 		PCTL-StartSymbols.def		\
-		PCTL-Prefixed.def
+		PCTL-Prefixed.sdf
 
 SDFS		= \
 		PCTL-Filter.sdf			\
Index: src/syn/xrm/Makefile.am
===================================================================
--- src/syn/xrm/Makefile.am	(revision 91)
+++ src/syn/xrm/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Thu Apr 27 17:40:41 2006 SIGOURE Benoit
-## Last update Thu Jun 15 13:26:29 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:22:28 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/Transformers.mk
@@ -39,7 +39,7 @@
 		$(wildcard *.dep)		\
 		XRM.{c,str,c.dep}		\
 		XRM-StartSymbols.def		\
-		XRM-Prefixed.def
+		XRM-Prefixed.sdf
 
 SDFS		= \
 		  PRISM-to-XRM.sdf		\
Index: src/syn/prism/Makefile.am
===================================================================
--- src/syn/prism/Makefile.am	(revision 91)
+++ src/syn/prism/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Thu Apr 27 17:40:41 2006 SIGOURE Benoit
-## Last update Sat Jun 10 00:22:28 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:22:28 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/Transformers.mk
@@ -35,7 +35,7 @@
 		$(wildcard *.dep)		\
 		PRISM.{c,str,c.dep}		\
 		PRISM-StartSymbols.def		\
-		PRISM-Prefixed.def
+		PRISM-Prefixed.sdf
 
 SDFS		= \
 		PRISM-Command.sdf		\
Index: src/syn/xpctl/Makefile.am
===================================================================
--- src/syn/xpctl/Makefile.am	(revision 91)
+++ src/syn/xpctl/Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Sat Jun 10 00:17:31 2006 SIGOURE Benoit
-## Last update Thu Jun 15 13:25:48 2006 SIGOURE Benoit
+## Last update Sat Aug  5 10:22:28 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/Transformers.mk
@@ -39,7 +39,7 @@
 		$(wildcard *.dep)		\
 		XPCTL.{c,str,c.dep}		\
 		XPCTL-StartSymbols.def		\
-		XPCTL-Prefixed.def
+		XPCTL-Prefixed.sdf
 
 SDFS		= \
 		StrategoXPCTL.sdf		\
Index: configure.ac
===================================================================
--- configure.ac	(revision 91)
+++ configure.ac	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Thu Apr 27 15:55:56 2006 SIGOURE Benoit
-## Last update Wed Jul 19 15:39:31 2006 SIGOURE Benoit
+## Last update Fri Aug  4 18:50:35 2006 SIGOURE Benoit
 ##
 
 ## --------------- ##
@@ -19,7 +19,7 @@
 AC_CONFIG_MACRO_DIR([config])
 AC_CONFIG_AUX_DIR([config])
 
-AM_INIT_AUTOMAKE([1.9.2 foreign -Wall])
+AM_INIT_AUTOMAKE([1.9.2 foreign])
 
 ## -------------- ##
 ## Required Tools ##
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 91)
+++ Makefile.am	(working copy)
@@ -5,7 +5,7 @@
 ## Mail   <sigoure.benoit@lrde.epita.fr>
 ##
 ## Started on  Thu Apr 27 16:22:46 2006 SIGOURE Benoit
-## Last update Tue May  9 22:17:33 2006 SIGOURE Benoit
+## Last update Sun Aug 13 19:20:23 2006 SIGOURE Benoit
 ##
 
 include $(top_srcdir)/config/toplevel.mk
@@ -26,4 +26,4 @@
 
 # Remove the .svn folders included in the tarball
 dist-hook:
-	find $(distdir) -type d -name '.svn' | xargs rm -rf
+	find $(distdir) -type d -name '.svn' -exec rm -rf {} \;
-- 
SIGOURE Benoit aka Tsuna (SUSv3 compliant)
 _____                         "On a long enough timeline, the survival rate
/EPITA\ Promo 2008.CSI/ACU      for everyone drops to zero" -- Jack.

    

SIGOURE Benoit

tags

participants (1)