OS/2 Shareware BBS: 22 gnu/22-gnu.zip/BYACC.ZIP/DIFF

Text File | 1992-06-10 | 61KB | 3,632 lines

*** 1.1    1992/06/10 21:55:08
--- defs.h    1992/03/16 18:57:22
***************
*** 24,30 ****
  #define    MAXSHORT    32767
  #define MINSHORT    -32768
  #define MAXTABLE    32500
! #define BITS_PER_WORD    32
  #define    WORDSIZE(n)    (((n)+(BITS_PER_WORD-1))/BITS_PER_WORD)
  #define    ROWSIZE(n)    (sizeof(unsigned)*WORDSIZE(n))
  #define    BIT(r, n)    ((((r)[(n) >> 5]) >> ((n) & 31)) & 1)
--- 24,30 ----
  #define    MAXSHORT    32767
  #define MINSHORT    -32768
  #define MAXTABLE    32500
! #define BITS_PER_WORD   16
  #define    WORDSIZE(n)    (((n)+(BITS_PER_WORD-1))/BITS_PER_WORD)
  #define    ROWSIZE(n)    (sizeof(unsigned)*WORDSIZE(n))
  #define    BIT(r, n)    ((((r)[(n) >> 5]) >> ((n) & 31)) & 1)
***************
*** 48,55 ****

  /* defines for constructing filenames */

! #define    DEFINES_SUFFIX    ".tab.h"
! #define    OUTPUT_SUFFIX    ".tab.c"
  #define    VERBOSE_SUFFIX    ".output"


--- 48,55 ----

  /* defines for constructing filenames */

! #define DEFINES_SUFFIX  "tab.h"
! #define OUTPUT_SUFFIX   "tab.c"
  #define    VERBOSE_SUFFIX    ".output"


***************
*** 273,285 ****

  /* system variables */

! extern int errno;


  /* system functions */

  extern void free();
! extern char *calloc();
! extern char *malloc();
! extern char *realloc();
! extern char *strcpy();
--- 273,285 ----

  /* system variables */

! /*extern int errno;*/


  /* system functions */

  extern void free();
! /*extern char *calloc();*/
! /*extern char *malloc();*/
! /*extern char *realloc();*/
! /*extern char *strcpy();*/
*** 1.1    1992/06/10 21:55:08
--- symtab.h    1992/03/16 18:57:30
***************
*** 1,37 ****
! #ifndef    SYMTAB
! #define    SYMTAB
!
! #define    UNKNOWN        0
! #define    TERMINAL    1
! #define    NONTERMINAL    2
!
! /* WARNING:  In addition to its internal use, UNDEFINED is also the default */
! /*         value of the error token.                        */
! #define UNDEFINED    (-1)
!
! typedef
!   struct bucket
!     {
!       struct bucket *left;
!       struct bucket *right;
!       struct bucket *next;
!       int length;
!       char *key;
!       char *tag;
!       char *prname;
!       short index;
!       short value;
!       short prec;
!       char form;
!       char class;
!       char assoc;
!       char used;
!     }
!   bucket;
!
! extern bucket *first_symbol;
! extern bucket *lookup();
! extern bucket *make_bucket();
! extern char *mk_prname();
!
! #endif
--- 1,6 ----
! int  hash(char  *name);
! struct  bucket *make_bucket(char  *name);
! struct  bucket *lookup(char  *name);
! void  create_symbol_table(void);
! void  free_symbol_table(void);
! void  free_symbols(void);
*** 1.1    1992/06/10 21:55:08
--- symtab.c    1992/03/16 18:55:54
***************
*** 1,6 ****
! #include "defs.h"

-
  /* TABLE_SIZE is the number of entries in the symbol table. */
  /* TABLE_SIZE must be a power of two.                */

--- 1,7 ----
! #include <stdlib.h>
! #include <string.h>
! #include "byacc.h"

  /* TABLE_SIZE is the number of entries in the symbol table. */
  /* TABLE_SIZE must be a power of two.                */

***************
*** 13,20 ****


  int
! hash(name)
! char *name;
  {
      register char *s;
      register int c, k;
--- 14,20 ----


  int
! hash(char *name)
  {
      register char *s;
      register int c, k;
***************
*** 30,37 ****


  bucket *
! make_bucket(name)
! char *name;
  {
      register bucket *bp;

--- 30,36 ----


  bucket *
! make_bucket(char *name)
  {
      register bucket *bp;

***************
*** 56,63 ****


  bucket *
! lookup(name)
! char *name;
  {
      register bucket *bp, **bpp;

--- 55,61 ----


  bucket *
! lookup(char *name)
  {
      register bucket *bp, **bpp;

***************
*** 78,85 ****
      return (bp);
  }

!
! create_symbol_table()
  {
      register int i;
      register bucket *bp;
--- 76,83 ----
      return (bp);
  }

! void
! create_symbol_table(void)
  {
      register int i;
      register bucket *bp;
***************
*** 97,111 ****
      symbol_table[hash("error")] = bp;
  }

!
! free_symbol_table()
  {
      FREE(symbol_table);
      symbol_table = 0;
  }

!
! free_symbols()
  {
      register bucket *p, *q;

--- 95,109 ----
      symbol_table[hash("error")] = bp;
  }

! void
! free_symbol_table(void)
  {
      FREE(symbol_table);
      symbol_table = 0;
  }

! void
! free_symbols(void)
  {
      register bucket *p, *q;

*** 1.1    1992/06/10 21:55:08
--- warshall.c    1992/03/16 18:55:56
***************
*** 1,8 ****
! #include "defs.h"

! transitive_closure(R, n)
! unsigned *R;
! int n;
  {
    register int rowsize;
    register unsigned mask;
--- 1,8 ----
! #include <stdlib.h>
! #include "byacc.h"

! void
! transitive_closure(unsigned *R, int n)
  {
    register int rowsize;
    register unsigned mask;
***************
*** 16,22 ****
    unsigned *rowi;

    rowsize = ROWSIZE(n);
!   relend = (unsigned *) ((unsigned) R + n*rowsize);

    cword = R;
    mask = 1;
--- 16,22 ----
    unsigned *rowi;

    rowsize = ROWSIZE(n);
!   relend = (unsigned *) ((char *) R + n*rowsize);

    cword = R;
    mask = 1;
***************
*** 31,37 ****
        if (*ccol & mask)
          {
            rp = rowi;
!           rend = (unsigned *) ((unsigned) rowj + rowsize);

            while (rowj < rend)
          *rowj++ |= *rp++;
--- 31,37 ----
        if (*ccol & mask)
          {
            rp = rowi;
!           rend = (unsigned *) ((char*) rowj + rowsize);

            while (rowj < rend)
          *rowj++ |= *rp++;
***************
*** 38,47 ****
          }
        else
          {
!           rowj = (unsigned *) ((unsigned) rowj + rowsize);
          }

!       ccol = (unsigned *) ((unsigned) ccol + rowsize);
      }

        mask <<= 1;
--- 38,47 ----
          }
        else
          {
!           rowj = (unsigned *) ((char*) rowj + rowsize);
          }

!       ccol = (unsigned *) ((char*) ccol + rowsize);
      }

        mask <<= 1;
***************
*** 51,63 ****
        cword++;
      }

!       rowi = (unsigned *) ((unsigned) rowi + rowsize);
      }
  }

! reflexive_transitive_closure(R, n)
! unsigned *R;
! int n;
  {
    register int rowsize;
    register unsigned mask;
--- 51,62 ----
        cword++;
      }

!       rowi = (unsigned *) ((char*) rowi + rowsize);
      }
  }

! void
! reflexive_transitive_closure(unsigned * R, int n)
  {
    register int rowsize;
    register unsigned mask;
***************
*** 67,73 ****
    transitive_closure(R, n);

    rowsize = ROWSIZE(n);
!   relend = (unsigned *) ((unsigned) R + n*rowsize);

    mask = 1;
    rp = R;
--- 66,72 ----
    transitive_closure(R, n);

    rowsize = ROWSIZE(n);
!   relend = (unsigned *) ((char*) R + n*rowsize);

    mask = 1;
    rp = R;
***************
*** 82,87 ****
        rp++;
      }

!       rp = (unsigned *) ((unsigned) rp + rowsize);
      }
  }
--- 81,86 ----
        rp++;
      }

!       rp = (unsigned *) ((char*) rp + rowsize);
      }
  }
*** 1.1    1992/06/10 21:55:08
--- closure.c    1992/03/16 18:55:58
***************
*** 1,4 ****
! #include "defs.h"

  short *itemset;
  short *itemsetend;
--- 1,5 ----
! #include <stdlib.h>
! #include "byacc.h"

  short *itemset;
  short *itemsetend;
***************
*** 8,14 ****
  static unsigned *EFF;


! set_EFF()
  {
      register unsigned *row;
      register int symbol;
--- 9,15 ----
  static unsigned *EFF;


! void set_EFF(void)
  {
      register unsigned *row;
      register int symbol;
***************
*** 44,50 ****
  }


! set_first_derives()
  {
    register unsigned *rrow;
    register unsigned *vrow;
--- 45,51 ----
  }


! void set_first_derives(void)
  {
    register unsigned *rrow;
    register unsigned *vrow;
***************
*** 101,109 ****
  }


! closure(core, n)
! short *core;
! int n;
  {
      register int ruleno;
      register unsigned word;
--- 102,108 ----
  }


! void closure(short *core, int n)
  {
      register int ruleno;
      register unsigned word;
***************
*** 176,182 ****



! finalize_closure()
  {
    FREE(itemset);
    FREE(ruleset);
--- 175,181 ----



! void finalize_closure(void)
  {
    FREE(itemset);
    FREE(ruleset);
***************
*** 185,193 ****


  #ifdef    DEBUG
!
! print_closure(n)
! int n;
  {
    register short *isp;

--- 184,191 ----


  #ifdef    DEBUG
! void
! print_closure(int n)
  {
    register short *isp;

***************
*** 196,203 ****
      printf("   %d\n", *isp);
  }

!
! print_EFF()
  {
      register int i, j, k;
      register unsigned *rowp;
--- 194,201 ----
      printf("   %d\n", *isp);
  }

! void
! print_EFF(void)
  {
      register int i, j, k;
      register unsigned *rowp;
***************
*** 228,235 ****
      }
  }

!
! print_first_derives()
  {
    register int i;
    register int j;
--- 226,233 ----
      }
  }

! void
! print_first_derives(void)
  {
    register int i;
    register int j;
*** 1.1    1992/06/10 21:55:08
--- skeleton.c    1992/03/16 18:56:00
***************
*** 1,4 ****
! #include "defs.h"

  /*  The three line banner used here should be replaced with a one line    */
  /*  #ident directive if the target C compiler supports #ident        */
--- 1,5 ----
! #include <stdlib.h>
! #include "byacc.h"

  /*  The three line banner used here should be replaced with a one line    */
  /*  #ident directive if the target C compiler supports #ident        */
***************
*** 252,260 ****
      0
  };

!
! write_section(section)
! char *section[];
  {
      register int i;

--- 253,260 ----
      0
  };

! void
! write_section(char **section)
  {
      register int i;

*** 1.1    1992/06/10 21:55:08
--- lalr.c    1992/03/16 18:56:02
***************
*** 1,4 ****
! #include "defs.h"

  typedef
    struct shorts
--- 1,5 ----
! #include <stdlib.h>
! #include "byacc.h"

  typedef
    struct shorts
***************
*** 34,40 ****
  static int top;


! lalr()
  {
      tokensetsize = WORDSIZE(ntokens);

--- 35,41 ----
  static int top;


! void lalr(void)
  {
      tokensetsize = WORDSIZE(ntokens);

***************
*** 53,59 ****



! set_state_table()
  {
      register core *sp;

--- 54,60 ----



! void set_state_table(void)
  {
      register core *sp;

***************
*** 64,70 ****



! set_accessing_symbol()
  {
      register core *sp;

--- 65,71 ----



! void set_accessing_symbol(void)
  {
      register core *sp;

***************
*** 75,81 ****



! set_shift_table()
  {
      register shifts *sp;

--- 76,82 ----



! void set_shift_table(void)
  {
      register shifts *sp;

***************
*** 86,92 ****



! set_reduction_table()
  {
      register reductions *rp;

--- 87,93 ----



! void set_reduction_table(void)
  {
      register reductions *rp;

***************
*** 97,103 ****



! set_maxrhs()
  {
    register short *itemp;
    register short *item_end;
--- 98,104 ----



! void set_maxrhs(void)
  {
    register short *itemp;
    register short *item_end;
***************
*** 125,131 ****



! initialize_LA()
  {
    register int i, j, k;
    register reductions *rp;
--- 126,132 ----



! void initialize_LA(void)
  {
    register int i, j, k;
    register reductions *rp;
***************
*** 162,168 ****
  }


! set_goto_map()
  {
    register shifts *sp;
    register int i;
--- 163,169 ----
  }


! void set_goto_map(void)
  {
    register shifts *sp;
    register int i;
***************
*** 232,240 ****
  /*  Map_goto maps a state/symbol pair into its numeric representation.    */

  int
! map_goto(state, symbol)
! int state;
! int symbol;
  {
      register int high;
      register int low;
--- 233,239 ----
  /*  Map_goto maps a state/symbol pair into its numeric representation.    */

  int
! map_goto(int state, int symbol)
  {
      register int high;
      register int low;
***************
*** 260,266 ****



! initialize_F()
  {
    register int i;
    register int j;
--- 259,265 ----



! void initialize_F(void)
  {
    register int i;
    register int j;
***************
*** 337,343 ****



! build_relations()
  {
    register int i;
    register int j;
--- 336,342 ----



! void build_relations(void)
  {
    register int i;
    register int j;
***************
*** 428,435 ****
  }


! add_lookback_edge(stateno, ruleno, gotono)
! int stateno, ruleno, gotono;
  {
      register int i, k;
      register int found;
--- 427,433 ----
  }


! void add_lookback_edge(int stateno, int ruleno, int gotono)
  {
      register int i, k;
      register int found;
***************
*** 456,464 ****


  short **
! transpose(R, n)
! short **R;
! int n;
  {
    register short **new_R;
    register short **temp_R;
--- 454,460 ----


  short **
! transpose( short**R, int n)
  {
    register short **new_R;
    register short **temp_R;
***************
*** 513,525 ****



! compute_FOLLOWS()
  {
    digraph(includes);
  }


! compute_lookaheads()
  {
    register int i, n;
    register unsigned *fp1, *fp2, *fp3;
--- 509,521 ----



! void compute_FOLLOWS(void )
  {
    digraph(includes);
  }


! void compute_lookaheads(void)
  {
    register int i, n;
    register unsigned *fp1, *fp2, *fp3;
***************
*** 550,557 ****
  }


! digraph(relation)
! short **relation;
  {
    register int i;

--- 546,552 ----
  }


! void digraph(short ** relation)
  {
    register int i;

***************
*** 577,584 ****



! traverse(i)
! register int i;
  {
    register unsigned *fp1;
    register unsigned *fp2;
--- 572,578 ----



! void traverse(register int i)
  {
    register unsigned *fp1;
    register unsigned *fp2;
*** 1.1    1992/06/10 21:55:08
--- error.c    1992/03/18 21:13:52
***************
*** 1,10 ****
  /* routines for printing error messages  */

! #include "defs.h"

!
! fatal(msg)
! char *msg;
  {
      fprintf(stderr, "%s: f - %s\n", myname, msg);
      done(2);
--- 1,9 ----
  /* routines for printing error messages  */
+ #include <stdlib.h>

! #include "byacc.h"

! void fatal(char *msg)
  {
      fprintf(stderr, "%s: f - %s\n", myname, msg);
      done(2);
***************
*** 11,26 ****
  }


! no_space()
  {
-     abort();
      fprintf(stderr, "%s: f - out of space\n", myname);
      done(2);
  }


! open_error(filename)
! char *filename;
  {
      fprintf(stderr, "%s: f - cannot open \"%s\"\n", myname, filename);
      done(2);
--- 10,24 ----
  }


! void no_space(void)
  {
      fprintf(stderr, "%s: f - out of space\n", myname);
+     abort();
      done(2);
  }


! void open_error(char *filename)
  {
      fprintf(stderr, "%s: f - cannot open \"%s\"\n", myname, filename);
      done(2);
***************
*** 27,33 ****
  }


! unexpected_EOF()
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unexpected end-of-file\n",
          myname, lineno, input_file_name);
--- 25,31 ----
  }


! void unexpected_EOF(void)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unexpected end-of-file\n",
          myname, lineno, input_file_name);
***************
*** 35,43 ****
  }


! print_pos(st_line, st_cptr)
! char *st_line;
! char *st_cptr;
  {
      register char *s;

--- 33,39 ----
  }


! void print_pos(char *st_line, char *st_cptr)
  {
      register char *s;

***************
*** 62,71 ****
  }


! syntax_error(st_lineno, st_line, st_cptr)
! int st_lineno;
! char *st_line;
! char *st_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", syntax error\n",
          myname, st_lineno, input_file_name);
--- 58,64 ----
  }


! void syntax_error(int st_lineno, char *st_line, char *st_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", syntax error\n",
          myname, st_lineno, input_file_name);
***************
*** 74,83 ****
  }


! unterminated_comment(c_lineno, c_line, c_cptr)
! int c_lineno;
! char *c_line;
! char *c_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unmatched /*\n",
          myname, c_lineno, input_file_name);
--- 67,73 ----
  }


! void unterminated_comment(int c_lineno, char * c_line, char * c_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unmatched /*\n",
          myname, c_lineno, input_file_name);
***************
*** 86,95 ****
  }


! unterminated_string(s_lineno, s_line, s_cptr)
! int s_lineno;
! char *s_line;
! char *s_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated string\n",
          myname, s_lineno, input_file_name);
--- 76,82 ----
  }


! void unterminated_string(int s_lineno, char * s_line, char * s_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated string\n",
          myname, s_lineno, input_file_name);
***************
*** 98,107 ****
  }


! unterminated_text(t_lineno, t_line, t_cptr)
! int t_lineno;
! char *t_line;
! char *t_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unmatched %%{\n",
          myname, t_lineno, input_file_name);
--- 85,91 ----
  }


! void unterminated_text(int t_lineno, char * t_line, char * t_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unmatched %%{\n",
          myname, t_lineno, input_file_name);
***************
*** 110,119 ****
  }


! unterminated_union(u_lineno, u_line, u_cptr)
! int u_lineno;
! char *u_line;
! char *u_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated %%union \
  declaration\n", myname, u_lineno, input_file_name);
--- 94,100 ----
  }


! void unterminated_union(int u_lineno, char * u_line, char * u_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated %%union \
  declaration\n", myname, u_lineno, input_file_name);
***************
*** 122,129 ****
  }


! over_unionized(u_cptr)
! char *u_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", too many %%union \
  declarations\n", myname, lineno, input_file_name);
--- 103,109 ----
  }


! void over_unionized(char * u_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", too many %%union \
  declarations\n", myname, lineno, input_file_name);
***************
*** 132,141 ****
  }


! illegal_tag(t_lineno, t_line, t_cptr)
! int t_lineno;
! char *t_line;
! char *t_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal tag\n",
          myname, t_lineno, input_file_name);
--- 112,118 ----
  }


! void illegal_tag(int t_lineno, char * t_line, char * t_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal tag\n",
          myname, t_lineno, input_file_name);
***************
*** 144,151 ****
  }


! illegal_character(c_cptr)
! char *c_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal character\n",
          myname, lineno, input_file_name);
--- 121,127 ----
  }


! void illegal_character(char * c_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal character\n",
          myname, lineno, input_file_name);
***************
*** 154,161 ****
  }


! used_reserved(s)
! char *s;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal use of reserved symbol \
  %s\n", myname, lineno, input_file_name, s);
--- 130,136 ----
  }


! void used_reserved(char * s)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal use of reserved symbol \
  %s\n", myname, lineno, input_file_name, s);
***************
*** 163,170 ****
  }


! tokenized_start(s)
! char *s;
  {
       fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s cannot be \
  declared to be a token\n", myname, lineno, input_file_name, s);
--- 138,144 ----
  }


! void tokenized_start(char * s)
  {
       fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s cannot be \
  declared to be a token\n", myname, lineno, input_file_name, s);
***************
*** 172,179 ****
  }


! retyped_warning(s)
! char *s;
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the type of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
--- 146,152 ----
  }


! void retyped_warning(char * s)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the type of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
***************
*** 180,187 ****
  }


! reprec_warning(s)
! char *s;
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the precedence of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
--- 153,159 ----
  }


! void reprec_warning(char * s)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the precedence of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
***************
*** 188,195 ****
  }


! revalued_warning(s)
! char *s;
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the value of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
--- 160,166 ----
  }


! void revalued_warning(char *s)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the value of %s has been \
  redeclared\n", myname, lineno, input_file_name, s);
***************
*** 196,203 ****
  }


! terminal_start(s)
! char *s;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s is a \
  token\n", myname, lineno, input_file_name, s);
--- 167,173 ----
  }


! void terminal_start(char *s)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s is a \
  token\n", myname, lineno, input_file_name, s);
***************
*** 205,211 ****
  }


! restarted_warning()
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the start symbol has been \
  redeclared\n", myname, lineno, input_file_name);
--- 175,181 ----
  }


! void restarted_warning(void)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the start symbol has been \
  redeclared\n", myname, lineno, input_file_name);
***************
*** 212,218 ****
  }


! no_grammar()
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", no grammar has been \
  specified\n", myname, lineno, input_file_name);
--- 182,188 ----
  }


! void no_grammar(void)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", no grammar has been \
  specified\n", myname, lineno, input_file_name);
***************
*** 220,227 ****
  }


! terminal_lhs(s_lineno)
! int s_lineno;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", a token appears on the lhs \
  of a production\n", myname, s_lineno, input_file_name);
--- 190,196 ----
  }


! void terminal_lhs(int s_lineno)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", a token appears on the lhs \
  of a production\n", myname, s_lineno, input_file_name);
***************
*** 229,235 ****
  }


! prec_redeclared()
  {
      fprintf(stderr, "%s: w - line %d of  \"%s\", conflicting %%prec \
  specifiers\n", myname, lineno, input_file_name);
--- 198,204 ----
  }


! void prec_redeclared(void )
  {
      fprintf(stderr, "%s: w - line %d of  \"%s\", conflicting %%prec \
  specifiers\n", myname, lineno, input_file_name);
***************
*** 236,245 ****
  }


! unterminated_action(a_lineno, a_line, a_cptr)
! int a_lineno;
! char *a_line;
! char *a_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated action\n",
          myname, a_lineno, input_file_name);
--- 205,211 ----
  }


! void unterminated_action(int a_lineno, char * a_line, char * a_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", unterminated action\n",
          myname, a_lineno, input_file_name);
***************
*** 248,256 ****
  }


! dollar_warning(a_lineno, i)
! int a_lineno;
! int i;
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", $%d references beyond the \
  end of the current rule\n", myname, a_lineno, input_file_name, i);
--- 214,220 ----
  }


! void dollar_warning(int a_lineno, int i)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", $%d references beyond the \
  end of the current rule\n", myname, a_lineno, input_file_name, i);
***************
*** 257,266 ****
  }


! dollar_error(a_lineno, a_line, a_cptr)
! int a_lineno;
! char *a_line;
! char *a_cptr;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal $-name\n",
          myname, a_lineno, input_file_name);
--- 221,227 ----
  }


! void dollar_error(int a_lineno, char * a_line, char * a_cptr)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", illegal $-name\n",
          myname, a_lineno, input_file_name);
***************
*** 269,275 ****
  }


! untyped_lhs()
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $$ is untyped\n",
          myname, lineno, input_file_name);
--- 230,236 ----
  }


! void untyped_lhs(void)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $$ is untyped\n",
          myname, lineno, input_file_name);
***************
*** 277,285 ****
  }


! untyped_rhs(i, s)
! int i;
! char *s;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $%d (%s) is untyped\n",
          myname, lineno, input_file_name, i, s);
--- 238,244 ----
  }


! void untyped_rhs(int i, char *s)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $%d (%s) is untyped\n",
          myname, lineno, input_file_name, i, s);
***************
*** 287,294 ****
  }


! unknown_rhs(i)
! int i;
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $%d is untyped\n",
          myname, lineno, input_file_name, i);
--- 246,252 ----
  }


! void unknown_rhs(int i)
  {
      fprintf(stderr, "%s: e - line %d of \"%s\", $%d is untyped\n",
          myname, lineno, input_file_name, i);
***************
*** 296,302 ****
  }


! default_action_warning()
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the default action assigns an \
  undefined value to $$\n", myname, lineno, input_file_name);
--- 254,260 ----
  }


! void default_action_warning(void)
  {
      fprintf(stderr, "%s: w - line %d of \"%s\", the default action assigns an \
  undefined value to $$\n", myname, lineno, input_file_name);
***************
*** 303,310 ****
  }


! undefined_goal(s)
! char *s;
  {
      fprintf(stderr, "%s: e - the start symbol %s is undefined\n", myname, s);
      done(1);
--- 261,267 ----
  }


! void undefined_goal(char *s)
  {
      fprintf(stderr, "%s: e - the start symbol %s is undefined\n", myname, s);
      done(1);
***************
*** 311,318 ****
  }


! undefined_symbol_warning(s)
! char *s;
  {
      fprintf(stderr, "%s: w - the symbol %s is undefined\n", myname, s);
  }
--- 268,274 ----
  }


! void undefined_symbol_warning(char * s)
  {
      fprintf(stderr, "%s: w - the symbol %s is undefined\n", myname, s);
  }
*** 1.1    1992/06/10 21:55:08
--- main.c    1992/03/16 18:56:12
***************
*** 1,5 ****
  #include <signal.h>
! #include "defs.h"

  char dflag;
  char lflag;
--- 1,8 ----
  #include <signal.h>
! #include <stdlib.h>
! #include <string.h>
! #include <io.h>
! #include "byacc.h"

  char dflag;
  char lflag;
***************
*** 8,14 ****

  char *prefix = "y";
  char *myname = "yacc";
! char *temp_form = "yacc.XXXXXXX";

  int lineno;
  int outline;
--- 11,17 ----

  char *prefix = "y";
  char *myname = "yacc";
! char *temp_form = "ycXXXXXX";

  int lineno;
  int outline;
***************
*** 57,64 ****
  extern char *getenv();


! done(k)
! int k;
  {
      if (action_file) unlink(action_file_name);
      if (text_file) unlink(text_file_name);
--- 60,66 ----
  extern char *getenv();


! void done(int k)
  {
      if (action_file) unlink(action_file_name);
      if (text_file) unlink(text_file_name);
***************
*** 67,79 ****
  }


! onintr()
  {
      done(1);
  }


! set_signals()
  {
      if (signal(SIGINT, SIG_IGN) == SIG_IGN)
      signal(SIGINT, onintr);
--- 69,81 ----
  }


! void onintr(void)
  {
      done(1);
  }


! void set_signals(void)
  {
      if (signal(SIGINT, SIG_IGN) == SIG_IGN)
      signal(SIGINT, onintr);
***************
*** 82,88 ****
  }


! usage()
  {
      fprintf(stderr, "usage: %s [-dltv] [-b prefix] filename\n", myname);
      exit(1);
--- 84,90 ----
  }


! void usage(void)
  {
      fprintf(stderr, "usage: %s [-dltv] [-b prefix] filename\n", myname);
      exit(1);
***************
*** 89,97 ****
  }


! getargs(argc, argv)
! int argc;
! char *argv[];
  {
      register int i;
      register char *s;
--- 91,97 ----
  }


! void getargs(int argc, char ** argv)
  {
      register int i;
      register char *s;
***************
*** 174,181 ****


  char *
! allocate(n)
! unsigned n;
  {
      register char *p;

--- 174,180 ----


  char *
! allocate(unsigned n)
  {
      register char *p;

***************
*** 185,191 ****
  }


! create_file_names()
  {
      int i, len;
      char *tmpdir;
--- 184,190 ----
  }


! void create_file_names(void)
  {
      int i, len;
      char *tmpdir;
***************
*** 227,235 ****
      strcpy(text_file_name + len, temp_form);
      strcpy(union_file_name + len, temp_form);

!     action_file_name[len + 5] = 'a';
!     text_file_name[len + 5] = 't';
!     union_file_name[len + 5] = 'u';

      mktemp(action_file_name);
      mktemp(text_file_name);
--- 226,234 ----
      strcpy(text_file_name + len, temp_form);
      strcpy(union_file_name + len, temp_form);

!     action_file_name[len + 2] = 'a';
!     text_file_name[len + 2] = 't';
!     union_file_name[len + 2] = 'u';

      mktemp(action_file_name);
      mktemp(text_file_name);
***************
*** 261,267 ****
  }


! open_files()
  {
      create_file_names();

--- 260,266 ----
  }


! void open_files(void)
  {
      create_file_names();

***************
*** 297,305 ****


  int
! main(argc, argv)
! int argc;
! char *argv[];
  {
      register int c;

--- 296,302 ----


  int
! main(int argc, char **argv)
  {
      register int c;

*** 1.1    1992/06/10 21:55:08
--- mkpar.c    1992/03/16 18:56:14
***************
*** 1,4 ****
! #include "defs.h"

  action **parser;
  int SRtotal;
--- 1,5 ----
! #include <stdlib.h>
! #include "byacc.h"

  action **parser;
  int SRtotal;
***************
*** 19,25 ****
  extern action *add_reduce();


! make_parser()
  {
      register int i;

--- 20,26 ----
  extern action *add_reduce();


! void make_parser(void)
  {
      register int i;

***************
*** 36,43 ****


  action *
! parse_actions(stateno)
! register int stateno;
  {
      register action *actions;

--- 37,43 ----


  action *
! parse_actions(register int stateno)
  {
      register action *actions;

***************
*** 48,55 ****


  action *
! get_shifts(stateno)
! int stateno;
  {
      register action *actions, *temp;
      register shifts *sp;
--- 48,54 ----


  action *
! get_shifts(int stateno)
  {
      register action *actions, *temp;
      register shifts *sp;
***************
*** 83,91 ****
  }

  action *
! add_reductions(stateno, actions)
! int stateno;
! register action *actions;
  {
      register int i, j, m, n;
      register int ruleno, tokensetsize;
--- 82,88 ----
  }

  action *
! add_reductions(int stateno, register action* actions)
  {
      register int i, j, m, n;
      register int ruleno, tokensetsize;
***************
*** 109,117 ****


  action *
! add_reduce(actions, ruleno, symbol)
! register action *actions;
! register int ruleno, symbol;
  {
      register action *temp, *prev, *next;

--- 106,112 ----


  action *
! add_reduce(register action* actions, register int ruleno, int symbol)
  {
      register action *temp, *prev, *next;

***************
*** 149,155 ****
  }


! find_final_state()
  {
      register int goal, i;
      register short *to_state;
--- 144,150 ----
  }


! void find_final_state(void)
  {
      register int goal, i;
      register short *to_state;
***************
*** 166,172 ****
  }


! unused_rules()
  {
      register int i;
      register action *p;
--- 161,167 ----
  }


! void unused_rules(void)
  {
      register int i;
      register action *p;
***************
*** 198,204 ****
  }


! remove_conflicts()
  {
      register int i;
      register int symbol;
--- 193,199 ----
  }


! void remove_conflicts(void)
  {
      register int i;
      register int symbol;
***************
*** 231,238 ****
  }


! end_conflicts(p, q)
! register action *p, *q;
  {
      for (;;)
      {
--- 226,232 ----
  }


! void end_conflicts(register action *p, register action * q)
  {
      for (;;)
      {
***************
*** 244,251 ****
  }


! resolve_conflicts(first, last)
! register action *first, *last;
  {
      register action *p;
      register int count;
--- 238,244 ----
  }


! void resolve_conflicts(register action * first, register action * last)
  {
      register action *p;
      register int count;
***************
*** 289,295 ****
  }


! total_conflicts()
  {
      fprintf(stderr, "%s: ", myname);
      if (SRtotal == 1)
--- 282,288 ----
  }


! void total_conflicts(void)
  {
      fprintf(stderr, "%s: ", myname);
      if (SRtotal == 1)
***************
*** 310,317 ****


  int
! sole_reduction(stateno)
! int stateno;
  {
      register int count, ruleno;
      register action *p;
--- 303,309 ----


  int
! sole_reduction(int stateno)
  {
      register int count, ruleno;
      register action *p;
***************
*** 338,344 ****
  }


! defreds()
  {
      register int i;

--- 330,336 ----
  }


! void defreds(void)
  {
      register int i;

***************
*** 347,354 ****
      defred[i] = sole_reduction(i);
  }

! free_action_row(p)
! register action *p;
  {
    register action *q;

--- 339,345 ----
      defred[i] = sole_reduction(i);
  }

! void free_action_row(register action *p)
  {
    register action *q;

***************
*** 360,366 ****
      }
  }

! free_parser()
  {
    register int i;

--- 351,357 ----
      }
  }

! void free_parser(void)
  {
    register int i;

*** 1.1    1992/06/10 21:55:08
--- output.c    1992/03/16 18:56:20
***************
*** 1,4 ****
! #include "defs.h"

  static int nvectors;
  static int nentries;
--- 1,6 ----
! #include <stdlib.h>
! #include <string.h>
! #include "byacc.h"

  static int nvectors;
  static int nentries;
***************
*** 16,23 ****
  static int lowzero;
  static int high;

!
! output()
  {
      free_itemsets();
      free_shifts();
--- 18,25 ----
  static int lowzero;
  static int high;

! void
! output(void)
  {
      free_itemsets();
      free_shifts();
***************
*** 37,44 ****
      write_section(trailer);
  }

!
! output_rule_data()
  {
      register int i;
      register int j;
--- 39,46 ----
      write_section(trailer);
  }

! void
! output_rule_data(void)
  {
      register int i;
      register int j;
***************
*** 84,91 ****
      fprintf(output_file, "\n};\n");
  }

!
! output_yydefred()
  {
      register int i, j;

--- 86,93 ----
      fprintf(output_file, "\n};\n");
  }

! void
! output_yydefred(void)
  {
      register int i, j;

***************
*** 111,118 ****
      fprintf(output_file, "\n};\n");
  }

!
! output_actions()
  {
      nvectors = 2*nstates + nvars;

--- 113,120 ----
      fprintf(output_file, "\n};\n");
  }

! void
! output_actions(void)
  {
      nvectors = 2*nstates + nvars;

***************
*** 139,146 ****
      output_check();
  }

!
! token_actions()
  {
      register int i, j;
      register int shiftcount, reducecount;
--- 141,148 ----
      output_check();
  }

! void
! token_actions(void)
  {
      register int i, j;
      register int shiftcount, reducecount;
***************
*** 224,230 ****
      FREE(actionrow);
  }

! goto_actions()
  {
      register int i, j, k;

--- 226,233 ----
      FREE(actionrow);
  }

! void
! goto_actions(void)
  {
      register int i, j, k;

***************
*** 257,264 ****
  }

  int
! default_goto(symbol)
! int symbol;
  {
      register int i;
      register int m;
--- 260,266 ----
  }

  int
! default_goto(int symbol)
  {
      register int i;
      register int m;
***************
*** 292,301 ****
  }


!
! save_column(symbol, default_state)
! int symbol;
! int default_state;
  {
      register int i;
      register int m;
--- 294,301 ----
  }


! void
! save_column(int symbol, int default_state)
  {
      register int i;
      register int m;
***************
*** 335,340 ****
--- 335,342 ----
      width[symno] = sp1[-1] - sp[0] + 1;
  }

+
+ void
  sort_actions()
  {
    register int i;
***************
*** 369,375 ****
      }
  }

!
  pack_table()
  {
      register int i;
--- 371,377 ----
      }
  }

! void
  pack_table()
  {
      register int i;
***************
*** 431,438 ****
  /*  order.                                */

  int
! matching_vector(vector)
! int vector;
  {
      register int i;
      register int j;
--- 433,439 ----
  /*  order.                                */

  int
! matching_vector(int vector)
  {
      register int i;
      register int j;
***************
*** 472,479 ****


  int
! pack_vector(vector)
! int vector;
  {
      register int i, j, k, l;
      register int t;
--- 473,479 ----


  int
! pack_vector(int vector)
  {
      register int i, j, k, l;
      register int t;
***************
*** 545,552 ****
  }


!
! output_base()
  {
      register int i, j;

--- 545,552 ----
  }


! void
! output_base(void)
  {
      register int i, j;

***************
*** 609,615 ****
  }


!
  output_table()
  {
      register int i;
--- 609,615 ----
  }


! void
  output_table()
  {
      register int i;
***************
*** 640,647 ****
  }


!
! output_check()
  {
      register int i;
      register int j;
--- 640,647 ----
  }


! void
! output_check(void)
  {
      register int i;
      register int j;
***************
*** 670,677 ****


  int
! is_C_identifier(name)
! char *name;
  {
      register char *s;
      register int c;
--- 670,676 ----


  int
! is_C_identifier(char *name)
  {
      register char *s;
      register int c;
***************
*** 701,707 ****
      return (1);
  }

!
  output_defines()
  {
      register int c, i;
--- 700,706 ----
      return (1);
  }

! void
  output_defines()
  {
      register int c, i;
***************
*** 752,758 ****
      }
  }

!
  output_stored_text()
  {
      register int c, last;
--- 751,757 ----
      }
  }

! void
  output_stored_text()
  {
      register int c, last;
***************
*** 767,774 ****
      }
  }

!
! output_debug()
  {
      register int i, j, k, max;
      char **symnam, *s;
--- 766,773 ----
      }
  }

! void
! output_debug(void)
  {
      register int i, j, k, max;
      char **symnam, *s;
***************
*** 987,994 ****
      fprintf(output_file, "};\n#endif\n");
  }

!
! output_stype()
  {
      if (!unionized)
      {
--- 986,993 ----
      fprintf(output_file, "};\n#endif\n");
  }

! void
! output_stype(void)
  {
      if (!unionized)
      {
***************
*** 997,1004 ****
      }
  }

!
! output_trailing_text()
  {
      register int c, last;

--- 996,1003 ----
      }
  }

! void
! output_trailing_text(void)
  {
      register int c, last;

***************
*** 1052,1058 ****
      }
  }

!
  output_semantic_actions()
  {
      register int c, last;
--- 1051,1057 ----
      }
  }

! void
  output_semantic_actions()
  {
      register int c, last;
***************
*** 1081,1087 ****
      }
  }

!
  free_itemsets()
  {
    register core *cp;
--- 1080,1086 ----
      }
  }

! void
  free_itemsets()
  {
    register core *cp;
***************
*** 1093,1099 ****
  }


!
  free_shifts()
  {
    register shifts *sp;
--- 1092,1098 ----
  }


! void
  free_shifts()
  {
    register shifts *sp;
***************
*** 1105,1111 ****
  }


!
  free_reductions()
  {
    register reductions *rp;
--- 1104,1110 ----
  }


! void
  free_reductions()
  {
    register reductions *rp;
*** 1.1    1992/06/10 21:55:08
--- lr0.c    1992/03/16 18:57:14
***************
*** 1,4 ****
! #include "defs.h"

  extern short *itemset;
  extern short *itemsetend;
--- 1,6 ----
! #include <stdlib.h>
! #include <stddef.h>
! #include "byacc.h"

  extern short *itemset;
  extern short *itemsetend;
***************
*** 27,36 ****
  static short **kernel_end;
  static short *kernel_items;

! static core **state_table;


! allocate_itemsets()
  {
    register short *itemp;
    register short *item_end;
--- 29,38 ----
  static short **kernel_end;
  static short *kernel_items;

! extern core **state_table;


! void allocate_itemsets(void)
  {
    register short *itemp;
    register short *item_end;
***************
*** 73,79 ****



! allocate_storage()
  {
    allocate_itemsets();

--- 75,81 ----



! void allocate_storage(void)
  {
    allocate_itemsets();

***************
*** 84,90 ****



! append_states()
  {
    register int i;
    register int j;
--- 86,92 ----



! void append_states(void)
  {
    register int i;
    register int j;
***************
*** 114,120 ****
  }


! free_storage()
  {
    FREE(shift_symbol);
    FREE(redset);
--- 116,122 ----
  }


! void free_storage(void)
  {
    FREE(shift_symbol);
    FREE(redset);
***************
*** 127,133 ****



! generate_states()
  {
    allocate_storage();
    itemset = NEW2(nitems, short);
--- 129,135 ----



! void generate_states(void)
  {
    allocate_storage();
    itemset = NEW2(nitems, short);
***************
*** 143,149 ****
        append_states();

        if (nshifts > 0)
!         save_shifts();

        this_state = this_state->next;
      }
--- 145,151 ----
        append_states();

        if (nshifts > 0)
!     save_shifts();

        this_state = this_state->next;
      }
***************
*** 155,162 ****


  int
! get_state(symbol)
! int symbol;
  {
    register int key;
    register short *isp1;
--- 157,163 ----


  int
! get_state(int symbol)
  {
    register int key;
    register short *isp1;
***************
*** 165,171 ****
    register core *sp;
    register int found;

!   int n;

  #ifdef    TRACE
    fprintf(stderr, "Entering get_state, symbol = %d\n", symbol);
--- 166,172 ----
    register core *sp;
    register int found;

!   ptrdiff_t n;

  #ifdef    TRACE
    fprintf(stderr, "Entering get_state, symbol = %d\n", symbol);
***************
*** 220,226 ****



! initialize_states()
  {
      register int i;
      register short *start_derives;
--- 221,227 ----



! void initialize_states(void)
  {
      register int i;
      register short *start_derives;
***************
*** 247,253 ****
  }


! new_itemsets()
  {
    register int i;
    register int shiftcount;
--- 248,254 ----
  }


! void new_itemsets(void)
  {
    register int i;
    register int shiftcount;
***************
*** 274,280 ****
            ksp = kernel_base[symbol];
          }

!           *ksp++ = i + 1;
            kernel_end[symbol] = ksp;
      }
      }
--- 275,281 ----
            ksp = kernel_base[symbol];
          }

!       *ksp++ = i + 1;
            kernel_end[symbol] = ksp;
      }
      }
***************
*** 285,294 ****


  core *
! new_state(symbol)
! int symbol;
  {
!   register int n;
    register core *p;
    register short *isp1;
    register short *isp2;
--- 286,294 ----


  core *
! new_state(int symbol)
  {
!   register ptrdiff_t n;
    register core *p;
    register short *isp1;
    register short *isp2;
***************
*** 325,331 ****

  /* show_cores is used for debugging */

! show_cores()
  {
      core *p;
      int i, j, k, n;
--- 325,331 ----

  /* show_cores is used for debugging */

! void show_cores(void)
  {
      core *p;
      int i, j, k, n;
***************
*** 360,366 ****

  /* show_ritems is used for debugging */

! show_ritems()
  {
      int i;

--- 360,366 ----

  /* show_ritems is used for debugging */

! void show_ritems(void)
  {
      int i;

***************
*** 370,376 ****


  /* show_rrhs is used for debugging */
! show_rrhs()
  {
      int i;

--- 370,376 ----


  /* show_rrhs is used for debugging */
! void show_rrhs(void)
  {
      int i;

***************
*** 381,387 ****

  /* show_shifts is used for debugging */

! show_shifts()
  {
      shifts *p;
      int i, j, k;
--- 381,387 ----

  /* show_shifts is used for debugging */

! void show_shifts(void)
  {
      shifts *p;
      int i, j, k;
***************
*** 399,405 ****
  }


! save_shifts()
  {
    register shifts *p;
    register short *sp1;
--- 399,405 ----
  }


! void save_shifts(void)
  {
    register shifts *p;
    register short *sp1;
***************
*** 433,439 ****



! save_reductions()
  {
    register short *isp;
    register short *rp1;
--- 433,439 ----



! void save_reductions(void)
  {
    register short *isp;
    register short *rp1;
***************
*** 483,489 ****
  }


! set_derives()
  {
    register int i, k;
    register int lhs;
--- 483,489 ----
  }


! void set_derives(void)
  {
    register int i, k;
    register int lhs;
***************
*** 513,519 ****
  #endif
  }

! free_derives()
  {
    FREE(derives[start_symbol]);
    FREE(derives);
--- 513,519 ----
  #endif
  }

! void free_derives(void)
  {
    FREE(derives[start_symbol]);
    FREE(derives);
***************
*** 520,525 ****
--- 520,526 ----
  }

  #ifdef    DEBUG
+ void
  print_derives()
  {
    register int i;
***************
*** 542,548 ****
  #endif


! set_nullable()
  {
      register int i, j;
      register int empty;
--- 543,549 ----
  #endif


! void set_nullable(void)
  {
      register int i, j;
      register int empty;
***************
*** 591,603 ****
  }


! free_nullable()
  {
    FREE(nullable);
  }


! lr0()
  {
      set_derives();
      set_nullable();
--- 592,604 ----
  }


! void free_nullable(void)
  {
    FREE(nullable);
  }


! void lr0(void)
  {
      set_derives();
      set_nullable();
*** 1.1    1992/06/10 21:55:08
--- reader.c    1992/03/16 18:57:10
***************
*** 1,6 ****
! #include "defs.h"

-
  /*  The line size must be a positive integer.  One hundred was chosen    */
  /*  because few lines in Yacc input grammars exceed 100 characters.    */
  /*  Note that if a line exceeds LINESIZE characters, the line buffer    */
--- 1,8 ----
! #include <stdlib.h>
! #include <string.h>
! #include <stddef.h>
! #include "byacc.h"

  /*  The line size must be a positive integer.  One hundred was chosen    */
  /*  because few lines in Yacc input grammars exceed 100 characters.    */
  /*  Note that if a line exceeds LINESIZE characters, the line buffer    */
***************
*** 35,43 ****

  char line_format[] = "#line %d \"%s\"\n";

!
! cachec(c)
! int c;
  {
      assert(cinc >= 0);
      if (cinc >= cache_size)
--- 37,44 ----

  char line_format[] = "#line %d \"%s\"\n";

! void
! cachec(int c)
  {
      assert(cinc >= 0);
      if (cinc >= cache_size)
***************
*** 50,57 ****
      ++cinc;
  }

!
! get_line()
  {
      register FILE *f = input_file;
      register int c;
--- 51,58 ----
      ++cinc;
  }

! void
! get_line(void)
  {
      register FILE *f = input_file;
      register int c;
***************
*** 114,128 ****
      return (p);
  }

!
  skip_comment()
  {
      register char *s;

      int st_lineno = lineno;
!     char *st_line = dup_line();
!     char *st_cptr = st_line + (cptr - line);

      s = cptr + 2;
      for (;;)
      {
--- 115,132 ----
      return (p);
  }

! void
  skip_comment()
  {
      register char *s;

      int st_lineno = lineno;
!     char *st_line;
!     char *st_cptr;

+ st_line = dup_line();
+ st_cptr = st_line + (cptr - line);
+
      s = cptr + 2;
      for (;;)
      {
***************
*** 269,276 ****
      /*NOTREACHED*/
  }

!
! copy_ident()
  {
      register int c;
      register FILE *f = output_file;
--- 273,280 ----
      /*NOTREACHED*/
  }

! void
! copy_ident(void)
  {
      register int c;
      register FILE *f = output_file;
***************
*** 298,305 ****
      }
  }

!
! copy_text()
  {
      register int c;
      int quote;
--- 302,309 ----
      }
  }

! void
! copy_text(void)
  {
      register int c;
      int quote;
***************
*** 424,431 ****
      }
  }

!
! copy_union()
  {
      register int c;
      int quote;
--- 428,435 ----
      }
  }

! void
! copy_union(void)
  {
      register int c;
      int quote;
***************
*** 558,565 ****


  int
! hexval(c)
! int c;
  {
      if (c >= '0' && c <= '9')
      return (c - '0');
--- 562,568 ----


  int
! hexval(int c)
  {
      if (c >= '0' && c <= '9')
      return (c - '0');
***************
*** 710,717 ****


  int
! is_reserved(name)
! char *name;
  {
      char *s;

--- 713,719 ----


  int
! is_reserved(char *name)
  {
      char *s;

***************
*** 811,819 ****
      return (s);
  }

!
! declare_tokens(assoc)
! int assoc;
  {
      register int c;
      register bucket *bp;
--- 813,820 ----
      return (s);
  }

! void
! declare_tokens(int assoc)
  {
      register int c;
      register bucket *bp;
***************
*** 873,880 ****
      }
  }

!
! declare_types()
  {
      register int c;
      register bucket *bp;
--- 874,881 ----
      }
  }

! void
! declare_types(void)
  {
      register int c;
      register bucket *bp;
***************
*** 901,907 ****
      }
  }

!
  declare_start()
  {
      register int c;
--- 902,908 ----
      }
  }

! void
  declare_start()
  {
      register int c;
***************
*** 919,925 ****
      goal = bp;
  }

!
  read_declarations()
  {
      register int c, k;
--- 920,926 ----
      goal = bp;
  }

! void
  read_declarations()
  {
      register int c, k;
***************
*** 968,975 ****
      }
  }

!
! initialize_grammar()
  {
      nitems = 4;
      maxitems = 300;
--- 969,976 ----
      }
  }

! void
! initialize_grammar(void)
  {
      nitems = 4;
      maxitems = 300;
***************
*** 999,1005 ****
      rassoc[2] = TOKEN;
  }

!
  expand_items()
  {
      maxitems += 300;
--- 1000,1006 ----
      rassoc[2] = TOKEN;
  }

! void
  expand_items()
  {
      maxitems += 300;
***************
*** 1007,1014 ****
      if (pitem == 0) no_space();
  }

!
! expand_rules()
  {
      maxrules += 100;
      plhs = (bucket **) REALLOC(plhs, maxrules*sizeof(bucket *));
--- 1008,1015 ----
      if (pitem == 0) no_space();
  }

! void
! expand_rules(void)
  {
      maxrules += 100;
      plhs = (bucket **) REALLOC(plhs, maxrules*sizeof(bucket *));
***************
*** 1019,1026 ****
      if (rassoc == 0) no_space();
  }

!
! advance_to_start()
  {
      register int c;
      register bucket *bp;
--- 1020,1027 ----
      if (rassoc == 0) no_space();
  }

! void
! advance_to_start(void)
  {
      register int c;
      register bucket *bp;
***************
*** 1069,1078 ****
      ++cptr;
  }

!
! start_rule(bp, s_lineno)
! register bucket *bp;
! int s_lineno;
  {
      if (bp->class == TERM)
      terminal_lhs(s_lineno);
--- 1070,1077 ----
      ++cptr;
  }

! void
! start_rule(register bucket * bp,int s_lineno)
  {
      if (bp->class == TERM)
      terminal_lhs(s_lineno);
***************
*** 1084,1091 ****
      rassoc[nrules] = TOKEN;
  }

!
! end_rule()
  {
      register int i;

--- 1083,1090 ----
      rassoc[nrules] = TOKEN;
  }

! void
! end_rule(void)
  {
      register int i;

***************
*** 1103,1110 ****
      ++nrules;
  }

!
! insert_empty_rule()
  {
      register bucket *bp, **bpp;

--- 1102,1109 ----
      ++nrules;
  }

! void
! insert_empty_rule(void)
  {
      register bucket *bp, **bpp;

***************
*** 1130,1137 ****
      rassoc[nrules-1] = TOKEN;
  }

!
! add_symbol()
  {
      register int c;
      register bucket *bp;
--- 1129,1136 ----
      rassoc[nrules-1] = TOKEN;
  }

! void
! add_symbol(void)
  {
      register int c;
      register bucket *bp;
***************
*** 1161,1168 ****
      pitem[nitems-1] = bp;
  }

!
! copy_action()
  {
      register int c;
      register int i, n;
--- 1160,1167 ----
      pitem[nitems-1] = bp;
  }

! void
! copy_action(void)
  {
      register int c;
      register int i, n;
***************
*** 1408,1415 ****
      return (0);
  }

!
! read_grammar()
  {
      register int c;

--- 1407,1414 ----
      return (0);
  }

! void
! read_grammar(void)
  {
      register int c;

***************
*** 1441,1448 ****
      end_rule();
  }

!
! free_tags()
  {
      register int i;

--- 1440,1447 ----
      end_rule();
  }

! void
! free_tags(void)
  {
      register int i;

***************
*** 1456,1463 ****
      FREE(tag_table);
  }

!
! pack_names()
  {
      register bucket *bp;
      register char *p, *s, *t;
--- 1455,1462 ----
      FREE(tag_table);
  }

! void
! pack_names(void)
  {
      register bucket *bp;
      register char *p, *s, *t;
***************
*** 1481,1488 ****
      }
  }

!
! check_symbols()
  {
      register bucket *bp;

--- 1480,1487 ----
      }
  }

! void
! check_symbols(void)
  {
      register bucket *bp;

***************
*** 1499,1506 ****
      }
  }

!
! pack_symbols()
  {
      register bucket *bp;
      register bucket **v;
--- 1498,1505 ----
      }
  }

! void
! pack_symbols(void)
  {
      register bucket *bp;
      register bucket **v;
***************
*** 1623,1630 ****
      FREE(v);
  }

!
! pack_grammar()
  {
      register int i, j;
      int assoc, prec;
--- 1622,1629 ----
      FREE(v);
  }

! void
! pack_grammar(void)
  {
      register int i, j;
      int assoc, prec;
***************
*** 1682,1689 ****
      FREE(pitem);
  }

!
! print_grammar()
  {
      register int i, j, k;
      int spacing;
--- 1681,1688 ----
      FREE(pitem);
  }

! void
! print_grammar(void)
  {
      register int i, j, k;
      int spacing;
***************
*** 1718,1725 ****
      }
  }

!
! reader()
  {
      write_section(banner);
      create_symbol_table();
--- 1717,1724 ----
      }
  }

! void
! reader(void)
  {
      write_section(banner);
      create_symbol_table();
*** 1.1    1992/06/10 21:55:08
--- verbose.c    1992/03/16 18:55:52
***************
*** 1,9 ****
! #include "defs.h"

-
  static short *null_rules;

! verbose()
  {
      register int i;

--- 1,10 ----
! #include <stdlib.h>
! #include "byacc.h"

  static short *null_rules;

! void
! verbose(void)
  {
      register int i;

***************
*** 26,33 ****
      fprintf(verbose_file, "%d grammar rules, %d states\n", nrules - 2, nstates);
  }

!
! log_unused()
  {
      register int i;
      register short *p;
--- 27,34 ----
      fprintf(verbose_file, "%d grammar rules, %d states\n", nrules - 2, nstates);
  }

! void
! log_unused(void)
  {
      register int i;
      register short *p;
***************
*** 46,52 ****
  }


! log_conflicts()
  {
      register int i;

--- 47,54 ----
  }


! void
! log_conflicts(void)
  {
      register int i;

***************
*** 73,81 ****
      }
  }

!
! print_state(state)
! int state;
  {
      if (state)
      fprintf(verbose_file, "\n\n");
--- 75,82 ----
      }
  }

! void
! print_state(int state)
  {
      if (state)
      fprintf(verbose_file, "\n\n");
***************
*** 87,95 ****
      print_actions(state);
  }

!
! print_conflicts(state)
! int state;
  {
      register int symbol;
      register action *p, *q, *r;
--- 88,95 ----
      print_actions(state);
  }

! void
! print_conflicts(int state)
  {
      register int symbol;
      register action *p, *q, *r;
***************
*** 145,153 ****
      }
  }

!
! print_core(state)
! int state;
  {
      register int i;
      register int k;
--- 145,152 ----
      }
  }

! void
! print_core(int state)
  {
      register int i;
      register int k;
***************
*** 181,189 ****
      }
  }

!
! print_nulls(state)
! int state;
  {
      register action *p;
      register int i, j, k, nnulls;
--- 180,187 ----
      }
  }

! void
! print_nulls(int state)
  {
      register action *p;
      register int i, j, k, nnulls;
***************
*** 223,231 ****
      fprintf(verbose_file, "\n");
  }

!
! print_actions(stateno)
! int stateno;
  {
      register action *p;
      register shifts *sp;
--- 221,228 ----
      fprintf(verbose_file, "\n");
  }

! void
! print_actions(int stateno)
  {
      register action *p;
      register shifts *sp;
***************
*** 250,258 ****
      }
  }

!
! print_shifts(p)
! register action *p;
  {
      register int count;
      register action *q;
--- 247,254 ----
      }
  }

! void
! print_shifts(register action *p)
  {
      register int count;
      register action *q;
***************
*** 275,284 ****
      }
  }

!
! print_reductions(p, defred)
! register action *p;
! register int defred;
  {
      register int k, anyreds;
      register action *q;
--- 271,278 ----
      }
  }

! void
! print_reductions(register action *p, register int defred)
  {
      register int k, anyreds;
      register action *q;
***************
*** 313,321 ****
      }
  }

!
! print_gotos(stateno)
! int stateno;
  {
      register int i, k;
      register int as;
--- 307,314 ----
      }
  }

! void
! print_gotos(int stateno)
  {
      register int i, k;
      register int as;