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

	* src/detgen/detgen.str: Put double quotes on keywords of
	generated pp entries.

	* test/d.str.ref, test/f.str.ref: Update.

sdf-detgen/ChangeLog

+2004-05-04  Valentin David  <valentin@lrde.epita.fr>
+
+	* src/detgen/detgen.str: Put double quotes on keywords of
+	generated pp entries.
+
+	* test/d.str.ref, test/f.str.ref: Update.
+
 2004-05-04  Nicolas Pouillard  <ertai@lrde.epita.fr>
 
 	* configure.ac: Bug fix, boxed2sdf no more in boxedsdf.

sdf-detgen/src/detgen/detgen.str

@@ -71,6 +71,7 @@ rules
 		// else generate the pp-entry.
 		  (  <generate-pp-entries> prod(a, b, c')
 		   ; Hd
+		   ; alltd(FBOX(KW, S(double-quote)))
 		   ; \ PP-Entry(_,b) -> Pathed(None,[H([SOpt(HS,"0")],b')])
 			where <concat> [[FBOX(KW,S(<double-quote> btag))],
 					b,

sdf-detgen/test/d.str.ref

@@ -21,6 +21,9 @@ rules
 
   Tr :
     appl(prod([cf(sort("A")),cf(opt(layout())),cf(sort("B")),cf(opt(layout())),cf(sort("C")),cf(opt(layout())),cf(sort("D"))], cf(sort("E")), ), [  ,  ,  ,  ,  ,  ,  ]) -> appl(prod([cf(sort("A")),cf(opt(layout())),lit("/*[blah2]*/"),cf(opt(layout())),[sort("B")],cf(opt(layout())),lit("/*[/blah2]*/"),cf(opt(layout())),cf(sort("C")),cf(opt(layout())),cf(sort("D"))], cf(sort("E")), ), [  ,  , appl(prod([char-class([ 47 ]),char-class([ 42 ]),char-class([ 91 ]),char-class([ 98 ]),char-class([ 108 ]),char-class([ 97 ]),char-class([ 104 ]),char-class([ 50 ]),char-class([ 93 ]),char-class([ 42 ]),char-class([ 47 ])], lit("/*[blah2]*/"), no-attrs()), [ 47 , 42 , 91 , 98 , 108 , 97 , 104 , 50 , 93 , 42 , 47 ]) , appl(prod([], cf(opt(layout())), no-attrs()), [ ]) ,  , appl(prod([], cf(opt(layout())), no-attrs()), [ ]) , appl(prod([char-class([ 47 ]),char-class([ 42 ]),char-class([ 91 ]),char-class([ 47 ]),char-class([ 98 ]),char-class([ 108 ]),char-class([ 97 ]),char-class([ 104 ]),char-class([ 50 ]),char-class([ 93 ]),char-class([ 42 ]),char-class([ 47 ])], lit("/*[/blah2]*/"), no-attrs()), [ 47 , 42 , 91 , 47 , 98 , 108 , 97 , 104 , 50 , 93 , 42 , 47 ]) ,  ,  ,  ,  ])
+
+  Tr :
+    appl(prod([lit("friend")], cf(sort("G")), ), [  ]) -> appl(prod([lit("/*[poo]*/"),cf(opt(layout())),lit("friend"),cf(opt(layout())),lit("/*[/poo]*/")], cf(sort("G")), ), [ appl(prod([char-class([ 47 ]),char-class([ 42 ]),char-class([ 91 ]),char-class([ 112 ]),char-class([ 111 ]),char-class([ 111 ]),char-class([ 93 ]),char-class([ 42 ]),char-class([ 47 ])], lit("/*[poo]*/"), no-attrs()), [ 47 , 42 , 91 , 112 , 111 , 111 , 93 , 42 , 47 ]) , appl(prod([], cf(opt(layout())), no-attrs()), [ ]) ,  , appl(prod([], cf(opt(layout())), no-attrs()), [ ]) , appl(prod([char-class([ 47 ]),char-class([ 42 ]),char-class([ 91 ]),char-class([ 47 ]),char-class([ 112 ]),char-class([ 111 ]),char-class([ 111 ]),char-class([ 93 ]),char-class([ 42 ]),char-class([ 47 ])], lit("/*[/poo]*/"), no-attrs()), [ 47 , 42 , 91 , 47 , 112 , 111 , 111 , 93 , 42 , 47 ]) ])
 strategies
   Convert =
     iowrap(topdown(try(Tr)))

sdf-detgen/test/f.str.ref

@@ -23,7 +23,7 @@ rules
     appl(prod([cf(sort("A")),cf(opt(layout())),lit("/*[blah2]*/"),cf(opt(layout())),[sort("B")],cf(opt(layout())),lit("/*[/blah2]*/"),cf(opt(layout())),cf(sort("C")),cf(opt(layout())),cf(sort("D"))], cf(sort("E")), ), [  ,  , _ , _ ,  , _ , _ ,  ,  ,  ,  ]) -> appl(prod([cf(sort("A")),cf(opt(layout())),cf(sort("B")),cf(opt(layout())),cf(sort("C")),cf(opt(layout())),cf(sort("D"))], cf(sort("E")), ), [  ,  ,  ,  ,  ,  ,  ])
 
   Tr :
-    appl(prod([lit("/*[poo]*/"),cf(opt(layout())),lit("friend"),cf(opt(layout())),lit("/*[/poo]*/")], cf(sort("G")), t_1), [ _ , _ , s_1 , _ , _ ]) -> appl(prod([lit("friend")], cf(sort("G")), t_1), [ s_1 ])
+    appl(prod([lit("/*[poo]*/"),cf(opt(layout())),lit("friend"),cf(opt(layout())),lit("/*[/poo]*/")], cf(sort("G")), ), [ _ , _ ,  , _ , _ ]) -> appl(prod([lit("friend")], cf(sort("G")), ), [  ])
 strategies
   Convert =
     iowrap(topdown(try(Tr)))