report: use %empty to denote empty rules

* src/gram.c (rule_rhs_print): Use %empty for empty rules.
* tests/conflicts.at, tests/regression.at, tests/sets.at: Adjust.

diff --git a/src/gram.c b/src/gram.c
index c0177df08bb2e36481b6df891f99d9ee10f654ab..f6cc3c5d87a86a4fc86a90c9025cb8170e01daee 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -93,16 +93,14 @@ rule_rhs_length (rule const *r)
 void
 rule_rhs_print (rule const *r, FILE *out)
 {
 void
 rule_rhs_print (rule const *r, FILE *out)
 {

-  if (*r->rhs >= 0)
+  if (0 <= *r->rhs)

     {
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
         fprintf (out, " %s", symbols[*rp]->tag);
     }
   else
     {
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
         fprintf (out, " %s", symbols[*rp]->tag);
     }
   else

-    {
-      fprintf (out, " /* %s */", _("empty"));
-    }
+    fputs (" %empty", out);

 }
 
 static void
 }
 
 static void

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 9f7d59f93b262552ea753dad9728953683afdb9c..7a9931712e97e85caaec4b88a9c4ac8d3c4700b4 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1299,13 +1299,13 @@ AT_CHECK([[cat input.output]], 0,
     2 resolved_conflict: 'a' unreachable1
 
     4 unreachable1: 'a' unreachable2
     2 resolved_conflict: 'a' unreachable1
 
     4 unreachable1: 'a' unreachable2

-    5             | /* empty */
+    5             | %empty

 
 

-    6 unreachable2: /* empty */
-    7             | /* empty */
+    6 unreachable2: %empty
+    7             | %empty

 
     9 reported_conflicts: 'a'
 
     9 reported_conflicts: 'a'

-   10                   | /* empty */
+   10                   | %empty

 
 
 State 4 conflicts: 1 shift/reduce
 
 
 State 4 conflicts: 1 shift/reduce


@@ -1319,17 +1319,17 @@ Grammar
     1 start: resolved_conflict 'a' reported_conflicts 'a'
 
     2 resolved_conflict: 'a' unreachable1
     1 start: resolved_conflict 'a' reported_conflicts 'a'
 
     2 resolved_conflict: 'a' unreachable1

-    3                  | /* empty */
+    3                  | %empty

 
     4 unreachable1: 'a' unreachable2
 
     4 unreachable1: 'a' unreachable2

-    5             | /* empty */
+    5             | %empty

 
 

-    6 unreachable2: /* empty */
-    7             | /* empty */
+    6 unreachable2: %empty
+    7             | %empty

 
     8 reported_conflicts: 'a'
     9                   | 'a'
 
     8 reported_conflicts: 'a'
     9                   | 'a'

-   10                   | /* empty */
+   10                   | %empty

 
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear

diff --git a/tests/regression.at b/tests/regression.at
index debe932d6cc9484603664a71b474708508977cb7..f101f2180f9205fb62a687d69536042fb65c72dd 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -263,11 +263,11 @@ AT_CHECK([cat input.output], [],
 
     0 $accept: expr $end
 
 
     0 $accept: expr $end
 

-    1 $@1: /* empty */
+    1 $@1: %empty

 
     2 expr: 'a' $@1 'b'
 
 
     2 expr: 'a' $@1 'b'
 

-    3 $@2: /* empty */
+    3 $@2: %empty

 
     4 expr: $@2 'c'
 
 
     4 expr: $@2 'c'
 


@@ -573,7 +573,7 @@ AT_CHECK([cat input.output], 0,
     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC
 
     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC
 

-    4 $@1: /* empty */
+    4 $@1: %empty

 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';'
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';'
 

diff --git a/tests/sets.at b/tests/sets.at
index 2007eef71a4268db0461b06b916e3afb5875a22c..ca04f42c3461837a4aeabded784c1944c8701f23 100644 (file)
--- a/tests/sets.at
+++ b/tests/sets.at
@@ -86,7 +86,7 @@ AT_CHECK([[cat sets]], [],
       0  e $end
   e derives
       1  'e'
       0  e $end
   e derives
       1  'e'

-      2  /* empty */
+      2  %empty

 NULLABLE
   $accept: no
   e: yes
 NULLABLE
   $accept: no
   e: yes


@@ -100,10 +100,10 @@ FDERIVES
   $accept derives
       0  e $end
       1  'e'
   $accept derives
       0  e $end
       1  'e'

-      2  /* empty */
+      2  %empty

   e derives
       1  'e'
   e derives
       1  'e'

-      2  /* empty */
+      2  %empty

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP