| _ -> assert false
;;
-let refine_term metasenv subst context uri ~use_coercions:_ term _ ~localization_tbl =
+let refine_term
+ metasenv subst context uri ~coercion_db ~use_coercions term _ ~localization_tbl=
assert (uri=None);
debug_print (lazy (sprintf "TEST_INTERPRETATION: %s"
(NCicPp.ppterm ~metasenv ~subst ~context term)));
assert false
in
let metasenv, subst, term, _ =
- NCicRefiner.typeof metasenv subst context term None ~localise
+ NCicRefiner.typeof
+ (NCicUnifHint.db ())
+ ~look_for_coercion:(
+ if use_coercions then
+ NCicCoercion.look_for_coercion coercion_db
+ else (fun _ _ _ _ _ -> []))
+ metasenv subst context term None ~localise
in
Disambiguate.Ok (term, metasenv, subst, ())
with
assert (uri = None);
let rec aux ~localize loc context = function
- t ->
- let res =
- match t with
| CicNotationPt.AttributedTerm (`Loc loc, term) ->
let res = aux ~localize loc context term in
if localize then
List.nth itl indtyp_no
with _ -> assert false in
let rec count_prod t =
- match NCicReduction.whd [] t with
+ match NCicReduction.whd ~subst:[] [] t with
NCic.Prod (_, _, t) -> 1 + (count_prod t)
| _ -> 0
in
[false,NUri.uri_of_string "cic:/matita/pts/Type.univ"])
| CicNotationPt.Sort (`Type _u) -> NCic.Sort (NCic.Type
[false,NUri.uri_of_string "cic:/matita/pts/Type.univ"])
+ | CicNotationPt.Sort (`NType s) -> NCic.Sort (NCic.Type
+ [false,NUri.uri_of_string ("cic:/matita/pts/Type" ^ s ^ ".univ")])
| CicNotationPt.Sort (`CProp _u) -> NCic.Sort (NCic.Type
[false,NUri.uri_of_string "cic:/matita/pts/CProp.univ"])
| CicNotationPt.Symbol (symbol, instance) ->
Disambiguate.resolve ~env ~mk_choice
(Symbol (symbol, instance)) (`Args [])
- | _ -> assert false (* god bless Bologna *)
-
- in
-(* prerr_endline (NCicPp.ppterm ~metasenv:[] ~context:[] ~subst:[] res); *)
- res
+ | CicNotationPt.Variable _
+ | CicNotationPt.Magic _
+ | CicNotationPt.Layout _
+ | CicNotationPt.Literal _ -> assert false (* god bless Bologna *)
and aux_option ~localize loc context annotation = function
| None -> NCic.Implicit annotation
| Some (CicNotationPt.AttributedTerm (`Loc loc, term)) ->
~localization_tbl
;;
-let domain_of_term ~context =
- Disambiguate.domain_of_ast_term ~context
-;;
-
let disambiguate_term ~context ~metasenv ~subst ?goal
~mk_implicit ~description_of_alias ~mk_choice
- ~aliases ~universe ~lookup_in_library
+ ~aliases ~universe ~coercion_db ~lookup_in_library
(text,prefix_len,term)
=
let mk_localization_tbl x = NCicUntrusted.NCicHash.create x in
~string_context_of_context:(List.map (fun (x,_) -> Some x))
~universe ~uri:None ~pp_thing:CicNotationPp.pp_term
~passes:(MultiPassDisambiguator.passes ())
- ~lookup_in_library ~domain_of_thing:domain_of_term
+ ~lookup_in_library ~domain_of_thing:Disambiguate.domain_of_term
~interpretate_thing:(interpretate_term ~mk_choice (?create_dummy_ids:None))
- ~refine_thing:refine_term (text,prefix_len,term)
+ ~refine_thing:(refine_term ~coercion_db) (text,prefix_len,term)
~mk_localization_tbl ~hint ~subst
in
List.map (function (a,b,c,d,_) -> a,b,c,d) res, b
NCicEnvironment.add_constraint true (mk_type 0) (mk_cprop 1);
NCicEnvironment.add_constraint false (mk_cprop 0) (mk_type 0);
NCicEnvironment.add_constraint false (mk_type 0) (mk_cprop 0);
+
+ NCicEnvironment.add_constraint true (mk_type 1) (mk_type 2);
+ NCicEnvironment.add_constraint true (mk_cprop 1) (mk_cprop 2);
+ NCicEnvironment.add_constraint true (mk_cprop 1) (mk_type 2);
+ NCicEnvironment.add_constraint true (mk_type 1) (mk_cprop 2);
+ NCicEnvironment.add_constraint false (mk_cprop 1) (mk_type 1);
+ NCicEnvironment.add_constraint false (mk_type 1) (mk_cprop 1);
+
+ NCicEnvironment.add_constraint true (mk_type 2) (mk_type 3);
+ NCicEnvironment.add_constraint true (mk_cprop 2) (mk_cprop 3);
+ NCicEnvironment.add_constraint true (mk_cprop 2) (mk_type 3);
+ NCicEnvironment.add_constraint true (mk_type 2) (mk_cprop 3);
+ NCicEnvironment.add_constraint false (mk_cprop 2) (mk_type 2);
+ NCicEnvironment.add_constraint false (mk_type 2) (mk_cprop 2);
+
+ NCicEnvironment.add_constraint false (mk_cprop 3) (mk_type 3);
+ NCicEnvironment.add_constraint false (mk_type 3) (mk_cprop 3);
+
;;