Update 4.06 branch

Author: bobzhang

jscomp/core/lam_compile.ml

@@ -93,11 +93,20 @@ type default_case =
 let no_effects_const  = lazy true
 let has_effects_const = lazy false
 
+let is_nullary_variant x = 
+  match x with 
+#if OCAML_VERSION =~ ">4.03.0" then
+  | Types.Cstr_tuple [] -> true 
+#else  
+  |  [] -> true 
+#end  
+  | _ -> false
+
 let names_from_construct_pattern (pat: Typedtree.pattern) =
   let names_from_type_variant cstrs =
     let (consts, blocks) = List.fold_left
       (fun (consts, blocks) cstr ->
-        if cstr.Types.cd_args = []
+        if is_nullary_variant cstr.Types.cd_args 
         then (Ident.name cstr.Types.cd_id :: consts, blocks)
         else (consts, Ident.name cstr.Types.cd_id :: blocks))
       ([], []) cstrs in

jscomp/core/lam_print.ml

@@ -151,7 +151,7 @@ let primitive ppf (prim : Lam_primitive.t) = match prim with
   | Pmakeblock(tag, _, Mutable) -> fprintf ppf "makemutable %i" tag
   | Pfield (n, (Fld_module s | Fld_record s)) 
     -> fprintf ppf "field %s/%i" s n
-  | Pfield (n, Fld_na) 
+  | Pfield (n, _) 
     -> fprintf ppf "field %i" n
   | Pfield_computed -> 
     fprintf ppf "field_computed"

jscomp/syntax/ast_exp_apply.ml

@@ -167,7 +167,15 @@ let app_exp_mapper
          | 
            {pexp_desc = 
               (Pexp_ident {txt = Lident name;_ } 
-            | Pexp_constant (Const_string(name,None)))
+
+            | Pexp_constant (
+#if OCAML_VERSION =~ "<4.03.0" then                            
+              Const_string              
+#else                           
+              Pconst_string
+#end              
+              (name,None))
+            )
             ;
              pexp_loc}
            (* f##paint  *)
@@ -197,7 +205,13 @@ let app_exp_mapper
          | Some { args = [obj; {
              pexp_desc = 
                Pexp_ident {txt = Lident name}
-               | Pexp_constant (Const_string (name, None)); pexp_loc
+               | Pexp_constant (
+#if OCAML_VERSION =~ "<4.03.0" then                            
+              Const_string              
+#else                           
+              Pconst_string
+#end                         
+                  (name, None)); pexp_loc
            }
            ]
            }