Commits

camlspotter  committed 5a22316

make world passed

  • Participants
  • Parent commits f958296
  • Branches typeloc

Comments (0)

Files changed (5)

File ocamldoc/odoc_misc.ml

     | Types.Tnil
     | Types.Tvariant _
     | Types.Tpackage _ -> t
-    | Types.Tloc (_, t2)
     | Types.Tlink t2
     | Types.Tsubst t2 -> iter t2.Types.desc
   in

File ocamldoc/odoc_print.ml

     | Types.Cty_signature cs ->
         (* on vire les vals et methods pour ne pas qu'elles soient imprimées
            quand on affichera le type *)
-        let tnil = { Types.desc = Types.Tnil ; Types.level = 0; Types.id = 0 } in
+        let tnil = { Types.desc = Types.Tnil ; Types.level = 0; Types.id = 0; tyloc = None } in
         Types.Cty_signature { Types.cty_self = { cs.Types.cty_self with
                                                   Types.desc = Types.Tobject (tnil, ref None) };
                                Types.cty_vars = Types.Vars.empty ;

File ocamldoc/odoc_str.ml

 let rec is_arrow_type t =
   match t.Types.desc with
     Types.Tarrow _ -> true
-  | Types.Tlink t2 | Types.Tsubst t2 | Types.Tloc (_, t2) -> is_arrow_type t2
+  | Types.Tlink t2 | Types.Tsubst t2 -> is_arrow_type t2
   | Types.Ttuple _
   | Types.Tconstr _
   | Types.Tvar _ | Types.Tunivar _ | Types.Tobject _ | Types.Tpoly _
   let rec need_parent t =
     match t.Types.desc with
       Types.Tarrow _ | Types.Ttuple _ -> true
-    | Types.Tlink t2 | Types.Tsubst t2 | Types.Tloc (_, t2) -> need_parent t2
+    | Types.Tlink t2 | Types.Tsubst t2 -> need_parent t2
     | Types.Tconstr _ ->
         false
     | Types.Tvar _ | Types.Tunivar _ | Types.Tobject _ | Types.Tpoly _

File ocamldoc/odoc_value.ml

       Types.Tarrow (l, t1, t2, _) ->
         (l, t1) :: (iter t2)
     | Types.Tlink texp
-    | Types.Tloc (_, texp)
     | Types.Tsubst texp ->
         iter texp
     | Types.Tpoly (texp, _) -> iter texp

File typing/typecore.ml

           instance !env ty, instance !env ty
         end else ty, ty
       in
-      let ty = add_loc loc ty in
+      (* let ty = add_loc loc ty in *) (* CR jfuruse: fails at Camlp4.ml *)
       unify_pat_types loc !env ty expected_ty;
       let p = type_pat sp expected_ty' in
       (*Format.printf "%a@.%a@."
       rue {
         exp_desc = arg.exp_desc;
         exp_loc = arg.exp_loc;
-        exp_type = add_loc arg.exp_loc ty';
+        exp_type = (* add_loc arg.exp_loc *) ty';
         exp_env = env;
         exp_extra = (Texp_constraint (cty, cty'), loc) :: arg.exp_extra;
       }
       rue {
         exp_desc = Texp_object (desc, (*sign,*) meths);
         exp_loc = loc; exp_extra = [];
-        exp_type = add_loc loc sign.cty_self;
+        exp_type = sign.cty_self;
         exp_env = env;
       }
   | Pexp_poly(sbody, sty) ->