let add_level_info prec assoc t = Ast.AttributedTerm (`Level (prec, assoc), t)
let add_pos_info pos t = Ast.AttributedTerm (`ChildPos pos, t)
+let left_pos = add_pos_info `Left
+let right_pos = add_pos_info `Right
+let inner_pos = add_pos_info `Inner
+
+let rec top_pos t = add_level_info ~-1 Gramext.NonA (inner_pos t)
+(* function
+ | Ast.AttributedTerm (`Level _, t) ->
+ add_level_info ~-1 Gramext.NonA (inner_pos t)
+ | Ast.AttributedTerm (attr, t) -> Ast.AttributedTerm (attr, top_pos t)
+ | t -> add_level_info ~-1 Gramext.NonA (inner_pos t) *)
let rec remove_level_info =
function
let rec aux =
function
| Ast.Appl ts ->
+ let rec aux_args pos =
+ function
+ | [] -> []
+ | [ last ] ->
+ let last = k last in
+ if pos = `Left then [ left_pos last ] else [ right_pos last ]
+ | hd :: tl ->
+ (add_pos_info pos (k hd)) :: aux_args `Inner tl
+ in
add_level_info Ast.apply_prec Ast.apply_assoc
- (hovbox true true (CicNotationUtil.dress break (List.map k ts)))
+ (hovbox true true (CicNotationUtil.dress break (aux_args `Left ts)))
| Ast.Binder (binder_kind, (id, ty), body) ->
add_level_info Ast.binder_prec Ast.binder_assoc
(hvbox false true
[ binder_symbol (resolve_binder binder_kind);
k id; builtin_symbol ":"; aux_ty ty; break;
- builtin_symbol "."; k body ])
+ builtin_symbol "."; right_pos (k body) ])
| Ast.Case (what, indty_opt, outty_opt, patterns) ->
let outty_box =
match outty_opt with
| None -> []
| Some outty ->
- [ builtin_symbol "["; remove_level_info (k outty);
- builtin_symbol "]"; break ]
+ [ keyword "return"; break; remove_level_info (k outty)]
in
let indty_box =
match indty_opt with
| None -> []
- | Some (indty, href) -> [ keyword "in"; ident_w_href href indty ]
+ | Some (indty, href) -> [ keyword "in"; break; ident_w_href href indty ]
in
let match_box =
- hvbox false true [
- keyword "match"; break;
- hvbox false false ([ k what ] @ indty_box); break;
- keyword "with" ]
+ hvbox false false [
+ hvbox false true [
+ hvbox false true [ keyword "match"; break; top_pos (k what) ];
+ break;
+ hvbox false true indty_box;
+ break;
+ hvbox false true outty_box
+ ];
+ break;
+ keyword "with"
+ ]
in
let mk_case_pattern (head, href, vars) =
hbox true false (ident_w_href href head :: List.map aux_var vars)
(hvbox false true [
hbox false true [
mk_case_pattern lhs; builtin_symbol "\\Rightarrow" ];
- break; k rhs ]))
+ break; top_pos (k rhs) ]))
patterns
in
let patterns'' =
in
add_level_info Ast.simple_prec Ast.simple_assoc
(hvbox false false [
- hvbox false false (outty_box @ [ match_box ]); break;
+ hvbox false false ([match_box]); break;
hbox false false [ hvbox false false patterns'' ] ])
| Ast.Cast (bo, ty) ->
add_level_info Ast.simple_prec Ast.simple_assoc
(hvbox false true [
- builtin_symbol "("; k bo; break; builtin_symbol ":"; k ty;
- builtin_symbol ")"])
+ builtin_symbol "("; top_pos (k bo); break; builtin_symbol ":";
+ top_pos (k ty); builtin_symbol ")"])
| Ast.LetIn (var, s, t) ->
add_level_info Ast.let_in_prec Ast.let_in_assoc
(hvbox false true [
hvbox false true [
keyword "let";
hvbox false true [
- aux_var var; builtin_symbol "\\def"; break; k s ];
+ aux_var var; builtin_symbol "\\def"; break; top_pos (k s) ];
break; keyword "in" ];
break;
k t ])
let (name, body) = fst_fun in
hvbox false true [
keyword "let"; keyword rec_op; name; builtin_symbol "\\def"; break;
- body ]
+ top_pos body ]
in
let tl_rows =
List.map
| Cic.ASort (id,Cic.Set) -> idref id (Ast.Sort `Set)
| Cic.ASort (id,Cic.Type u) -> idref id (Ast.Sort (`Type u))
| Cic.ASort (id,Cic.CProp) -> idref id (Ast.Sort `CProp)
- | Cic.AImplicit _ -> assert false
+ | Cic.AImplicit (id, Some `Hole) -> idref id Ast.UserInput
+ | Cic.AImplicit (id, _) -> idref id Ast.Implicit
| Cic.AProd (id,n,s,t) ->
let binder_kind =
match sort_of_id id with
| t -> CicNotationUtil.group (subst pos env t)
and subst pos env = function
| Ast.AttributedTerm (attr, t) as term ->
- prerr_endline ("loosing attribute " ^ CicNotationPp.pp_attribute attr);
+(* prerr_endline ("loosing attribute " ^ CicNotationPp.pp_attribute attr); *)
subst pos env t
| Ast.Variable var ->
let name, expected_ty = CicNotationEnv.declaration_of_var var in
match pos with
| `Inner -> `Right
| `Left -> `Left
- | `None -> assert false
+(* | `None -> assert false *)
| `Right -> `Right
in
[ subst pos' env child ]
match pos with
| `Inner -> `Inner
| `Left -> `Inner
- | `None -> assert false
+(* | `None -> assert false *)
| `Right -> `Right
in
(subst pos env hd) :: subst_children pos' env tl
let idrefs =
List.flatten (List.map CicNotationUtil.get_idrefs ctors)
in
- let prec, assoc, l1 =
+ let l1 =
try
Hashtbl.find level1_patterns21 pid
with Not_found -> assert false
in
- add_level_info prec assoc
- (instantiate21 idrefs (ast_env_of_env env) l1))
+ instantiate21 idrefs (ast_env_of_env env) l1)
let instantiate32 term_info idrefs env symbol args =
let rec instantiate_arg = function
Ast.AttributedTerm (`IdRef (CicUtil.id_of_annterm annterm), ast)
let load_patterns32 t =
+ let t =
+ HExtlib.filter_map (function (true, ap, id) -> Some (ap, id) | _ -> None) t
+ in
set_compiled32 (lazy (CicNotationMatcher.Matcher32.compiler t))
let load_patterns21 t =
let add_interpretation dsc (symbol, args) appl_pattern =
let id = fresh_id () in
Hashtbl.add level2_patterns32 id (dsc, symbol, args, appl_pattern);
- pattern32_matrix := (appl_pattern, id) :: !pattern32_matrix;
+ pattern32_matrix := (true, appl_pattern, id) :: !pattern32_matrix;
load_patterns32 !pattern32_matrix;
(try
let ids = Hashtbl.find interpretations symbol in
with Not_found -> Hashtbl.add interpretations symbol (ref [id]));
id
+let get_all_interpretations () =
+ List.map
+ (function (_, _, id) ->
+ let (dsc, _, _, _) =
+ try
+ Hashtbl.find level2_patterns32 id
+ with Not_found -> assert false
+ in
+ (id, dsc))
+ !pattern32_matrix
+
+let get_active_interpretations () =
+ HExtlib.filter_map (function (true, _, id) -> Some id | _ -> None)
+ !pattern32_matrix
+
+let set_active_interpretations ids =
+ let pattern32_matrix' =
+ List.map
+ (function
+ | (_, ap, id) when List.mem id ids -> (true, ap, id)
+ | (_, ap, id) -> (false, ap, id))
+ !pattern32_matrix
+ in
+ pattern32_matrix := pattern32_matrix';
+ load_patterns32 !pattern32_matrix
+
exception Interpretation_not_found
exception Pretty_printer_not_found
!(Hashtbl.find interpretations symbol)))
with Not_found -> raise Interpretation_not_found
+let fill_pos_info l1_pattern = l1_pattern
+(* let rec aux toplevel pos =
+ function
+ | Ast.Layout l ->
+ (match l
+
+ | Ast.Magic m ->
+ Ast.Box (
+ | Ast.Variable _ as t -> add_pos_info pos t
+ | t -> t
+ in
+ aux true l1_pattern *)
+
let add_pretty_printer ~precedence ~associativity l2 l1 =
let id = fresh_id () in
+ let l1' = add_level_info precedence associativity (fill_pos_info l1) in
let l2' = CicNotationUtil.strip_attributes l2 in
- Hashtbl.add level1_patterns21 id (precedence, associativity, l1);
+ Hashtbl.add level1_patterns21 id l1';
pattern21_matrix := (l2', id) :: !pattern21_matrix;
load_patterns21 !pattern21_matrix;
id
ids := List.filter ((<>) id) !ids;
Hashtbl.remove level2_patterns32 id;
with Not_found -> raise Interpretation_not_found);
- pattern32_matrix := List.filter (fun (_, id') -> id <> id') !pattern32_matrix;
+ pattern32_matrix :=
+ List.filter (fun (_, _, id') -> id <> id') !pattern32_matrix;
load_patterns32 !pattern32_matrix
let remove_pretty_printer id =
projects / helm.git / blobdiff