X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Fcic_transformations%2FcicAstPp.ml;h=8076e006204171a695b0087af9bccc28ebc69757;hb=29a3bd5d160f31873236c93a008a9e4fd31c305e;hp=ee60c427963aa3a191cd4f06c25451330b2b3c8b;hpb=de5c6a62937a7448c2258ad736eaf8c30ca68e6e;p=helm.git diff --git a/helm/ocaml/cic_transformations/cicAstPp.ml b/helm/ocaml/cic_transformations/cicAstPp.ml index ee60c4279..8076e0062 100644 --- a/helm/ocaml/cic_transformations/cicAstPp.ml +++ b/helm/ocaml/cic_transformations/cicAstPp.ml @@ -27,7 +27,7 @@ open Printf let pp_binder = function | `Lambda -> "lambda" - | `Pi -> "pi" + | `Pi -> "Pi" | `Exists -> "exists" | `Forall -> "forall" @@ -35,7 +35,6 @@ let pp_name = function Cic.Anonymous -> "_" | Cic.Name s -> s let rec pp_term = function | CicAst.AttributedTerm (_, term) -> pp_term term - | CicAst.Appl terms -> sprintf "(%s)" (String.concat " " (List.map pp_term terms)) | CicAst.Binder (`Forall, (Cic.Anonymous, typ), body) @@ -62,8 +61,12 @@ let rec pp_term = function sprintf "%s = %s" (pp_capture_variable var) (pp_term body)) definitions)) (pp_term term) - | CicAst.Ident (name, []) -> name - | CicAst.Ident (name, substs) -> sprintf "%s[%s]" name (pp_substs substs) + | CicAst.Ident (name, Some []) | CicAst.Ident (name, None) + | CicAst.Uri (name, Some []) | CicAst.Uri (name, None) -> + name + | CicAst.Ident (name, Some substs) + | CicAst.Uri (name, Some substs) -> + sprintf "%s \\subst [%s]" name (pp_substs substs) | CicAst.Implicit -> "?" | CicAst.Meta (index, substs) -> sprintf "%d[%s]" index @@ -75,12 +78,13 @@ let rec pp_term = function | CicAst.Sort `Type -> "Type" | CicAst.Sort `CProp -> "CProp" | CicAst.Symbol (name, _) -> name + | CicAst.UserInput -> "%" -and pp_subst (name, term) = sprintf "%s := %s" name (pp_term term) +and pp_subst (name, term) = sprintf "%s \\Assign %s" name (pp_term term) and pp_substs substs = String.concat "; " (List.map pp_subst substs) and pp_pattern ((head, vars), term) = - sprintf "%s -> %s" + sprintf "%s \\Rightarrow %s" (match vars with | [] -> head | _ ->