module Ast = CicNotationPt
module NRef = NReference
+let debug_print s = prerr_endline (Lazy.force s);;
let debug_print _ = ();;
-(* let debug_print s = prerr_endline (Lazy.force s);; *)
let cic_name_of_name = function
| Ast.Ident (n, None) -> n
in
let metasenv, subst, term, _ =
NCicRefiner.typeof
- { rdb with NRstatus.coerc_db =
- if use_coercions then rdb.NRstatus.coerc_db
- else NCicCoercion.empty_db }
+ (rdb#set_coerc_db
+ (if use_coercions then rdb#coerc_db else NCicCoercion.empty_db))
metasenv subst context term expty ~localise
in
Disambiguate.Ok (term, metasenv, subst, ())
;;
let refine_obj
- ~rdb metasenv subst context _uri
+ ~rdb metasenv subst _context _uri
~use_coercions obj _ _ugraph ~localization_tbl
=
assert (metasenv=[]);
let localise t =
try NCicUntrusted.NCicHash.find localization_tbl t
with Not_found ->
- prerr_endline (NCicPp.ppterm ~metasenv ~subst ~context t);
(*assert false*)HExtlib.dummy_floc
in
try
let obj =
NCicRefiner.typeof_obj
- { rdb with NRstatus.coerc_db =
- if use_coercions then rdb.NRstatus.coerc_db
- else NCicCoercion.empty_db }
+ (rdb#set_coerc_db
+ (if use_coercions then rdb#coerc_db
+ else NCicCoercion.empty_db))
obj ~localise
in
Disambiguate.Ok (obj, [], [], ())
NCicUntrusted.NCicHash.add localization_tbl res loc;
res
| CicNotationPt.AttributedTerm (_, term) -> aux ~localize loc context term
+ | CicNotationPt.Appl (CicNotationPt.Appl inner :: args) ->
+ aux ~localize loc context (CicNotationPt.Appl (inner @ args))
+ | CicNotationPt.Appl
+ (CicNotationPt.AttributedTerm (att,(CicNotationPt.Appl inner))::args)->
+ aux ~localize loc context
+ (CicNotationPt.AttributedTerm (att,CicNotationPt.Appl (inner @ args)))
| CicNotationPt.Appl (CicNotationPt.Symbol (symb, i) :: args) ->
let cic_args = List.map (aux ~localize loc context) args in
Disambiguate.resolve ~mk_choice ~env (Symbol (symb, i)) (`Args cic_args)
with Not_found ->
try NCic.Const (List.assoc name obj_context)
with Not_found ->
- Disambiguate.resolve ~env ~mk_choice (Id name) (`Args []))
+ Disambiguate.resolve ~env ~mk_choice (Id name) (`Args []))
| CicNotationPt.Uri (uri, subst) ->
assert (subst = None);
(try
with NRef.IllFormedReference _ ->
CicNotationPt.fail loc "Ill formed reference")
| CicNotationPt.NRef nref -> NCic.Const nref
- | CicNotationPt.Implicit -> NCic.Implicit `Term
+ | CicNotationPt.Implicit `Vector -> NCic.Implicit `Vector
+ | CicNotationPt.Implicit `JustOne -> NCic.Implicit `Term
| CicNotationPt.UserInput -> NCic.Implicit `Hole
| CicNotationPt.Num (num, i) ->
Disambiguate.resolve ~env ~mk_choice (Num i) (`Num_arg num)
NCic.Meta (index, (0, NCic.Ctx cic_subst))
| CicNotationPt.Sort `Prop -> NCic.Sort NCic.Prop
| CicNotationPt.Sort `Set -> NCic.Sort (NCic.Type
- [false,NUri.uri_of_string "cic:/matita/pts/Type.univ"])
+ [`Type,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/Type0.univ"])
+ [`Type,NUri.uri_of_string "cic:/matita/pts/Type0.univ"])
| CicNotationPt.Sort (`NType s) -> NCic.Sort (NCic.Type
- [false,NUri.uri_of_string ("cic:/matita/pts/Type" ^ s ^ ".univ")])
+ [`Type,NUri.uri_of_string ("cic:/matita/pts/Type" ^ s ^ ".univ")])
| CicNotationPt.Sort (`NCProp s) -> NCic.Sort (NCic.Type
- [false,NUri.uri_of_string ("cic:/matita/pts/CProp" ^ s ^ ".univ")])
+ [`CProp,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/CProp0.univ"])
+ [`CProp,NUri.uri_of_string "cic:/matita/pts/Type.univ"])
| CicNotationPt.Symbol (symbol, instance) ->
Disambiguate.resolve ~env ~mk_choice
(Symbol (symbol, instance)) (`Args [])
res
| Some (CicNotationPt.AttributedTerm (_, term)) ->
aux_option ~localize loc context annotation (Some term)
- | Some CicNotationPt.Implicit -> NCic.Implicit annotation
+ | Some CicNotationPt.Implicit `JustOne -> NCic.Implicit annotation
+ | Some CicNotationPt.Implicit `Vector -> NCic.Implicit `Vector
| Some term -> aux ~localize loc context term
in
(fun ~context -> aux ~localize:true HExtlib.dummy_floc context),
(fun (context,res) (name,t) ->
let t =
match t with
- None -> CicNotationPt.Implicit
+ None -> CicNotationPt.Implicit `JustOne
| Some t -> t in
let name = cic_name_of_name name in
let t =
let add_params =
List.fold_right (fun (name,ty) t -> NCic.Prod (name,ty,t)) params in
let leftno = List.length params in
+ let _,inductive,_,_ = try List.hd tyl with Failure _ -> assert false in
let obj_context =
snd (
List.fold_left
(fun (i,res) (name,_,_,_) ->
- let _,inductive,_,_ =
- (* ??? *)
- try List.hd tyl with Failure _ -> assert false in
let nref =
NReference.reference_of_spec uri (NReference.Ind (inductive,i,leftno))
in
let height = (* XXX calculate *) 0 in
let attrs = `Provided, `Regular in
uri, height, [], [],
- NCic.Inductive (true,leftno,tyl,attrs)
+ NCic.Inductive (inductive,leftno,tyl,attrs)
| CicNotationPt.Record (params,name,ty,fields) ->
let context,params =
let context,res =
(fun (context,res) (name,t) ->
let t =
match t with
- None -> CicNotationPt.Implicit
+ None -> CicNotationPt.Implicit `JustOne
| Some t -> t in
let name = cic_name_of_name name in
let t =