* src/state.h (nstates, final_state, first_state, first_shift)

(first_reduction): Move their exportation from here...
* src/LR0.h: to here.
Adjust dependencies.
* src/getargs.c (statisticsflag): New variable.
Add support for `--statistics'.
Adjust dependencies.
Remove a lot of now useless `extern' statements in most files.

diff --git a/ChangeLog b/ChangeLog
index 71813192c7db36c6989b8938340762c0eb670e69..9edf81841eec58b5ff016c25f7c2f72d72d16ea8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-10-02  Akim Demaille  <akim@epita.fr>
+
+       * src/state.h (nstates, final_state, first_state, first_shift)
+       (first_reduction): Move their exportation from here...
+       * src/LR0.h: to here.
+       Adjust dependencies.
+       * src/getargs.c (statisticsflag): New variable.
+       Add support for `--statistics'.
+       Adjust dependencies.
+
+       Remove a lot of now useless `extern' statements in most files.
+
+       

 2000-10-02  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.h: New file.
 2000-10-02  Akim Demaille  <akim@epita.fr>
 
        * src/LR0.h: New file.

diff --git a/src/LR0.h b/src/LR0.h
index 30109526488e77d5bc4638e97066bbd91f846768..3ad8b68b0db155cc8f60a0e20699a178b55c685a 100644 (file)
--- a/src/LR0.h
+++ b/src/LR0.h
@@ -21,6 +21,14 @@
 #ifndef LR0_H_
 # define LR0_H_
 
 #ifndef LR0_H_
 # define LR0_H_
 

+# include "state.h"
+

 void generate_states PARAMS ((void));
 
 void generate_states PARAMS ((void));
 

+extern int nstates;
+extern int final_state;
+extern core *first_state;
+extern shifts *first_shift;
+extern reductions *first_reduction;
+

 #endif /* !LR0_H_ */
 #endif /* !LR0_H_ */

diff --git a/src/closure.c b/src/closure.c
index 31073257970bd2b0575fd252b322f90e0bb97054..87ad8c5f5f054abc6e2a24d8bdedaf3bc7ba5da4 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -25,7 +25,6 @@
 #include "closure.h"
 
 extern short **derives;
 #include "closure.h"
 
 extern short **derives;

-extern char **tags;

 
 extern void RTC PARAMS ((unsigned *, int));
 
 
 extern void RTC PARAMS ((unsigned *, int));
 

diff --git a/src/conflicts.c b/src/conflicts.c
index 2ade63da446361bd94121310005e78965ffd473e..d6c31ef6300b6ced765051a3d7d5eba9414c5304 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -26,9 +26,8 @@
 #include "state.h"
 #include "lalr.h"
 #include "conflicts.h"
 #include "state.h"
 #include "lalr.h"
 #include "conflicts.h"

-
-extern char **tags;
-extern int fixed_outfiles;
+#include "reader.h"
+#include "LR0.h"

 
 int any_conflicts = 0;
 errs **err_table;
 
 int any_conflicts = 0;
 errs **err_table;

diff --git a/src/derives.c b/src/derives.c
index 5f8637ca382a59753d710fbe829a74a3f3bd32cb..3c1d3f62b19eb445d15af98cd1d849291ac13655 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -31,7 +31,6 @@
 #include "derives.h"
 
 #if DEBUG
 #include "derives.h"
 
 #if DEBUG

-extern char **tags;

 
 static void
 print_derives (void)
 
 static void
 print_derives (void)

diff --git a/src/files.c b/src/files.c
index dc1573304a817cd3ebc823b9d8caba2188b086fd..3dc9ca5b2a90cc7b202a34a5d20a9b551aa83219 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -74,8 +74,6 @@ static char *tmpdefsfile;
 extern char *mktemp ();                /* So the compiler won't complain */
 extern char *getenv ();
 
 extern char *mktemp ();                /* So the compiler won't complain */
 extern char *getenv ();
 

-int fixed_outfiles = 0;
-

 extern char *program_name;
 \f
 
 extern char *program_name;
 \f
 

diff --git a/src/getargs.c b/src/getargs.c
index de9880b05f393f8f8415197c543817d14f6993f8..fd26b78c8c6664fb7433f5d43db3b81d304efe8c 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -34,14 +34,11 @@ int noparserflag = 0;
 int rawtoknumflag = 0;
 int toknumflag = 0;
 int verboseflag = 0;
 int rawtoknumflag = 0;
 int toknumflag = 0;
 int verboseflag = 0;

-
-extern int fixed_outfiles;/* for -y */
+int statisticsflag = 0;
+int fixed_outfiles = 0;/* for -y */

 
 extern char *program_name;
 
 
 extern char *program_name;
 

-extern void warns PARAMS((char *, char *));    /* main.c */
-extern void getargs PARAMS((int argc, char *[]));
-

 static struct option longopts[] =
 {
   {"debug", 0, &debugflag, 1},
 static struct option longopts[] =
 {
   {"debug", 0, &debugflag, 1},


@@ -59,6 +56,7 @@ static struct option longopts[] =
   {"verbose", 0, &verboseflag, 1},
   {"version", 0, 0, 'V'},
   {"yacc", 0, &fixed_outfiles, 1},
   {"verbose", 0, &verboseflag, 1},
   {"version", 0, 0, 'V'},
   {"yacc", 0, &fixed_outfiles, 1},

+  {"statistics", 0, &statisticsflag, 1},

   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

diff --git a/src/getargs.h b/src/getargs.h
index 3b9e29977553b55dcb805a5e2a623a08e3ce62ff..ae2b04e9135312e3cff95e3a6591b70a61f98c36 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -18,6 +18,9 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 

+#ifndef GETARGS_H_
+# define GETARGS_H_
+

 /* flags set by % directives */
 extern char *spec_file_prefix; /* for -b */
 extern char *spec_name_prefix;         /* for -p */
 /* flags set by % directives */
 extern char *spec_file_prefix; /* for -b */
 extern char *spec_name_prefix;         /* for -p */


@@ -30,5 +33,9 @@ extern int noparserflag;      /* for -n */
 extern int rawtoknumflag;      /* for -r */
 extern int toknumflag;         /* for -k */
 extern int verboseflag;                /* for -v */
 extern int rawtoknumflag;      /* for -r */
 extern int toknumflag;         /* for -k */
 extern int verboseflag;                /* for -v */

+extern int statisticsflag;
+extern int fixed_outfiles;     /* for -y */

 
 void getargs PARAMS ((int argc, char *argv[]));
 
 void getargs PARAMS ((int argc, char *argv[]));

+
+#endif /* !GETARGS_H_ */

diff --git a/src/gram.h b/src/gram.h
index a83dd36feff0ace58e627e68ec707f4691205b91..1b18232055cfec8a4385ff2c1563ec2361542aab 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,79 +1,82 @@
 /* Data definitions for internal representation of bison's input,
    Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
 
 /* Data definitions for internal representation of bison's input,
    Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
 

-This file is part of Bison, the GNU Compiler Compiler.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   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, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 

+#ifndef GRAM_H_
+# define GRAM_H_

 
 /* representation of the grammar rules:
 
 
 /* representation of the grammar rules:
 

-ntokens is the number of tokens, and nvars is the number of variables
-(nonterminals).  nsyms is the total number, ntokens + nvars.
+   ntokens is the number of tokens, and nvars is the number of
+   variables (nonterminals).  nsyms is the total number, ntokens +
+   nvars.

 
 

-       (the true number of token values assigned is ntokens
-       reduced by one for each alias declaration)
+   (the true number of token values assigned is ntokens reduced by one
+   for each alias declaration)

 
 

-Each symbol (either token or variable) receives a symbol number.
-Numbers 0 to ntokens-1 are for tokens, and ntokens to nsyms-1 are for
-variables.  Symbol number zero is the end-of-input token.  This token
-is counted in ntokens.
+   Each symbol (either token or variable) receives a symbol number.
+   Numbers 0 to ntokens-1 are for tokens, and ntokens to nsyms-1 are
+   for variables.  Symbol number zero is the end-of-input token.  This
+   token is counted in ntokens.

 
 

-The rules receive rule numbers 1 to nrules in the order they are written.
-Actions and guards are accessed via the rule number.
+   The rules receive rule numbers 1 to nrules in the order they are
+   written.  Actions and guards are accessed via the rule number.

 
 

-The rules themselves are described by three arrays: rrhs, rlhs and
-ritem.  rlhs[R] is the symbol number of the left hand side of rule R.
-The right hand side is stored as symbol numbers in a portion of
-ritem.  rrhs[R] contains the index in ritem of the beginning of the
-portion for rule R.
+   The rules themselves are described by three arrays: rrhs, rlhs and
+   ritem.  rlhs[R] is the symbol number of the left hand side of rule
+   R.  The right hand side is stored as symbol numbers in a portion of
+   ritem.  rrhs[R] contains the index in ritem of the beginning of the
+   portion for rule R.

 
 

-If rlhs[R] is -1, the rule has been thrown out by reduce.c
-and should be ignored.
+   If rlhs[R] is -1, the rule has been thrown out by reduce.c and
+   should be ignored.

 
 

-The length of the portion is one greater
- than the number of symbols in the rule's right hand side.
-The last element in the portion contains minus R, which
-identifies it as the end of a portion and says which rule it is for.
+   The length of the portion is one greater than the number of symbols
+   in the rule's right hand side.  The last element in the portion
+   contains minus R, which identifies it as the end of a portion and
+   says which rule it is for.

 
 

-The portions of ritem come in order of increasing rule number and are
-followed by an element which is zero to mark the end.  nitems is the
-total length of ritem, not counting the final zero.  Each element of
-ritem is called an "item" and its index in ritem is an item number.
+   The portions of ritem come in order of increasing rule number and
+   are followed by an element which is zero to mark the end.  nitems
+   is the total length of ritem, not counting the final zero.  Each
+   element of ritem is called an "item" and its index in ritem is an
+   item number.

 
 

-Item numbers are used in the finite state machine to represent
-places that parsing can get to.
+   Item numbers are used in the finite state machine to represent
+   places that parsing can get to.

 
 

-Precedence levels are recorded in the vectors sprec and rprec.
-sprec records the precedence level of each symbol,
-rprec the precedence level of each rule.
-rprecsym is the symbol-number of the symbol in %prec for this rule (if any).
+   Precedence levels are recorded in the vectors sprec and rprec.
+   sprec records the precedence level of each symbol, rprec the
+   precedence level of each rule.  rprecsym is the symbol-number of
+   the symbol in %prec for this rule (if any).

 
 

-Precedence levels are assigned in increasing order starting with 1 so
-that numerically higher precedence values mean tighter binding as they
-ought to.  Zero as a symbol or rule's precedence means none is
-assigned.
+   Precedence levels are assigned in increasing order starting with 1
+   so that numerically higher precedence values mean tighter binding
+   as they ought to.  Zero as a symbol or rule's precedence means none
+   is assigned.

 
 

-Associativities are recorded similarly in rassoc and sassoc.  */
+   Associativities are recorded similarly in rassoc and sassoc.  */

 
 
 #define        ISTOKEN(s)      ((s) < ntokens)
 #define        ISVAR(s)        ((s) >= ntokens)
 
 
 
 #define        ISTOKEN(s)      ((s) < ntokens)
 #define        ISVAR(s)        ((s) >= ntokens)
 

-

 extern int nitems;
 extern int nrules;
 extern int nsyms;
 extern int nitems;
 extern int nrules;
 extern int nsyms;


@@ -99,28 +102,29 @@ extern int start_symbol;
 #define LEFT_ASSOC 2
 #define NON_ASSOC 3
 
 #define LEFT_ASSOC 2
 #define NON_ASSOC 3
 

-/* token translation table:
-indexed by a token number as returned by the user's yylex routine,
-it yields the internal token number used by the parser and throughout bison.
-If translations is zero, the translation table is not used because
-the two kinds of token numbers are the same.  
-(It is noted in reader.c that "Nowadays translations is always set to 1...")
-*/
+/* token translation table: indexed by a token number as returned by
+   the user's yylex routine, it yields the internal token number used
+   by the parser and throughout bison.  If translations is zero, the
+   translation table is not used because the two kinds of token
+   numbers are the same.  (It is noted in reader.c that "Nowadays
+   translations is always set to 1...") */

 
 extern short *token_translations;
 extern int translations;
 extern int max_user_token_number;
 
 
 extern short *token_translations;
 extern int translations;
 extern int max_user_token_number;
 

-/* semantic_parser is nonzero if the input file says to use the hairy parser
-that provides for semantic error recovery.  If it is zero, the yacc-compatible
-simplified parser is used.  */
+/* SEMANTIC_PARSER is nonzero if the input file says to use the hairy
+   parser that provides for semantic error recovery.  If it is zero,
+   the yacc-compatible simplified parser is used.  */

 
 extern int semantic_parser;
 
 
 extern int semantic_parser;
 

-/* pure_parser is nonzero if should generate a parser that is all pure and reentrant. */
+/* PURE_PARSER is nonzero if should generate a parser that is all pure
+   and reentrant.  */

 
 extern int pure_parser;
 
 
 extern int pure_parser;
 

-/* error_token_number is the token number of the error token.  */
+/* ERROR_TOKEN_NUMBER is the token number of the error token.  */

 
 extern int error_token_number;
 
 extern int error_token_number;

+#endif /* !GRAM_H_ */

diff --git a/src/lalr.c b/src/lalr.c
index 8e83de90ae15bae2c74384539955ca50b2c48cda..742ff6040bbd6d1c7ea5f3d56c59d42be3584ed1 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
 #include "types.h"
 
 #include "system.h"
 #include "types.h"

-#include "state.h"
+#include "LR0.h"

 #include "alloc.h"
 #include "gram.h"
 #include "complain.h"
 #include "alloc.h"
 #include "gram.h"
 #include "complain.h"

diff --git a/src/lex.c b/src/lex.c
index a10c872fca04a54cbf360349fd851e8b05dfb09b..27df7f1af1538ef0b0c4db1b9523b0e0bc314008 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -26,10 +26,10 @@
 #include "lex.h"
 #include "alloc.h"
 #include "complain.h"
 #include "lex.h"
 #include "alloc.h"
 #include "complain.h"

+#include "gram.h"

 
 /*spec_outfile is declared in files.h, for -o */
 
 
 /*spec_outfile is declared in files.h, for -o */
 

-extern int translations;

 
 /* functions from main.c */
 extern char *printable_version PARAMS ((int));
 
 /* functions from main.c */
 extern char *printable_version PARAMS ((int));

diff --git a/src/output.c b/src/output.c
index 54955b6215caf4a02e20f1d6ccb5fcd137fe808c..214300dba129b94325c56a9844d6c300b07ed984 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -95,7 +95,7 @@
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"

-#include "state.h"
+#include "LR0.h"

 #include "complain.h"
 #include "output.h"
 #include "lalr.h"
 #include "complain.h"
 #include "output.h"
 #include "lalr.h"


@@ -104,9 +104,6 @@
 
 extern void berror PARAMS((const char *));
 
 
 extern void berror PARAMS((const char *));
 

-extern char **tags;
-extern short *user_toknums;
-extern int final_state;

 
 
 static int nvectors;
 
 
 static int nvectors;

diff --git a/src/print.c b/src/print.c
index bf3fce87f05a661dadee565eee472a5d7c447904..9a8485370ad7f16ef71696fdb37e67f5496bbe81 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -23,14 +23,13 @@
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"
 #include "alloc.h"
 #include "files.h"
 #include "gram.h"

-#include "state.h"
+#include "LR0.h"

 #include "lalr.h"
 #include "conflicts.h"
 #include "getargs.h"
 #include "state.h"
 #include "lalr.h"
 #include "conflicts.h"
 #include "getargs.h"
 #include "state.h"

+#include "reader.h"

 
 

-extern char **tags;
-extern int final_state;

 
 #if 0
 static void
 
 #if 0
 static void

diff --git a/src/reader.c b/src/reader.c
index cb297c4c0e60e977af3951ddc9603c902fea5a0d..c89313e2baf123c27a04f1928e57c19d792b8a48 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -29,6 +29,17 @@
 #include "gram.h"
 #include "complain.h"
 #include "output.h"
 #include "gram.h"
 #include "complain.h"
 #include "output.h"

+#include "reader.h"
+
+extern bucket *symval;
+extern int numval;
+extern int expected_conflicts;
+extern char *token_buffer;
+extern int maxtoken;
+
+extern void tabinit PARAMS ((void));
+extern void free_symtab PARAMS ((void));
+extern char *printable_version PARAMS ((int));

 
 #define        LTYPESTR        "\
 \n\
 
 #define        LTYPESTR        "\
 \n\


@@ -55,16 +66,6 @@ typedef\n\
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 static int rline_allocated;
 
 /* Number of slots allocated (but not necessarily used yet) in `rline'  */
 static int rline_allocated;
 

-extern bucket *symval;
-extern int numval;
-extern int expected_conflicts;
-extern char *token_buffer;
-extern int maxtoken;
-
-extern void tabinit PARAMS ((void));
-extern void free_symtab PARAMS ((void));
-extern char *printable_version PARAMS ((int));
-

 typedef struct symbol_list
 {
   struct symbol_list *next;
 typedef struct symbol_list
 {
   struct symbol_list *next;


@@ -73,10 +74,6 @@ typedef struct symbol_list
 }
 symbol_list;
 
 }
 symbol_list;
 

-
-extern void reader PARAMS ((void));
-extern void reader_output_yylsp PARAMS ((FILE *));
-

 int lineno;
 char **tags;
 short *user_toknums;
 int lineno;
 char **tags;
 short *user_toknums;


@@ -1667,7 +1664,7 @@ output_token_defines (FILE *file)
 
 /*------------------------------------------------------------------.
 | Assign symbol numbers, and write definition of token names into   |
 
 /*------------------------------------------------------------------.
 | Assign symbol numbers, and write definition of token names into   |

-| fdefines.  Set up vectors tags and sprec of names and precedences |
+| FDEFINES.  Set up vectors TAGS and SPREC of names and precedences |

 | of symbols.                                                       |
 `------------------------------------------------------------------*/
 
 | of symbols.                                                       |
 `------------------------------------------------------------------*/
 

diff --git a/src/reduce.c b/src/reduce.c
index d160f9d6f134322439cc7b85dd54a15430d23a6e..8175f29f313c83212537c117f542546688d43c94 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -32,10 +32,8 @@
 #include "alloc.h"
 #include "complain.h"
 #include "reduce.h"
 #include "alloc.h"
 #include "complain.h"
 #include "reduce.h"

-
-extern char **tags;            /* reader.c */
-static int statisticsflag;     /* XXXXXXX */
-extern int fixed_outfiles;
+#include "reader.h"
+#include "getargs.h"

 
 typedef unsigned *BSet;
 typedef short *rule;
 
 typedef unsigned *BSet;
 typedef short *rule;


@@ -545,8 +543,8 @@ reduce_grammar (void)
       dump_grammar ();
     }
 #endif
       dump_grammar ();
     }
 #endif

-  statisticsflag = FALSE;      /* someday getopts should handle this */
-  if (statisticsflag == TRUE)
+
+  if (statisticsflag)

     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,
     fprintf (stderr, _("reduced %s defines %d terminal%s, %d nonterminal%s\
 , and %d production%s.\n"),
             infile,

diff --git a/src/state.h b/src/state.h
index 43e6809b4aaa519de342f35345dc9b2a2ee64f7b..615c7d5cefe160f39304c8f5883e321ba5d6c8c4 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -130,9 +130,4 @@ typedef struct reductions
 }
 reductions;
 
 }
 reductions;
 

-extern int nstates;
-extern core *first_state;
-extern shifts *first_shift;
-extern reductions *first_reduction;
-

 #endif /* !STATE_H_ */
 #endif /* !STATE_H_ */