from Valentin David <valentin@lrde.epita.fr>

	* src/strcxxgen/strcxxgen.str: Update to the last SDF syntax.

	* src/syn/Makefile.am:
	Update. "sdf-bracket" is now in the pretty-printer.

cxx-grammar/ChangeLog

+2004-05-04  Valentin David  <valentin@lrde.epita.fr>
+
+	* src/strcxxgen/strcxxgen.str: Update to the last SDF syntax.
+
+	* src/syn/Makefile.am:
+	Update. "sdf-bracket" is now in the pretty-printer.
+
 2004-05-04  Clement Vasseur  <clement.vasseur@lrde.epita.fr>
 
 	* src/sig/Makefile.am: Use Stratego-Regular to generate the

cxx-grammar/src/strcxxgen/strcxxgen.str

@@ -19,7 +19,7 @@
  *
  */
 module strcxxgen
-imports lib Sdf2-Syntax
+imports lib Sdf2 AsFix
 strategies
 
   dont-exists =
@@ -34,69 +34,69 @@ strategies
                 ; map(\ sort(x) -> x \)
                 ; filter(dont-exists)
 		; map(![context-free-syntax([
-                   prod([lit(<!["\"|", <id>, "[\""]; concat-strings>),
+                   prod([lit(<!["|", <id>, "["]; concat-strings>),
                          sort(<id>),
-                         lit("\"]c++|\"")],
+                         lit("]c++|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"|", <id>, "[\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["|", <id>, "["]; concat-strings>),
                          sort(<id>),
-                         lit("\"]|\"")],
+                         lit("]|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"|", <id>, "?[\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["|", <id>, "?["]; concat-strings>),
                          opt(sort(<id>)),
-                         lit("\"]c++|\"")],
+                         lit("]c++|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"|", <id>, "?[\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["|", <id>, "?["]; concat-strings>),
                          opt(sort(<id>)),
-                         lit("\"]|\"")],
+                         lit("]|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"|", <id>, "+[\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["|", <id>, "+["]; concat-strings>),
                          iter(sort(<id>)),
-                         lit("\"]c++|\"")],
+                         lit("]c++|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"|", <id>, "+[\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["|", <id>, "+["]; concat-strings>),
                          iter(sort(<id>)),
-                         lit("\"]|\"")],
+                         lit("]|")],
                         sort("StrategoTerm"),
-                        attrs([cons("\"ToTerm\""),prefer])),
-                   prod([lit(<!["\"~", <id>, "?:\""]; concat-strings>),
+                        attrs([term(cons("ToTerm")),prefer])),
+                   prod([lit(<!["~", <id>, "?:"]; concat-strings>),
                          sort("StrategoTerm"),
-                         lit("\"~\"")],
+                         lit("~")],
                         opt(sort(<id>)),
-                        attrs([cons("\"FromTerm\""),prefer])),
-                   prod([lit(<!["\"~", <id>, "+:\""]; concat-strings>),
+                        attrs([term(cons("FromTerm")),prefer])),
+                   prod([lit(<!["~", <id>, "+:"]; concat-strings>),
                          sort("StrategoTerm"),
-                         lit("\"~\"")],
+                         lit("~")],
                         iter(sort(<id>)),
-                        attrs([cons("\"FromTerm\""),prefer])),
-                   prod([lit(<!["\"~", <id>, ":\""]; concat-strings>),
+                        attrs([term(cons("FromTerm")),prefer])),
+                   prod([lit(<!["~", <id>, ":"]; concat-strings>),
                          sort("StrategoTerm"),
-                         lit("\"~\"")],
+                         lit("~")],
                         sort(<id>),
-                        attrs([cons("\"FromTerm\""),prefer]))]),
+                        attrs([term(cons("FromTerm")),prefer]))]),
                          variables([
-                   prod([lit(<!["\"", <id>, "\""]; concat-strings>),
+                   prod([lit(<!["", <id>, ""]; concat-strings>),
                          iter-star(char-class(simple-charclass(range("0","9")))),
                          iter-star(char-class(simple-charclass("\\'")))],
                         sort(<id>),
                         attrs([prefer])),
-                   prod([lit(<!["\"", <id>, "\""]; concat-strings>),
+                   prod([lit(<id>),
                          iter-star(char-class(simple-charclass(range("0","9")))),
-                         lit("\"-opt\""),
+                         lit("-opt"),
                          iter-star(char-class(simple-charclass("\\'")))],
                         opt(sort(<id>)),
                         attrs([prefer])),
-                   prod([lit(<!["\"", <id>, "\""]; concat-strings>),
+                   prod([lit(<id>),
                          iter-star(char-class(simple-charclass(range("0","9")))),
-                         lit("\"-iter\""),
+                         lit("-iter"),
                          iter-star(char-class(simple-charclass("\\'")))],
                         iter(sort(<id>)),
                         attrs([prefer]))])])
                 ; concat
                 ; rec x ([] <+ [id] <+ \ [y|ys] -> conc-grammars(y,<x>ys) \)
-                ; !Module("StrategoCxxGen", [], [Exports(<id>)]))
+                ; !'module("StrategoCxxGen", [], ['exports(<id>)]))

cxx-grammar/src/syn/Makefile.am

@@ -109,12 +109,11 @@ Cxx.ppdef: $(SDFS) notemplate
 		-s DetBoxedSdf \
 		-I $(BUNDLED_DETGEN)/share/sdf-detgen \
 		-I $(top_srcdir)/lib \
-		-I $(top_srcdir)/src/syn \
-		-i $(top_srcdir)/src/syn/Cxx.sdf \
+		-I $(srcdir) \
+		-i $(srcdir)/Cxx.sdf \
 	| $(BUNDLED_SDF_OPTION)/bin/sdf-option \
 	| $(SDF_TOOLS)/bin/sdf-cons \
 	| ./notemplate \
-	| $(SDF_TOOLS)/bin/sdf-bracket \
 	| $(BUNDLED_DETGEN)/bin/pp-detboxedsdf -o $@
 
 nodist_notemplate_SOURCES  = notemplate.c