diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /cparser/validator/Automaton.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'cparser/validator/Automaton.v')
-rw-r--r-- | cparser/validator/Automaton.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cparser/validator/Automaton.v b/cparser/validator/Automaton.v index b15f87d2..98ab1246 100644 --- a/cparser/validator/Automaton.v +++ b/cparser/validator/Automaton.v @@ -113,7 +113,7 @@ Module Types(Import Init:AutInit). (** Types used for the annotations of the automaton. **) (** An item is a part of the annotations given to the validator. - It is acually a set of LR(1) items sharing the same core. It is needed + It is acually a set of LR(1) items sharing the same core. It is needed to validate completeness. **) Record item := { (** The pseudo-production of the item. **) @@ -136,7 +136,7 @@ Module Type T. Parameter start_nt: initstate -> nonterminal. (** The action table maps a state to either a map terminal -> action. **) - Parameter action_table: + Parameter action_table: state -> action. (** The goto table of an LR(1) automaton. **) Parameter goto_table: state -> forall nt:nonterminal, |