X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_ag%2FbagType.ml;h=9cf5c5cb7d6334b9f69ab5d4eb7cb8190e75d3e9;hb=13c3708fc59d999727ee214e8ece1f03661a9737;hp=8aee519202eac11501752fb8b2c75c0ee3e56dc7;hpb=1ae23fe33b8647a4b8616e666dc5703c17678069;p=helm.git diff --git a/helm/software/lambda-delta/basic_ag/bagType.ml b/helm/software/lambda-delta/basic_ag/bagType.ml index 8aee51920..9cf5c5cb7 100644 --- a/helm/software/lambda-delta/basic_ag/bagType.ml +++ b/helm/software/lambda-delta/basic_ag/bagType.ml @@ -14,7 +14,6 @@ module C = Cps module S = Share module L = Log module H = Hierarchy -module I = AutItem module B = Bag module O = BagOutput module E = BagEnvironment @@ -26,61 +25,29 @@ exception TypeError of B.message let level = 4 -let error1 s c t = - raise (TypeError (L.ct_items1 s c t)) +let log1 s c t = + let sc, st = s ^ " in the context", "the term" in + L.log O.specs level (L.ct_items1 sc c st t) -let error2 s1 c1 t1 s2 c2 t2 = - raise (TypeError (L.ct_items2 s1 c1 t1 s2 c2 t2)) +let error1 st c t = + let sc = "In the context" in + raise (TypeError (L.ct_items1 sc c st t)) + +let error3 c t1 t2 t3 = + let sc, st1, st2, st3 = + "In the context", "the term", "is of type", "but must be of type" + in + raise (TypeError (L.ct_items3 sc c st1 t1 st2 t2 st3 t3)) let mk_gref u l = let map t v = B.Appl (v, t) in List.fold_left map (B.GRef u) l -let add_coercion f t (i, uri, vs) = - let rec add f x = match x with - | B.Sort _ - | B.LRef _ - | B.GRef _ -> f x - | B.Cast (u, t) -> - let f uu = - let f tt = f (S.sh2 u uu t tt x B.cast) in - add f t - in - add f u - | B.Appl (v, t) -> - let f vv = - let f tt = f (S.sh2 v vv t tt x B.appl) in - add f t - in - add f v - | B.Bind (l, _, _, _) when i = l -> - if U.eq uri I.imp then f (mk_gref I.mt (vs @ [x])) else - if U.eq uri I.all then f (mk_gref I.alli (vs @ [x])) else - assert false - | B.Bind (l, id, B.Abst w, t) -> - let f ww = - let f tt = f (S.sh2 w ww t tt x (B.bind_abst l id)) in - add f t - in - add f w - | B.Bind (l, id, B.Abbr v, t) -> - let f vv = - let f tt = f (S.sh2 v vv t tt x (B.bind_abbr l id)) in - add f t - in - add f v - | B.Bind (l, id, B.Void, t) -> - let f tt = f (S.sh1 t tt x (B.bind l id B.Void)) in - add f t - in - add f t - -let add_coercions f = C.list_fold_left f add_coercion - (* Interface functions ******************************************************) let rec b_type_of f g c x = - L.log O.specs level (L.ct_items1 "Now checking" c x); +(* L.warn "Entering T.b_type_of"; *) + log1 "Now checking" c x; match x with | B.Sort h -> let f h = f x (B.Sort h) in H.apply f g h @@ -109,7 +76,7 @@ let rec b_type_of f g c x = f (S.sh2 v xv t xt x (B.bind_abbr l id)) (B.bind_abbr l id xv tt) in let f xv cc = b_type_of (f xv) g cc t in - let f xv = B.push (f xv) c l id (B.Abbr xv) in + let f xv = B.push "type abbr" (f xv) c l id (B.Abbr xv) in let f xv vv = match xv with | B.Cast _ -> f xv | _ -> f (B.Cast (vv, xv)) @@ -120,56 +87,41 @@ let rec b_type_of f g c x = f (S.sh2 u xu t xt x (B.bind_abst l id)) (B.bind_abst l id xu tt) in let f xu cc = b_type_of (f xu) g cc t in - let f xu _ = B.push (f xu) c l id (B.Abst xu) in + let f xu _ = B.push "type abst" (f xu) c l id (B.Abst xu) in type_of f g c u | B.Bind (l, id, B.Void, t) -> let f xt tt = f (S.sh1 t xt x (B.bind l id B.Void)) (B.bind l id B.Void tt) in let f cc = b_type_of f g cc t in - B.push f c l id B.Void + B.push "type void" f c l id B.Void | B.Appl (v, t) -> let f xv vv xt tt = function | R.Abst w -> L.box (succ level); - L.log O.specs (succ level) (L.ct_items1 "Just scanned" c w); + L.log O.specs (succ level) (L.t_items1 "Just scanned" c w); L.unbox (succ level); - let f = function - | Some [] -> f (S.sh2 v xv t xt x B.appl) (B.appl xv tt) - | Some l -> - L.log O.specs level (L.items1 "Rechecking coerced term"); - let f xv = b_type_of f g c (S.sh2 v xv t xt x B.appl) in - add_coercions f xv l - | None -> error2 "The term" c xv "must be of type" c w + let f a = +(* L.warn (Printf.sprintf "Convertible: %b" a); *) + if a then f (S.sh2 v xv t xt x B.appl) (B.appl xv tt) + else error3 c xv vv w in R.are_convertible f c w vv -(* inserting a missing "modus ponens" *) - | R.GRef (uri, vs) when U.eq uri I.imp -> - L.log O.specs level (L.items1 "Rechecking coerced term"); - b_type_of f g c (mk_gref I.mp (vs @ [xv; xt])) - | R.GRef (uri, vs) when U.eq uri I.all -> - L.log O.specs level (L.items1 "Rechecking coerced term"); - b_type_of f g c (mk_gref I.alle (vs @ [xv; xt])) - | _ -> + | _ -> error1 "not a function" c xt in let f xv vv xt tt = R.ho_whd (f xv vv xt tt) c tt in let f xv vv = b_type_of (f xv vv) g c t in type_of f g c v | B.Cast (u, t) -> - let f xu xt = function - | Some [] -> f (S.sh2 u xu t xt x B.cast) xu - | Some l -> - L.log O.specs level (L.items1 "Rechecking coerced term"); - let f xt = b_type_of f g c (S.sh2 u xu t xt x B.cast) in - add_coercions f xt l - | None -> error2 "The term" c xt "must be of type" c xu + let f xu xt tt a = + (* L.warn (Printf.sprintf "Convertible: %b" a); *) + if a then f (S.sh2 u xu t xt x B.cast) xu else error3 c xt tt xu in - let f xu xt tt = R.are_convertible (f xu xt) c xu tt in + let f xu xt tt = R.are_convertible (f xu xt tt) c xu tt in let f xu _ = b_type_of (f xu) g c t in type_of f g c u and type_of f g c x = let f t u = L.unbox level; f t u in L.box level; b_type_of f g c x -