Merge pull request #2511 from BuckleScript/fix_2387

fix #2387

Author: bobzhang

Diff for: Changes.md

@@ -1,4 +1,25 @@
 
+# 2.2.0
+Features:
+- A beta release for the new stdlib called Belt 
+- #2436, #2381, #2377, #2353 bs.deriving abstract support
+
+
+Performances:
+- #2452 specialized comparison with Js.null, Js.undefined, Js.boolean
+- #2412, provide specialized primitives for comparison with null/undefined
+- #2361, better  optimization for temporary tuple
+Fixes:
+- #2451 better error message when arity mismatch for reason syntax
+- #2399, turn partial application warnings to error in react template
+- #2465 build on FreeBSD
+- #2450 ignore bsb.lock
+- #2356 ship build-schema.json 
+- #2489, #2464  capitalize names in combination of '/'
+- #2459 subdirs:true by default for templates
+- #2428, fix trailing space on react-jsx
+- #2401, stop tab-aligning imports for smaller diff
+- #2383, drop bs.deriving attribute after post-processing
 # 2.1.0
 Features:
 - #2282, #2280,#2272,#2271,#2270,#2262,#2260,#2255,#2253
@@ -21,6 +42,9 @@ Performance:
 - #2213 refine caml_obj_dump into caml_array_dup better array initialization code
 
 Fixes:
+- #2316 Pattern match with exception case and a single catch-all pattern is optimized incorrectly
+- #2318 no absname in Match_failure
+- #2250 #1285, fix code gen for object oriented code
 - #2278, #2274 fix fatal errors regression and syntactice fatal errors(-werror A) don't stop building
 - #2259 fix fatal errors don't stop generating cmj file
 - #1972 bsb -init does not rely on `npm link` on *nix platform

Diff for: jscomp/common/bs_version.ml

@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 

Diff for: lib/bsb.ml

@@ -55,9 +55,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end

Diff for: lib/bsb_helper.ml

@@ -177,9 +177,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end

Diff for: lib/bsdep.ml

@@ -55,9 +55,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end
@@ -1722,7 +1722,7 @@ let parse_options errflag s =
   current := {error; active}
 
 (* If you change these, don't forget to change them in man/ocamlc.m *)
-let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50";;
+let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50-102";;
 let defaults_warn_error = "-a";;
 
 let () = parse_options false defaults_w;;

Diff for: lib/bspp.ml

@@ -1659,7 +1659,7 @@ let parse_options errflag s =
   current := {error; active}
 
 (* If you change these, don't forget to change them in man/ocamlc.m *)
-let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50";;
+let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50-102";;
 let defaults_warn_error = "-a";;
 
 let () = parse_options false defaults_w;;

Diff for: lib/bsppx.ml

@@ -1659,7 +1659,7 @@ let parse_options errflag s =
   current := {error; active}
 
 (* If you change these, don't forget to change them in man/ocamlc.m *)
-let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50";;
+let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50-102";;
 let defaults_warn_error = "-a";;
 
 let () = parse_options false defaults_w;;
@@ -15823,9 +15823,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end

Diff for: lib/whole_compiler.ml

@@ -55,9 +55,9 @@ end = struct
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "2.1.1"
+let version = "2.2.0"
 let header = 
-   "// Generated by BUCKLESCRIPT VERSION 2.1.1, PLEASE EDIT WITH CARE"  
+   "// Generated by BUCKLESCRIPT VERSION 2.2.0, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   
 
 end
@@ -1722,7 +1722,7 @@ let parse_options errflag s =
   current := {error; active}
 
 (* If you change these, don't forget to change them in man/ocamlc.m *)
-let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50";;
+let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50-102";;
 let defaults_warn_error = "-a";;
 
 let () = parse_options false defaults_w;;

Diff for: package.json

@@ -32,7 +32,7 @@
     "postinstall": "node scripts/install.js"
   },
   "name": "bs-platform",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "bucklescript compiler, ocaml standard libary by bucklescript and its required runtime support",
   "repository": {
     "type": "git",

Diff for: vendor/ocaml/utils/warnings.ml

@@ -254,7 +254,7 @@ let parse_options errflag s =
   current := {error; active}
 
 (* If you change these, don't forget to change them in man/ocamlc.m *)
-let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50";;
+let defaults_w = "+a-4-6-7-9-27-29-32..39-41..42-44-45-48-50-102";;
 let defaults_warn_error = "-a";;
 
 let () = parse_options false defaults_w;;