Commit f01936d9 authored by Raphael Rieu-Helft's avatar Raphael Rieu-Helft

Cosmetic change

parent 6b352161
...@@ -556,7 +556,7 @@ let print_meta_arg_type fmt = function ...@@ -556,7 +556,7 @@ let print_meta_arg_type fmt = function
| MTprsymbol -> fprintf fmt "[proposition]" | MTprsymbol -> fprintf fmt "[proposition]"
| MTstring -> fprintf fmt "[string]" | MTstring -> fprintf fmt "[string]"
| MTint -> fprintf fmt "[integer]" | MTint -> fprintf fmt "[integer]"
| MTident -> fprintf fmt "[identifier]" | MTid -> fprintf fmt "[identifier]"
let print_meta_arg fmt = function let print_meta_arg fmt = function
| MAty ty -> fprintf fmt "type %a" print_ty ty; forget_tvs () | MAty ty -> fprintf fmt "type %a" print_ty ty; forget_tvs ()
...@@ -565,7 +565,7 @@ let print_meta_arg fmt = function ...@@ -565,7 +565,7 @@ let print_meta_arg fmt = function
| MApr pr -> fprintf fmt "prop %a" print_pr pr | MApr pr -> fprintf fmt "prop %a" print_pr pr
| MAstr s -> fprintf fmt "\"%s\"" s | MAstr s -> fprintf fmt "\"%s\"" s
| MAint i -> fprintf fmt "%d" i | MAint i -> fprintf fmt "%d" i
| MAident i -> fprintf fmt "%a" Ident.print_decoded (id_unique sprinter i) | MAid i -> fprintf fmt "%a" Ident.print_decoded (id_unique sprinter i)
let print_qt fmt th = let print_qt fmt th =
if th.th_path = [] then print_th fmt th else if th.th_path = [] then print_th fmt th else
......
...@@ -83,7 +83,7 @@ type meta_arg_type = ...@@ -83,7 +83,7 @@ type meta_arg_type =
| MTprsymbol | MTprsymbol
| MTstring | MTstring
| MTint | MTint
| MTident | MTid
type meta_arg = type meta_arg =
| MAty of ty | MAty of ty
...@@ -92,7 +92,7 @@ type meta_arg = ...@@ -92,7 +92,7 @@ type meta_arg =
| MApr of prsymbol | MApr of prsymbol
| MAstr of string | MAstr of string
| MAint of int | MAint of int
| MAident of ident | MAid of ident
type meta = { type meta = {
meta_name : string; meta_name : string;
...@@ -237,7 +237,7 @@ module Hstdecl = Hashcons.Make (struct ...@@ -237,7 +237,7 @@ module Hstdecl = Hashcons.Make (struct
| MApr pr -> pr_hash pr | MApr pr -> pr_hash pr
| MAstr s -> Hashtbl.hash s | MAstr s -> Hashtbl.hash s
| MAint i -> Hashtbl.hash i | MAint i -> Hashtbl.hash i
| MAident i -> Ident.id_hash i | MAid i -> Ident.id_hash i
let hs_smap sm h = let hs_smap sm h =
Mts.fold hs_cl_ty sm.sm_ty Mts.fold hs_cl_ty sm.sm_ty
...@@ -871,7 +871,7 @@ let get_meta_arg_type = function ...@@ -871,7 +871,7 @@ let get_meta_arg_type = function
| MApr _ -> MTprsymbol | MApr _ -> MTprsymbol
| MAstr _ -> MTstring | MAstr _ -> MTstring
| MAint _ -> MTint | MAint _ -> MTint
| MAident _ -> MTident | MAid _ -> MTid
let create_meta m al = let create_meta m al =
let get_meta_arg at a = let get_meta_arg at a =
...@@ -970,7 +970,7 @@ let print_meta_arg_type fmt = function ...@@ -970,7 +970,7 @@ let print_meta_arg_type fmt = function
| MTprsymbol -> fprintf fmt "proposition" | MTprsymbol -> fprintf fmt "proposition"
| MTstring -> fprintf fmt "string" | MTstring -> fprintf fmt "string"
| MTint -> fprintf fmt "int" | MTint -> fprintf fmt "int"
| MTident -> fprintf fmt "identifier" | MTid -> fprintf fmt "identifier"
let () = Exn_printer.register let () = Exn_printer.register
begin fun fmt exn -> match exn with begin fun fmt exn -> match exn with
......
...@@ -43,7 +43,7 @@ type meta_arg_type = ...@@ -43,7 +43,7 @@ type meta_arg_type =
| MTprsymbol | MTprsymbol
| MTstring | MTstring
| MTint | MTint
| MTident | MTid
type meta_arg = type meta_arg =
| MAty of ty | MAty of ty
...@@ -52,7 +52,7 @@ type meta_arg = ...@@ -52,7 +52,7 @@ type meta_arg =
| MApr of prsymbol | MApr of prsymbol
| MAstr of string | MAstr of string
| MAint of int | MAint of int
| MAident of ident | MAid of ident
type meta = private { type meta = private {
meta_name : string; meta_name : string;
......
...@@ -1483,7 +1483,7 @@ let add_decl muc env file d = ...@@ -1483,7 +1483,7 @@ let add_decl muc env file d =
| Ptree.Max q -> MApr (find_prop_of_kind Paxiom tuc q) | Ptree.Max q -> MApr (find_prop_of_kind Paxiom tuc q)
| Ptree.Mlm q -> MApr (find_prop_of_kind Plemma tuc q) | Ptree.Mlm q -> MApr (find_prop_of_kind Plemma tuc q)
| Ptree.Mgl q -> MApr (find_prop_of_kind Pgoal tuc q) | Ptree.Mgl q -> MApr (find_prop_of_kind Pgoal tuc q)
| Ptree.Mval q -> MAident (find_rsymbol muc q).rs_name | Ptree.Mval q -> MAid (find_rsymbol muc q).rs_name
| Ptree.Mstr s -> MAstr s | Ptree.Mstr s -> MAstr s
| Ptree.Mint i -> MAint i in | Ptree.Mint i -> MAint i in
add_meta muc (lookup_meta id.id_str) (List.map convert al) add_meta muc (lookup_meta id.id_str) (List.map convert al)
......
...@@ -370,7 +370,7 @@ let print_meta_arg fmt = function ...@@ -370,7 +370,7 @@ let print_meta_arg fmt = function
| MApr pr -> fprintf fmt "prop %a" print_pr pr | MApr pr -> fprintf fmt "prop %a" print_pr pr
| MAstr s -> fprintf fmt "\"%s\"" s | MAstr s -> fprintf fmt "\"%s\"" s
| MAint i -> fprintf fmt "%d" i | MAint i -> fprintf fmt "%d" i
| MAident id -> fprintf fmt "%s" (id_unique iprinter id) | MAid id -> fprintf fmt "%s" (id_unique iprinter id)
let print_qt fmt th = let print_qt fmt th =
if th.th_path = [] then print_th fmt th else if th.th_path = [] then print_th fmt th else
......
...@@ -629,7 +629,7 @@ module Checksum = struct ...@@ -629,7 +629,7 @@ module Checksum = struct
| Theory.MTprsymbol -> char b 'p' | Theory.MTprsymbol -> char b 'p'
| Theory.MTstring -> char b 's' | Theory.MTstring -> char b 's'
| Theory.MTint -> char b 'i' | Theory.MTint -> char b 'i'
| Theory.MTident -> char b 'd' | Theory.MTid -> char b 'd'
let meta b m = let meta b m =
string b m.Theory.meta_name; string b m.Theory.meta_name;
...@@ -643,7 +643,7 @@ module Checksum = struct ...@@ -643,7 +643,7 @@ module Checksum = struct
| Theory.MApr pr -> char b 'p'; ident b pr.Decl.pr_name | Theory.MApr pr -> char b 'p'; ident b pr.Decl.pr_name
| Theory.MAstr s -> char b 's'; string b s | Theory.MAstr s -> char b 's'; string b s
| Theory.MAint i -> char b 'i'; int b i | Theory.MAint i -> char b 'i'; int b i
| Theory.MAident i -> char b 'd'; ident b i | Theory.MAid i -> char b 'd'; ident b i
let tdecl b d = match d.Theory.td_node with let tdecl b d = match d.Theory.td_node with
| Theory.Decl d -> decl b d | Theory.Decl d -> decl b d
......
...@@ -149,7 +149,7 @@ let add_meta_id_args (al: meta_arg list) (tables: naming_table): naming_table = ...@@ -149,7 +149,7 @@ let add_meta_id_args (al: meta_arg list) (tables: naming_table): naming_table =
List.fold_left List.fold_left
(fun t a -> (fun t a ->
match a with match a with
| MAident id -> | MAid id ->
let s = id_unique tables id in let s = id_unique tables id in
{ tables with meta_id_args = Mstr.add s id tables.meta_id_args } { tables with meta_id_args = Mstr.add s id tables.meta_id_args }
| _ -> t) | _ -> t)
......
...@@ -159,7 +159,7 @@ let fold tenv taskpre task = ...@@ -159,7 +159,7 @@ let fold tenv taskpre task =
| MApr _ -> raise Exit | MApr _ -> raise Exit
| MAstr _ as s -> s | MAstr _ as s -> s
| MAint _ as i -> i | MAint _ as i -> i
| MAident _ as i -> i | MAid _ as i -> i
in in
let arg = List.map map ml in let arg = List.map map ml in
add_meta (decl_ud ud task) meta arg add_meta (decl_ud ud task) meta arg
......
...@@ -32,7 +32,7 @@ let meta_decision_procedure = ...@@ -32,7 +32,7 @@ let meta_decision_procedure =
Theory.register_meta Theory.register_meta
~desc:"decision procedure, used for reflection" ~desc:"decision procedure, used for reflection"
"reflection" "reflection"
[ Theory.MTident ] [ Theory.MTid ]
type reify_env = { kn: known_map; type reify_env = { kn: known_map;
store: (vsymbol * int) Mterm.t; store: (vsymbol * int) Mterm.t;
...@@ -649,7 +649,7 @@ let reflection_by_function do_trans s env = Trans.store (fun task -> ...@@ -649,7 +649,7 @@ let reflection_by_function do_trans s env = Trans.store (fun task ->
Debug.dprintf debug_refl "looking for symbol %s@." fname; Debug.dprintf debug_refl "looking for symbol %s@." fname;
let (pmod, rs) = let (pmod, rs) =
let fn acc = function let fn acc = function
| [ MAident id ] -> | [ MAid id ] ->
Debug.dprintf debug_refl "found symbol %s@." id.id_string; Debug.dprintf debug_refl "found symbol %s@." id.id_string;
if id_equal id fid if id_equal id fid
then id :: acc then id :: acc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment