X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationPp.ml;h=b5a2e04f22a9b9e837ce4694a4d1a6234c815949;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=696580cdc5442c97555cb9bea3cf64e5b0eb131b;hpb=ea7808d83a7d6e03c0e163f0691e268dcd7c2ea4;p=helm.git

diff --git a/helm/ocaml/cic_notation/cicNotationPp.ml b/helm/ocaml/cic_notation/cicNotationPp.ml
index 696580cdc..b5a2e04f2 100644
--- a/helm/ocaml/cic_notation/cicNotationPp.ml
+++ b/helm/ocaml/cic_notation/cicNotationPp.ml
@@ -25,10 +25,14 @@
 
 open Printf
 
-open CicNotationEnv
-open CicNotationPt
+module Ast = CicNotationPt
+module Env = CicNotationEnv
 
-let print_attributes = true
+  (* when set to true debugging information, not in sync with input syntax, will
+   * be added to the output of pp_term.
+   * set to false if you need, for example, cut and paste from matitac output to
+   * matitatop *)
+let debug_printing = true
 
 let pp_binder = function
   | `Lambda -> "lambda"
@@ -36,80 +40,129 @@ let pp_binder = function
   | `Exists -> "exists"
   | `Forall -> "forall"
 
-let pp_literal l =
-  sprintf "literal(%s)"
-    (match l with
-    | `Symbol s
-    | `Keyword s
-    | `Number s -> s)
-
-let rec pp_term = function
-  | AttributedTerm (`Href _, term) when print_attributes ->
-      sprintf "#[%s]" (pp_term term)
-  | AttributedTerm (_, term) when print_attributes ->
-      sprintf "@[%s]" (pp_term term)
-  | AttributedTerm (_, term) -> pp_term term
-
-  | Appl terms ->
-      sprintf "(%s)" (String.concat " " (List.map pp_term terms))
-  | Binder (`Forall, (Ident ("_", None), typ), body)
-  | Binder (`Pi, (Ident ("_", None), typ), body) ->
-      sprintf "(%s \\to %s)"
-        (match typ with None -> "?" | Some typ -> pp_term typ)
-        (pp_term body)
-  | Binder (kind, var, body) ->
-      sprintf "\\%s %s.%s" (pp_binder kind) (pp_capture_variable var)
-        (pp_term body)
-  | Case (term, indtype, typ, patterns) ->
-      sprintf "%smatch %s with %s"
-        (match typ with None -> "" | Some t -> sprintf "<%s>" (pp_term t))
-        (pp_term term) (pp_patterns patterns)
-  | LetIn (var, t1, t2) ->
-      sprintf "let %s = %s in %s" (pp_capture_variable var) (pp_term t1)
-        (pp_term t2)
-  | LetRec (kind, definitions, term) ->
-      sprintf "let %s %s in %s"
-        (match kind with `Inductive -> "rec" | `CoInductive -> "corec")
-        (String.concat " and "
-          (List.map
-            (fun (var, body, _) ->
-              sprintf "%s = %s" (pp_capture_variable var) (pp_term body))
-            definitions))
-        (pp_term term)
-  | Ident (name, Some []) | Ident (name, None)
-  | Uri (name, Some []) | Uri (name, None) ->
-      name
-  | Ident (name, Some substs)
-  | Uri (name, Some substs) ->
-      sprintf "%s \\subst [%s]" name (pp_substs substs)
-  | Implicit -> "?"
-  | Meta (index, substs) ->
-      sprintf "%d[%s]" index
-        (String.concat "; "
-          (List.map (function None -> "_" | Some term -> pp_term term) substs))
-  | Num (num, _) -> num
-  | Sort `Set -> "Set"
-  | Sort `Prop -> "Prop"
-  | Sort `Type -> "Type"
-  | Sort `CProp -> "CProp"
-  | Symbol (name, _) -> name
-
-  | UserInput -> ""
-
-  | Literal l -> pp_literal l
-  | Layout l -> pp_layout l
-  | Magic m -> pp_magic m
-  | Variable v -> pp_variable v
+let pp_literal =
+  if debug_printing then
+    (function (* debugging version *)
+      | `Symbol s -> sprintf "symbol(%s)" s
+      | `Keyword s -> sprintf "keyword(%s)" s
+      | `Number s -> sprintf "number(%s)" s)
+  else
+    (function
+      | `Symbol s
+      | `Keyword s
+      | `Number s -> s)
+
+let pp_assoc =
+  function
+  | Gramext.NonA -> "NonA"
+  | Gramext.LeftA -> "LeftA"
+  | Gramext.RightA -> "RightA"
+
+let pp_pos =
+  function
+(*      `None -> "`None" *)
+    | `Left -> "`Left"
+    | `Right -> "`Right"
+    | `Inner -> "`Inner"
+
+let pp_attribute =
+  function
+  | `IdRef id -> sprintf "x(%s)" id
+  | `XmlAttrs attrs ->
+      sprintf "X(%s)"
+        (String.concat ";"
+          (List.map (fun (_, n, v) -> sprintf "%s=%s" n v) attrs))
+  | `Level (prec, assoc) -> sprintf "L(%d%s)" prec (pp_assoc assoc)
+  | `Raw _ -> "R"
+  | `Loc _ -> "@"
+  | `ChildPos p -> sprintf "P(%s)" (pp_pos p)
+
+let rec pp_term ?(pp_parens = true) t =
+  let t_pp =
+    match t with
+    | Ast.AttributedTerm (attr, term) when debug_printing ->
+        sprintf "%s[%s]" (pp_attribute attr) (pp_term ~pp_parens:false term)
+    | Ast.AttributedTerm (`Raw text, _) -> text
+    | Ast.AttributedTerm (_, term) -> pp_term ~pp_parens:false term
+    | Ast.Appl terms ->
+        sprintf "%s" (String.concat " " (List.map pp_term terms))
+    | Ast.Binder (`Forall, (Ast.Ident ("_", None), typ), body)
+    | Ast.Binder (`Pi, (Ast.Ident ("_", None), typ), body) ->
+        sprintf "%s \\to %s"
+          (match typ with None -> "?" | Some typ -> pp_term typ)
+          (pp_term body)
+    | Ast.Binder (kind, var, body) ->
+        sprintf "\\%s %s.%s" (pp_binder kind) (pp_capture_variable var)
+          (pp_term body)
+    | Ast.Case (term, indtype, typ, patterns) ->
+        sprintf "%smatch %s%s with %s"
+          (match typ with None -> "" | Some t -> sprintf "[%s]" (pp_term t))
+          (pp_term term)
+          (match indtype with
+          | None -> ""
+          | Some (ty, href_opt) ->
+              sprintf " in %s%s" ty
+              (match debug_printing, href_opt with
+              | true, Some uri ->
+                  sprintf "(i.e.%s)" (UriManager.string_of_uri uri)
+              | _ -> ""))
+          (pp_patterns patterns)
+    | Ast.Cast (t1, t2) -> sprintf "(%s: %s)" (pp_term t1) (pp_term t2)
+    | Ast.LetIn (var, t1, t2) ->
+        sprintf "let %s = %s in %s" (pp_capture_variable var) (pp_term t1)
+          (pp_term t2)
+    | Ast.LetRec (kind, definitions, term) ->
+        sprintf "let %s %s in %s"
+          (match kind with `Inductive -> "rec" | `CoInductive -> "corec")
+          (String.concat " and "
+            (List.map
+              (fun (var, body, _) ->
+                sprintf "%s = %s" (pp_capture_variable var) (pp_term body))
+              definitions))
+          (pp_term term)
+    | Ast.Ident (name, Some []) | Ast.Ident (name, None)
+    | Ast.Uri (name, Some []) | Ast.Uri (name, None) ->
+        name
+    | Ast.Ident (name, Some substs)
+    | Ast.Uri (name, Some substs) ->
+        sprintf "%s \\subst [%s]" name (pp_substs substs)
+    | Ast.Implicit -> "?"
+    | Ast.Meta (index, substs) ->
+        sprintf "%d[%s]" index
+          (String.concat "; "
+            (List.map (function None -> "_" | Some t -> pp_term t) substs))
+    | Ast.Num (num, _) -> num
+    | Ast.Sort `Set -> "Set"
+    | Ast.Sort `Prop -> "Prop"
+    | Ast.Sort (`Type _) -> "Type"
+    | Ast.Sort `CProp -> "CProp"
+    | Ast.Symbol (name, _) -> "'" ^ name
+
+    | Ast.UserInput -> ""
+
+    | Ast.Literal l -> pp_literal l
+    | Ast.Layout l -> pp_layout l
+    | Ast.Magic m -> pp_magic m
+    | Ast.Variable v -> pp_variable v
+  in
+  if pp_parens then sprintf "(%s)" t_pp
+  else t_pp
 
 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) =
+and pp_pattern ((head, href, vars), term) =
+  let head_pp =
+    head ^
+    (match debug_printing, href with
+    | true, Some uri -> sprintf "(i.e.%s)" (UriManager.string_of_uri uri)
+    | _ -> "")
+  in
   sprintf "%s \\Rightarrow %s"
     (match vars with
-    | [] -> head
+    | [] -> head_pp
     | _ ->
-        sprintf "(%s %s)" head
+        sprintf "(%s %s)" head_pp
           (String.concat " " (List.map pp_capture_variable vars)))
     (pp_term term)
 
@@ -123,41 +176,46 @@ and pp_capture_variable = function
 and pp_box_spec (kind, spacing, indent) =
   let int_of_bool b = if b then 1 else 0 in
   let kind_string =
-    match kind with H -> "H" | V -> "V" | HV -> "HV" | HOV -> "HOV"
+    match kind with
+    Ast.H -> "H" | Ast.V -> "V" | Ast.HV -> "HV" | Ast.HOV -> "HOV"
   in
   sprintf "%sBOX%d%d" kind_string (int_of_bool spacing) (int_of_bool indent)
 
 and pp_layout = function
-  | Sub (t1, t2) -> sprintf "%s \\SUB %s" (pp_term t1) (pp_term t2)
-  | Sup (t1, t2) -> sprintf "%s \\SUP %s" (pp_term t1) (pp_term t2)
-  | Below (t1, t2) -> sprintf "%s \\BELOW %s" (pp_term t1) (pp_term t2)
-  | Above (t1, t2) -> sprintf "%s \\ABOVE %s" (pp_term t1) (pp_term t2)
-  | Over (t1, t2) -> sprintf "[%s \\OVER %s]" (pp_term t1) (pp_term t2)
-  | Atop (t1, t2) -> sprintf "[%s \\ATOP %s]" (pp_term t1) (pp_term t2)
-  | Frac (t1, t2) -> sprintf "\\FRAC %s %s" (pp_term t1) (pp_term t2)
-  | Sqrt t -> sprintf "\\SQRT %s" (pp_term t)
-  | Root (arg, index) ->
+  | Ast.Sub (t1, t2) -> sprintf "%s \\SUB %s" (pp_term t1) (pp_term t2)
+  | Ast.Sup (t1, t2) -> sprintf "%s \\SUP %s" (pp_term t1) (pp_term t2)
+  | Ast.Below (t1, t2) -> sprintf "%s \\BELOW %s" (pp_term t1) (pp_term t2)
+  | Ast.Above (t1, t2) -> sprintf "%s \\ABOVE %s" (pp_term t1) (pp_term t2)
+  | Ast.Over (t1, t2) -> sprintf "[%s \\OVER %s]" (pp_term t1) (pp_term t2)
+  | Ast.Atop (t1, t2) -> sprintf "[%s \\ATOP %s]" (pp_term t1) (pp_term t2)
+  | Ast.Frac (t1, t2) -> sprintf "\\FRAC %s %s" (pp_term t1) (pp_term t2)
+  | Ast.Sqrt t -> sprintf "\\SQRT %s" (pp_term t)
+  | Ast.Root (arg, index) ->
       sprintf "\\ROOT %s \\OF %s" (pp_term index) (pp_term arg)
-(*   | Break -> "\\BREAK" *)
+  | Ast.Break -> "\\BREAK"
 (*   | Space -> "\\SPACE" *)
-  | Box (box_spec, terms) ->
+  | Ast.Box (box_spec, terms) ->
       sprintf "\\%s [%s]" (pp_box_spec box_spec)
         (String.concat " " (List.map pp_term terms))
+  | Ast.Group terms ->
+      sprintf "\\GROUP [%s]" (String.concat " " (List.map pp_term terms))
 
 and pp_magic = function
-  | List0 (t, sep_opt) ->
-      sprintf "\\LIST0 %s%s" (pp_term t) (pp_sep_opt sep_opt)
-  | List1 (t, sep_opt) ->
-      sprintf "\\LIST1 %s%s" (pp_term t) (pp_sep_opt sep_opt)
-  | Opt t -> sprintf "\\OPT %s" (pp_term t)
-  | Fold (k, p_base, names, p_rec) ->
+  | Ast.List0 (t, sep_opt) ->
+      sprintf "list0 %s%s" (pp_term t) (pp_sep_opt sep_opt)
+  | Ast.List1 (t, sep_opt) ->
+      sprintf "list1 %s%s" (pp_term t) (pp_sep_opt sep_opt)
+  | Ast.Opt t -> sprintf "opt %s" (pp_term t)
+  | Ast.Fold (kind, p_base, names, p_rec) ->
       let acc = match names with acc :: _ -> acc | _ -> assert false in
-      sprintf "\\FOLD %s \\[%s\\] \\LAMBDA %s \\[%s\\]"
-        (pp_fold_kind k) (pp_term p_base) acc (pp_term p_rec)
-  | Default (p_some, p_none) ->
-      sprintf "\\DEFAULT \\[%s\\] \\[%s\\]" (pp_term p_some) (pp_term p_none)
-  | If (p_guard, p) ->
-      sprintf "\\IF \\[%s\\] \\[%s\\]" (pp_term p_guard) (pp_term p)
+      sprintf "fold %s %s rec %s %s"
+        (pp_fold_kind kind) (pp_term p_base) acc (pp_term p_rec)
+  | Ast.Default (p_some, p_none) ->
+      sprintf "default %s %s" (pp_term p_some) (pp_term p_none)
+  | Ast.If (p_test, p_true, p_false) ->
+      sprintf "if %s then %s else %s"
+	(pp_term p_test) (pp_term p_true) (pp_term p_false)
+  | Ast.Fail -> "fail"
 
 and pp_fold_kind = function
   | `Left -> "left"
@@ -165,30 +223,32 @@ and pp_fold_kind = function
 
 and pp_sep_opt = function
   | None -> ""
-  | Some sep -> sprintf "\\SEP %s" (pp_literal sep)
+  | Some sep -> sprintf " sep %s" (pp_literal sep)
 
 and pp_variable = function
-  | NumVar s -> "\\NUM " ^ s
-  | IdentVar s -> "\\IDENT " ^ s
-  | TermVar s -> "\\TERM " ^ s
-  | Ascription (t, n) -> sprintf "[%s \\AS %s]" (pp_term t) n
-  | FreshVar n -> "\\FRESH " ^ n
+  | Ast.NumVar s -> "number " ^ s
+  | Ast.IdentVar s -> "ident " ^ s
+  | Ast.TermVar s -> "term " ^ s
+  | Ast.Ascription (t, n) -> assert false
+  | Ast.FreshVar n -> "fresh " ^ n
+
+let pp_term t = pp_term ~pp_parens:false t
 
 let rec pp_value = function
-  | TermValue t -> sprintf "$%s$" (pp_term t)
-  | StringValue s -> sprintf "\"%s\"" s
-  | NumValue n -> n
-  | OptValue (Some v) -> "Some " ^ pp_value v
-  | OptValue None -> "None"
-  | ListValue l -> sprintf "[%s]" (String.concat "; " (List.map pp_value l))
+  | Env.TermValue t -> sprintf "$%s$" (pp_term t)
+  | Env.StringValue s -> sprintf "\"%s\"" s
+  | Env.NumValue n -> n
+  | Env.OptValue (Some v) -> "Some " ^ pp_value v
+  | Env.OptValue None -> "None"
+  | Env.ListValue l -> sprintf "[%s]" (String.concat "; " (List.map pp_value l))
 
 let rec pp_value_type =
   function
-  | TermType -> "Term"
-  | StringType -> "String"
-  | NumType -> "Number"
-  | OptType t -> "Maybe " ^ pp_value_type t
-  | ListType l -> "List " ^ pp_value_type l
+  | Env.TermType -> "Term"
+  | Env.StringType -> "String"
+  | Env.NumType -> "Number"
+  | Env.OptType t -> "Maybe " ^ pp_value_type t
+  | Env.ListType l -> "List " ^ pp_value_type l
 
 let pp_env env =
   String.concat "; "