Merge branch 'master' into auto_tuple

ocaml/fstar-lib/FStar_Extraction_ML_PrintML.ml

@@ -89,6 +89,7 @@ let mk_top_mllb (e: mlexpr): mllb =
    mllb_add_unit=false;
    mllb_def=e;
    mllb_meta=[];
+   mllb_attrs=[];
    print_typ=false }
 
 (* names of F* functions which need to be handled differently *)
@@ -338,7 +339,7 @@ and resugar_app f args es: expression =
 
 and get_variants (e : mlexpr) : Parsetree.case list =
     match e.expr with
-    | MLE_Fun ([(id, _)], e) ->
+    | MLE_Fun ([{mlbinder_name=id}], e) ->
        (match e.expr with
         | MLE_Match ({expr = MLE_Var id'}, branches) when id = id' ->
            map build_case branches
@@ -369,7 +370,7 @@ and build_constructor_expr ((path, sym), exp): expression =
 
 and build_fun l e =
    match l with
-   | ((id, ty)::tl) ->
+   | ({mlbinder_name=id; mlbinder_ty=ty}::tl) ->
       let p = build_binding_pattern id in
       Exp.fun_ Nolabel None p (build_fun tl e)
    | [] -> build_expr e
@@ -476,7 +477,7 @@ let build_exn (sym, tys): type_exception =
   Te.mk_exception ctor
 
 let build_module1 path (m1: mlmodule1): structure_item option =
-  match m1 with
+  match m1.mlmodule1_m with
   | MLM_Ty tydecl ->
      (match build_tydecl tydecl with
       | Some t -> Some (Str.mk t)