from Nicolas Pouillard <ertai@lrde.epita.fr>

	* configure.ac: Add help2man search.
	* src/mancmds: Add.
	* src/pack-esdf/pack-esdf.str: Update to new Sdf2 version.
	* src/pack-esdf/sglr.str: Use the good grammar.
	* Makefile.am: Update.

esdf/ChangeLog

+2004-04-29  Nicolas Pouillard  <ertai@lrde.epita.fr>
+
+	* configure.ac: Add help2man search.
+	* src/mancmds: Add.
+	* src/pack-esdf/pack-esdf.str: Update to new Sdf2 version.
+	* src/pack-esdf/sglr.str: Use the good grammar.
+	* Makefile.am: Update.
+
 2004-04-21  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	Initial Checkin.

esdf/Makefile.am

@@ -3,7 +3,7 @@
 include $(top_srcdir)/config/Makefile.xt
 
 ACLOCAL_AMFLAGS   = -I config
-SUBDIRS           = config lib src # test
+SUBDIRS           = config src # lib test
 BOOTCLEAN_SUBDIRS = $(SUBDIRS)
 XTC_IMPORT        = $(STRATEGOXT)/share/strategoxt/XTC
 

esdf/configure.ac

@@ -37,6 +37,12 @@ test -f $PGEN/bin/sdf2table ||
 test -f $STRATEGO_TOOLS/bin/sdf-to-sig ||
   AC_MSG_ERROR([cannot find sdf-to-sig.  Did you set --with-xt?])
 
+AC_CHECK_PROGS([HELP2MAN], [help2man], [NONE])
+if test x"$HELP2MAN" = xNONE; then
+  AC_MSG_ERROR([cannot find help2man. Check your path.])
+fi
+AC_SUBST([HELP2MAN])
+
 AC_PROG_CC
 AC_PROG_INSTALL
 
@@ -44,7 +50,5 @@ AC_CONFIG_FILES([Makefile
 		src/Makefile
 		src/sdf-purify/Makefile
 		src/pack-esdf/Makefile
-		config/version.str
-		test/Makefile
-		test/defs])
+		config/version.str])
 AC_OUTPUT

esdf/src/mancmds

+pack-esdf
+sdf-purify

esdf/src/pack-esdf/pack-esdf.str

@@ -17,7 +17,7 @@
  */
 module pack-esdf
 imports xtc-proc lib stratego-xt-xtc-tools
-imports Sdf-ParseTree-Syntax Kernel-Sdf-Syntax
+imports Sdf2
 imports asfix-abstractions pack-modules AsFix2-Syntax
 imports version
 
@@ -112,7 +112,7 @@ strategies
   sglr :
     (tbl, infile) -> tree
     where xtc-temp-files(
-            <xtc-transform(!"sglr", !["-2", "-p", tbl, "-s", "Module-GrammarID"])> FILE(infile)
+            <xtc-transform(!"sglr", !["-2", "-p", tbl])> FILE(infile)
 	  ; read-from => parsetree(tree,_)
           )
 
@@ -179,10 +179,6 @@ strategies
             <concat-layout>[w2, OptNewLine, OptNewLine, w3], 
             m2), w4)
 
-signature
-  constructors
-    'id: Arg -> ID
-
 overlays 
 
   /**
@@ -192,20 +188,13 @@ overlays
     appl(
       prod(
         [ cf(opt(layout()))
-        , cf(sort("Module-GrammarID"))
+        , cf(sort("Module"))
         , cf(opt(layout()))
         ]
       , sort("<START>")
       , no-attrs()
       )
-    , [ w1,
-        appl(
-          prod(
-   	    [ cf(sort("Module")) ]
-  	  , cf(sort("Module-GrammarID"))
-	  , attrs([prefer(),term(cons("\"sdf-2.1\""))]))
-	, [t]),
-        w2]
+    , [ w1, t, w2]
     )
 
   /**
@@ -215,20 +204,13 @@ overlays
     appl(
       prod(
         [ cf(opt(layout()))
-        , cf(sort("SDF-GrammarID"))
+        , cf(sort("SDF"))
         , cf(opt(layout()))
         ]
       , sort("<START>")
       , no-attrs()
       )
-    , [w1,
-       appl(
-          prod(
-   	    [ cf(sort("Definition")) ]
-  	  , cf(sort("SDF-GrammarID"))
-	  , attrs([prefer(),term(cons("\"sdf-2.1\""))]))
-	, [t]),
-       w2]
+    , [w1, t, w2]
     )
 
   /**
@@ -248,7 +230,7 @@ overlays
    */
   MM-iter(m1, w, m2) =
     appl(prod([cf(iter(sort("Module"))),cf(opt(layout)),cf(iter(sort("Module")))],
-     cf(iter(sort("Module"))),attrs([atr("left")])),[m1, w, m2])
+     cf(iter(sort("Module"))),attrs([assoc(left())])),[m1, w, m2])
 
   /**
    * M -> M+
@@ -267,7 +249,7 @@ overlays
    */
   Definition-overlay(b_1,c_1) =
   appl(prod([lit("definition"),cf(opt(layout())),cf(sort("Definition"))],cf(sort("SDF")),
-         attrs([term(cons("Definition")),'id("Sdf2-Syntax")])),[appl(prod([
+         attrs([term(cons("definition"))])),[appl(prod([
     char-class([100]),
     char-class([101]),
     char-class([102]),

esdf/src/pack-esdf/sglr.str

@@ -28,7 +28,7 @@ imports exec asfix verbose xtc-lib
 
 strategies
 
-  get-syntax = (<get-config> "-s" <+ !"BoxedSdf2")
+  get-syntax = (<get-config> "-s" <+ !"Sdf2-Syntax")
 	; if-verbose2(debug(!"Using grammar: "))
 	; !(<id>, ".tbl")
 	; conc-strings