Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-10 04:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/reader.h: New file.

Browse Source 
Propagate its use instead of tedious list of `extern' and
prototypes.
* src/reader.c: Formatting changes, topological sort,
s/register//.
This commit is contained in:
Akim Demaille
2000-10-02 08:00:34 +00:00
parent abadc11757
commit a70083a3ed
8 changed files with 1031 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2000-10-02 Akim Demaille <akim@epita.fr>
* src/reader.h: New file.
Propagate its use instead of tedious list of `extern' and
prototypes.
* src/reader.c: Formatting changes, topological sort,
s/register//.
2000-10-02 Akim Demaille <akim@epita.fr>
* src/lex.h: Prototype `lex.c' exported functions.

2
src/Makefile.am
View File

@@ -22,7 +22,7 @@ noinst_HEADERS = alloc.h closure.h complain.h \
derives.h \
files.h getargs.h gram.h lalr.h lex.h \
output.h state.h \
symtab.h system.h types.h
reader.h symtab.h system.h types.h
data_DATA = bison.simple bison.hairy

5
src/lalr.h
View File

@@ -21,6 +21,11 @@
#ifndef LALR_H_
# define LALR_H_
/* Import the definition of CORE, SHIFTS and REDUCTIONS. */
# include "state.h"
/* Compute how to make the finite state machine deterministic; find
which rules need lookahead in each state, and which lookahead
tokens they accept. */

4
src/main.c
View File

@@ -26,6 +26,8 @@
#include "complain.h"
#include "derives.h"
#include "output.h"
#include "reader.h"
#include "lalr.h"
#if 0 /* XXX currently unused. */
/* Nonzero means failure has been detected; don't write a parser file. */
@@ -40,12 +42,10 @@ extern void berror PARAMS((const char *));
extern char *printable_version PARAMS ((int));
extern void openfiles PARAMS ((void));
extern void reader PARAMS ((void));
extern void reduce_grammar PARAMS ((void));
extern void set_nullable PARAMS ((void));
extern void free_nullable PARAMS ((void));
extern void generate_states PARAMS ((void));
extern void lalr PARAMS ((void));
extern void initialize_conflicts PARAMS ((void));
extern void finalize_conflicts PARAMS ((void));
extern void verbose PARAMS ((void));

2
src/output.c
View File

@@ -99,6 +99,7 @@
#include "complain.h"
#include "output.h"
#include "lalr.h"
#include "reader.h"
extern void berror PARAMS((const char *));
@@ -107,7 +108,6 @@ extern short *user_toknums;
extern int final_state;
extern errs **err_table;
extern void reader_output_yylsp PARAMS ((FILE *));
static int nvectors;
static int nentries;

1732
src/reader.c
View File

File diff suppressed because it is too large Load Diff

39
src/reader.h Normal file
View File

@@ -0,0 +1,39 @@
/* Input parser for bison
Copyright (C) 2000 Free Software Foundation, Inc.
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 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. */
#ifndef READER_H_
# define READER_H_
/* Read in the grammar specification and record it in the format
described in gram.h. All guards are copied into the FGUARD file
and all actions into FACTION, in each case forming the body of a C
function (YYGUARD or YYACTION) which contains a switch statement to
decide which guard or action to execute. */
extern void reader PARAMS ((void));
extern void reader_output_yylsp PARAMS ((FILE *));
extern int lineno;
extern char **tags;
extern short *user_toknums;
#endif /* !READER_H_ */

206
src/state.h
View File

@@ -1,138 +1,138 @@
/* Type definitions for nondeterministic finite state machine for bison,
Copyright (C) 1984, 1989 Free Software Foundation, Inc.
Copyright (C) 1984, 1989, 2000 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. */
/* These type definitions are used to represent a nondeterministic
finite state machine that parses the specified grammar.
This information is generated by the function generate_states
in the file LR0.
finite state machine that parses the specified grammar. This
information is generated by the function generate_states in the
file LR0.
Each state of the machine is described by a set of items --
particular positions in particular rules -- that are the possible
places where parsing could continue when the machine is in this state.
These symbols at these items are the allowable inputs that can follow now.
Each state of the machine is described by a set of items --
particular positions in particular rules -- that are the possible
places where parsing could continue when the machine is in this
state. These symbols at these items are the allowable inputs that
can follow now.
A core represents one state. States are numbered in the number field.
When generate_states is finished, the starting state is state 0
and nstates is the number of states. (A transition to a state
whose state number is nstates indicates termination.) All the cores
are chained together and first_state points to the first one (state 0).
A core represents one state. States are numbered in the number
field. When generate_states is finished, the starting state is
state 0 and nstates is the number of states. (A transition to a
state whose state number is nstates indicates termination.) All
the cores are chained together and first_state points to the first
one (state 0).
For each state there is a particular symbol which must have been the
last thing accepted to reach that state. It is the accessing_symbol
of the core.
For each state there is a particular symbol which must have been
the last thing accepted to reach that state. It is the
accessing_symbol of the core.
Each core contains a vector of nitems items which are the indices
in the ritems vector of the items that are selected in this state.
Each core contains a vector of nitems items which are the indices
in the ritems vector of the items that are selected in this state.
The link field is used for chaining buckets that hash states by
their itemsets. This is for recognizing equivalent states and
combining them when the states are generated.
The link field is used for chaining buckets that hash states by
their itemsets. This is for recognizing equivalent states and
combining them when the states are generated.
The two types of transitions are shifts (push the lookahead token
and read another) and reductions (combine the last n things on the
stack via a rule, replace them with the symbol that the rule derives,
and leave the lookahead token alone). When the states are generated,
these transitions are represented in two other lists.
The two types of transitions are shifts (push the lookahead token
and read another) and reductions (combine the last n things on the
stack via a rule, replace them with the symbol that the rule
derives, and leave the lookahead token alone). When the states are
generated, these transitions are represented in two other lists.
Each shifts structure describes the possible shift transitions out
of one state, the state whose number is in the number field.
The shifts structures are linked through next and first_shift points to them.
Each contains a vector of numbers of the states that shift transitions
can go to. The accessing_symbol fields of those states' cores say what kind
of input leads to them.
Each shifts structure describes the possible shift transitions out
of one state, the state whose number is in the number field. The
shifts structures are linked through next and first_shift points to
them. Each contains a vector of numbers of the states that shift
transitions can go to. The accessing_symbol fields of those
states' cores say what kind of input leads to them.
A shift to state zero should be ignored. Conflict resolution
deletes shifts by changing them to zero.
A shift to state zero should be ignored. Conflict resolution
deletes shifts by changing them to zero.
Each reductions structure describes the possible reductions at the state
whose number is in the number field. The data is a list of nreds rules,
represented by their rule numbers. first_reduction points to the list
of these structures.
Each reductions structure describes the possible reductions at the
state whose number is in the number field. The data is a list of
nreds rules, represented by their rule numbers. first_reduction
points to the list of these structures.
Conflict resolution can decide that certain tokens in certain
states should explicitly be errors (for implementing %nonassoc).
For each state, the tokens that are errors for this reason
are recorded in an errs structure, which has the state number
in its number field. The rest of the errs structure is full
of token numbers.
Conflict resolution can decide that certain tokens in certain
states should explicitly be errors (for implementing %nonassoc).
For each state, the tokens that are errors for this reason are
recorded in an errs structure, which has the state number in its
number field. The rest of the errs structure is full of token
numbers.
There is at least one shift transition present in state zero.
It leads to a next-to-final state whose accessing_symbol is
the grammar's start symbol. The next-to-final state has one shift
to the final state, whose accessing_symbol is zero (end of input).
The final state has one shift, which goes to the termination state
(whose number is nstates-1).
The reason for the extra state at the end is to placate the parser's
strategy of making all decisions one token ahead of its actions. */
There is at least one shift transition present in state zero. It
leads to a next-to-final state whose accessing_symbol is the
grammar's start symbol. The next-to-final state has one shift to
the final state, whose accessing_symbol is zero (end of input).
The final state has one shift, which goes to the termination state
(whose number is nstates-1). The reason for the extra state at the
end is to placate the parser's strategy of making all decisions one
token ahead of its actions. */
#ifndef STATE_H_
# define STATE_H_
typedef
struct core
{
struct core *next;
struct core *link;
short number;
short accessing_symbol;
short nitems;
short items[1];
}
core;
typedef struct core
{
struct core *next;
struct core *link;
short number;
short accessing_symbol;
short nitems;
short items[1];
}
core;
typedef
struct shifts
{
struct shifts *next;
short number;
short nshifts;
short shifts[1];
}
shifts;
typedef struct shifts
{
struct shifts *next;
short number;
short nshifts;
short shifts[1];
}
shifts;
typedef
struct errs
{
short nerrs;
short errs[1];
}
errs;
typedef struct errs
{
short nerrs;
short errs[1];
}
errs;
typedef
struct reductions
{
struct reductions *next;
short number;
short nreds;
short rules[1];
}
reductions;
typedef struct reductions
{
struct reductions *next;
short number;
short nreds;
short rules[1];
}
reductions;
extern int nstates;
extern core *first_state;
extern shifts *first_shift;
extern reductions *first_reduction;
#endif /* !STATE_H_ */