* src/output.c: Formatting changes.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index f68172234a393c6ab23a0ebbadbefc41d5a473aa..52baf10745685c3387b7417fcba85a1677509c2a 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -15,12 +15,11 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
-#include <stdio.h>
 #include "system.h"
-#include "machine.h"
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"
@@ -39,18 +38,24 @@ extern char any_conflicts;
 extern char *conflicts;
 extern int final_state;
 
-extern void conflict_log();
-extern void verbose_conflict_log();
-extern void print_reductions();
+extern void conflict_log PARAMS((void));
+extern void verbose_conflict_log PARAMS((void));
+extern void print_reductions PARAMS((int));
 
-void print_token();
-void print_state();
-void print_core();
-void print_actions();
-void print_grammar();
+extern void terse PARAMS((void));
+extern void verbose PARAMS((void));
+
+#if 0                           /* XXX currently unused.  */
+static void print_token PARAMS((int, int));
+#endif
+
+static void print_state PARAMS((int));
+static void print_core PARAMS((int));
+static void print_actions PARAMS((int));
+static void print_grammar PARAMS((void));
 
 void
-terse()
+terse (void)
 {
   if (any_conflicts)
     {
@@ -60,7 +65,7 @@ terse()
 
 
 void
-verbose()
+verbose (void)
 {
   register int i;
 
@@ -76,17 +81,17 @@ verbose()
 }
 
 
-void
-print_token(extnum, token)
-int extnum, token;
+#if 0                           /* XXX currently unused.  */
+static void
+print_token (int extnum, int token)
 {
   fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);
 }
+#endif
 
 
-void
-print_state(state)
-int state;
+static void
+print_state (int state)
 {
   fprintf(foutput, _("\n\nstate %d\n\n"), state);
   print_core(state);
@@ -94,9 +99,8 @@ int state;
 }
 
 
-void
-print_core(state)
-int state;
+static void
+print_core (int state)
 {
   register int i;
   register int k;
@@ -141,9 +145,8 @@ int state;
 }
 
 
-void
-print_actions(state)
-int state;
+static void
+print_actions (int state)
 {
   register int i;
   register int k;
@@ -237,13 +240,17 @@ int state;
     }
 }
 
-#define END_TEST(end) \
-  if (column + strlen(buffer) > (end))                                  \
-    { fprintf (foutput, "%s\n   ", buffer); column = 3; buffer[0] = 0; } \
-  else
-
-void
-print_grammar()
+#define END_TEST(end)                          \
+  do {                                         \
+    if (column + strlen(buffer) > (end)) {     \
+      fprintf (foutput, "%s\n   ", buffer);    \
+      column = 3;                              \
+      buffer[0] = 0;                           \
+    }                                          \
+  } while (0)
+
+static void
+print_grammar (void)
 {
   int i, j;
   short* rule;