diff options
| author | Hugo Herbelin | 2018-06-29 08:28:27 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2018-07-29 02:40:22 +0200 |
| commit | 90a1d7202182205b3a66b4e8edf751e82b117551 (patch) | |
| tree | c10205f1c5f3cb97fd6f5ad704432fed5f972754 /parsing | |
| parent | 60daf674df3d11fa2948bbc7c9a928c09f22d099 (diff) | |
Renaming ETName and ETReference so as to fit the user-visible terminology.
ETName -> ETIdent
ETReference -> ETGlobal
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/extend.ml | 4 | ||||
| -rw-r--r-- | parsing/notgram_ops.ml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/parsing/extend.ml b/parsing/extend.ml index a3e27f9cf5..6fe2956643 100644 --- a/parsing/extend.ml +++ b/parsing/extend.ml @@ -34,8 +34,8 @@ type production_level = (** User-level types used to tell how to parse or interpret of the non-terminal *) type 'a constr_entry_key_gen = - | ETName - | ETReference + | ETIdent + | ETGlobal | ETBigint | ETBinder of bool (* open list of binders if true, closed list of binders otherwise *) | ETConstr of Constrexpr.notation_entry * Notation_term.constr_as_binder_kind option * 'a diff --git a/parsing/notgram_ops.ml b/parsing/notgram_ops.ml index 125ea01681..c36b3b17bf 100644 --- a/parsing/notgram_ops.ml +++ b/parsing/notgram_ops.ml @@ -49,14 +49,14 @@ let production_level_eq l1 l2 = match (l1,l2) with | (NextLevel | NumLevel _), _ -> false let constr_entry_key_eq eq v1 v2 = match v1, v2 with -| ETName, ETName -> true -| ETReference, ETReference -> true +| ETIdent, ETIdent -> true +| ETGlobal, ETGlobal -> true | ETBigint, ETBigint -> true | ETBinder b1, ETBinder b2 -> b1 == b2 | ETConstr (s1,bko1,lev1), ETConstr (s2,bko2,lev2) -> notation_entry_eq s1 s2 && eq lev1 lev2 && Option.equal (=) bko1 bko2 | ETPattern (b1,n1), ETPattern (b2,n2) -> b1 = b2 && Option.equal Int.equal n1 n2 -| (ETName | ETReference | ETBigint | ETBinder _ | ETConstr _ | ETPattern _), _ -> false +| (ETIdent | ETGlobal | ETBigint | ETBinder _ | ETConstr _ | ETPattern _), _ -> false let level_eq_gen strict (s1, l1, t1, u1) (s2, l2, t2, u2) = let tolerability_eq (i1, r1) (i2, r2) = Int.equal i1 i2 && parenRelation_eq r1 r2 in |