diff options
| author | Emilio Jesus Gallego Arias | 2020-02-27 15:52:45 -0500 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2020-02-27 15:52:45 -0500 |
| commit | aeca986089d005054496ed4bcf1b920e8fa02173 (patch) | |
| tree | 074acf720a9969ba3f0d5585edc1351243105fd4 /parsing | |
| parent | c160fc0da9bef60c4ee469cc2c35afd83fc16243 (diff) | |
| parent | 5ece9623e54ce2a87440c889364c3d1ad5eb52c5 (diff) | |
Merge PR #11650: Set Printing Parens
Reviewed-by: ejgallego
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/ppextend.ml | 8 | ||||
| -rw-r--r-- | parsing/ppextend.mli | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/parsing/ppextend.ml b/parsing/ppextend.ml index 393ab8a302..bb6693a239 100644 --- a/parsing/ppextend.ml +++ b/parsing/ppextend.ml @@ -38,9 +38,9 @@ let ppcmd_of_cut = function | PpBrk(n1,n2) -> brk(n1,n2) type unparsing = - | UnpMetaVar of entry_relative_level + | UnpMetaVar of entry_relative_level * Extend.side option | UnpBinderMetaVar of entry_relative_level - | UnpListMetaVar of entry_relative_level * unparsing list + | UnpListMetaVar of entry_relative_level * unparsing list * Extend.side option | UnpBinderListMetaVar of bool * unparsing list | UnpTerminal of string | UnpBox of ppbox * unparsing Loc.located list @@ -50,9 +50,9 @@ type unparsing_rule = unparsing list * entry_level type extra_unparsing_rules = (string * string) list let rec unparsing_eq unp1 unp2 = match (unp1,unp2) with - | UnpMetaVar p1, UnpMetaVar p2 -> entry_relative_level_eq p1 p2 + | UnpMetaVar (p1,s1), UnpMetaVar (p2,s2) -> entry_relative_level_eq p1 p2 && s1 = s2 | UnpBinderMetaVar p1, UnpBinderMetaVar p2 -> entry_relative_level_eq p1 p2 - | UnpListMetaVar (p1,l1), UnpListMetaVar (p2,l2) -> entry_relative_level_eq p1 p2 && List.for_all2eq unparsing_eq l1 l2 + | UnpListMetaVar (p1,l1,s1), UnpListMetaVar (p2,l2,s2) -> entry_relative_level_eq p1 p2 && List.for_all2eq unparsing_eq l1 l2 && s1 = s2 | UnpBinderListMetaVar (b1,l1), UnpBinderListMetaVar (b2,l2) -> b1 = b2 && List.for_all2eq unparsing_eq l1 l2 | UnpTerminal s1, UnpTerminal s2 -> String.equal s1 s2 | UnpBox (b1,l1), UnpBox (b2,l2) -> b1 = b2 && List.for_all2eq unparsing_eq (List.map snd l1) (List.map snd l2) diff --git a/parsing/ppextend.mli b/parsing/ppextend.mli index 346fc83f5f..18e48942c6 100644 --- a/parsing/ppextend.mli +++ b/parsing/ppextend.mli @@ -30,9 +30,9 @@ val ppcmd_of_cut : ppcut -> Pp.t (** Declare and look for the printing rule for symbolic notations *) type unparsing = - | UnpMetaVar of entry_relative_level + | UnpMetaVar of entry_relative_level * Extend.side option | UnpBinderMetaVar of entry_relative_level - | UnpListMetaVar of entry_relative_level * unparsing list + | UnpListMetaVar of entry_relative_level * unparsing list * Extend.side option | UnpBinderListMetaVar of bool * unparsing list | UnpTerminal of string | UnpBox of ppbox * unparsing Loc.located list |