Commits

camlspotter committed bd58b2c Merge

merge

  • Participants
  • Parent commits 6519f79, eeb1904
  • Branches custom-3.12.0

Comments (0)

Files changed (6)

0scripts/0CONF.sh

 BIGVERSION=`echo $VERSION | sed -r -e 's/^([0-9]+\.[0-9]+)\..*$/\1/'`
 
 OCAMLSPOTVERSION=$VERSION-$SPOTVERSION
+
+# HG TAG FOR PURE OCAML
 HG_PURE_OCAML="ocaml-$VERSION-$SVNREV"

boot/myocamlbuild.boot

Binary file modified.

boot/ocamlc

Binary file modified.

boot/ocamldep

Binary file modified.

boot/ocamllex

Binary file modified.

typing/typecore.ml

 (* Typing of expressions *)
 
 let unify_exp env exp expected_ty =
+  (* Format.eprintf "@[%a@ %a@]@." Printtyp.raw_type_expr exp.exp_type
+    Printtyp.raw_type_expr expected_ty; *)
   try
     unify env exp.exp_type expected_ty
   with
         exp_type = create_package_type loc env (p, l);
         exp_env = env }
   | Pexp_open (lid, e) ->
-      (* workaround to get better loaction *)
+      (* workaround to get better location *)
       let loc = Spot.Location_bound.upperbound loc e.pexp_loc in
       type_exp (!type_open env loc lid) e