diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2003-06-19 18:12:59 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2003-06-19 18:12:59 +0000 |
commit | 510294058e4b37540e595b9abc1e43ef4464229a (patch) | |
tree | 5378367fe72aad11937f8ba636caedc9a746256c /parsing/parser.mly | |
parent | 1fa763e0c58fa76de0bfaf879f7fdd63ca99f0ec (diff) |
documentation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5603 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'parsing/parser.mly')
-rw-r--r-- | parsing/parser.mly | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parsing/parser.mly b/parsing/parser.mly index 6f673e9e8..150f452f2 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -303,9 +303,9 @@ let mktype_kind pflag kind = /* Precedences and associativities. Tokens and rules have precedences. A reduce/reduce conflict is resolved -by comparing the precedences of the two rules. A shift/reduce conflict -is resolved by comparing the precedence of the token to be shifted with -the rule to be reduced. +in favor of the first rule (in source file order). A shift/reduce conflict +is resolved by comparing the precedence and associativity of the token to +be shifted with those of the rule to be reduced. By default, a rule has the precedence of its rightmost terminal (if any). |