maint: prepare forthcoming changes

* src/gram.c (rule_rhs_print): Do not print new line anymore.
(rule_print): Make it static.
* src/closure.c, src/derives.c, src/gram.c: Adjust.

diff --git a/src/closure.c b/src/closure.c
index 929aa777bb513241b5de256b05e21b82b744825a..ccd056500e5ae19ef96bd634e9f3b9db2a287148 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -103,6 +103,7 @@ print_fderives (void)
         {
           fprintf (stderr, "\t\t%3d ", r);
           rule_rhs_print (&rules[r], stderr);
         {
           fprintf (stderr, "\t\t%3d ", r);
           rule_rhs_print (&rules[r], stderr);

+          fprintf (stderr, "\n");

         }
     }
   fprintf (stderr, "\n\n");
         }
     }
   fprintf (stderr, "\n\n");

diff --git a/src/derives.c b/src/derives.c
index a0afbb3ef7569803052091b0f5b4239f4412af36..890239295d9587738ca8fade57cc80ddd4b4e755 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -52,6 +52,7 @@ print_derives (void)
         {
           fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
           rule_rhs_print (*rp, stderr);
         {
           fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
           rule_rhs_print (*rp, stderr);

+          fprintf (stderr, "\n");

         }
     }
 
         }
     }
 

diff --git a/src/gram.c b/src/gram.c
index 59e579c0150eb686cb12a5596066cb696109abf5..5e14c60ca5c843293ab81a1f943bf43d1cf0f775 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -105,11 +105,10 @@ rule_rhs_print (rule *r, FILE *out)
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
         fprintf (out, " %s", symbols[*rp]->tag);
       item_number *rp;
       for (rp = r->rhs; *rp >= 0; rp++)
         fprintf (out, " %s", symbols[*rp]->tag);

-      fputc ('\n', out);

     }
   else
     {
     }
   else
     {

-      fprintf (out, " /* %s */\n", _("empty"));
+      fprintf (out, " /* %s */", _("empty"));

     }
 }
 
     }
 }
 


@@ -133,7 +132,7 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
     }
 }
 
     }
 }
 

-void
+static void

 rule_print (rule *r, FILE *out)
 {
   fprintf (out, "%s:", r->lhs->tag);
 rule_print (rule *r, FILE *out)
 {
   fprintf (out, "%s:", r->lhs->tag);


@@ -189,6 +188,7 @@ grammar_rules_partial_print (FILE *out, const char *title,
       first = false;
       rule_lhs_print (&rules[r], previous_lhs, out);
       rule_rhs_print (&rules[r], out);
       first = false;
       rule_lhs_print (&rules[r], previous_lhs, out);
       rule_rhs_print (&rules[r], out);

+      fprintf (out, "\n");

       previous_lhs = rules[r].lhs;
     }
   if (!first)
       previous_lhs = rules[r].lhs;
     }
   if (!first)


@@ -296,6 +296,7 @@ grammar_dump (FILE *out, const char *title)
       {
         fprintf (out, "%-5d  ", r);
         rule_print (&rules[r], out);
       {
         fprintf (out, "%-5d  ", r);
         rule_print (&rules[r], out);

+        fprintf (out, "\n");

       }
   }
   fprintf (out, "\n\n");
       }
   }
   fprintf (out, "\n\n");


@@ -313,9 +314,10 @@ grammar_rules_useless_report (const char *message)
           {
             complain_at (rules[r].location, w, "%s: ", message);
             rule_print (&rules[r], stderr);
           {
             complain_at (rules[r].location, w, "%s: ", message);
             rule_print (&rules[r], stderr);

+            fprintf (stderr, "\n");

             fflush (stderr);
           }
             fflush (stderr);
           }

-      }
+    }

 }
 
 void
 }
 
 void

diff --git a/src/gram.h b/src/gram.h
index 75b3b0a9abc356aa76c7920807117376b368b86d..e502b781b52b973ce6fb67946f04a672e4b5975b 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -229,9 +229,6 @@ size_t rule_rhs_length (rule *r);
 /* Print this rule's RHS on OUT.  */
 void rule_rhs_print (rule *r, FILE *out);
 
 /* Print this rule's RHS on OUT.  */
 void rule_rhs_print (rule *r, FILE *out);
 

-/* Print this rule on OUT.  */
-void rule_print (rule *r, FILE *out);
-