diff options
| -rw-r--r-- | parsing/egrammar.ml | 2 | ||||
| -rw-r--r-- | parsing/g_constrnew.ml4 | 10 | ||||
| -rw-r--r-- | translate/ppconstrnew.ml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/parsing/egrammar.ml b/parsing/egrammar.ml index 54067bf5d..88c821167 100644 --- a/parsing/egrammar.ml +++ b/parsing/egrammar.ml @@ -57,7 +57,7 @@ let default_levels_v8 = 80,Gramext.RightA; 40,Gramext.LeftA; 10,Gramext.LeftA; - 9,Gramext.LeftA; + 9,Gramext.RightA; 1,Gramext.LeftA; 0,Gramext.RightA] diff --git a/parsing/g_constrnew.ml4 b/parsing/g_constrnew.ml4 index 9aed2b1d5..c34f82efa 100644 --- a/parsing/g_constrnew.ml4 +++ b/parsing/g_constrnew.ml4 @@ -153,7 +153,7 @@ GEXTEND Gram [ [ c = operconstr -> c ] ] ; constr: - [ [ c = operconstr LEVEL "9L" -> c ] ] + [ [ c = operconstr LEVEL "9" -> c ] ] ; tuple_constr: [ @@ -175,13 +175,13 @@ GEXTEND Gram | "10L" LEFTA [ f=operconstr; args=LIST1 appl_arg -> CApp(loc,(None,f),args) | "@"; f=global; args=LIST0 NEXT -> CAppExpl(loc,(None,f),args) ] - | "9L" LEFTA + | "9" [ ] + | "1L" LEFTA [ c=operconstr; ".("; f=global; args=LIST0 appl_arg; ")" -> CApp(loc,(Some (List.length args+1),CRef f),args@[c,None]) | c=operconstr; ".("; "@"; f=global; args=LIST0 NEXT; ")" -> - CAppExpl(loc,(Some (List.length args+1),f),args@[c]) ] - | "1L" LEFTA - [ c=operconstr; "%"; key=IDENT -> CDelimiters (loc,key,c) ] + CAppExpl(loc,(Some (List.length args+1),f),args@[c]) + | c=operconstr; "%"; key=IDENT -> CDelimiters (loc,key,c) ] | "0" [ c=atomic_constr -> c | c=match_constr -> c diff --git a/translate/ppconstrnew.ml b/translate/ppconstrnew.ml index 438c1cc05..e6385e3d3 100644 --- a/translate/ppconstrnew.ml +++ b/translate/ppconstrnew.ml @@ -41,9 +41,9 @@ let larrow = 80 let lnegint = 40 let lcast = 100 let lapp = 10 -let lproj = 9 let ltop = (200,E) -let lsimple = (9,E) +let lproj = 1 +let lsimple = (1,E) let prec_less child (parent,assoc) = if parent < 0 && child = lprod then true @@ -374,7 +374,7 @@ let pr_simple_return_type pr na po = pr_case_type pr po let pr_proj pr pr_app a f l = - hov 0 (pr (lproj,E) a ++ cut() ++ str ".(" ++ pr_app pr f l ++ str ")") + hov 0 (pr lsimple a ++ cut() ++ str ".(" ++ pr_app pr f l ++ str ")") let pr_appexpl pr f l = hov 2 ( |