improve error message

rescript-lang · Aug 9, 2016 · 4412f8e · 4412f8e
1 parent f4b7e5f
commit 4412f8e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/jscomp/syntax/ast_util.ml b/jscomp/syntax/ast_util.ml
@@ -416,12 +416,10 @@ let ocaml_obj_as_js_object
             Cfk_concrete
               (Fresh, e))
            ->
-           begin match e with
-             | {
-               pexp_desc =
-                 Pexp_poly
-                   (({pexp_desc = Pexp_fun ("", None, pat, e)} as f),
-                    None)} ->  
+           begin match e.pexp_desc with
+             | Pexp_poly
+                 (({pexp_desc = Pexp_fun ("", None, pat, e)} as f),
+                  None) ->  
                let arity = Ast_pat.arity_of_fun pat e in
                let method_type, label_type =
                  generate_callback_method_pair x.pcf_loc mapper label.txt arity in 
@@ -433,9 +431,18 @@ let ocaml_obj_as_js_object
                    let f = Ast_pat.is_unit_cont pat ~yes:e ~no:f in                       
                    to_method_callback loc mapper self_pat f
                 } :: exprs)
+             | Pexp_poly( _, Some _)
+               ->
+               Location.raise_errorf ~loc:x.pcf_loc
+                 "polymorphic type annotation not supported yet"
+
+             | Pexp_poly (_, None) ->
+               Location.raise_errorf
+                 ~loc:x.pcf_loc
+                 "Unsupported syntax, expect syntax like `method x () = x ` "
              | _ ->
                Location.raise_errorf ~loc:x.pcf_loc
-                 "polymorphic type annotation not supported"
+                 "Unsupported syntax in js object"               
            end
          | Pcf_method (_, _, Cfk_concrete(Override, _) ) -> 
            Location.raise_errorf ~loc:x.pcf_loc

diff --git a/jscomp/test/ppx_this_obj_test.js b/jscomp/test/ppx_this_obj_test.js
@@ -90,12 +90,12 @@ var collection = /* array */[
   v4
 ];
 
-eq('File "ppx_this_obj_test.ml", line 55, characters 5-12', /* tuple */[
+eq('File "ppx_this_obj_test.ml", line 59, characters 5-12', /* tuple */[
       11,
       v.hi(3, 2)
     ]);
 
-eq('File "ppx_this_obj_test.ml", line 56, characters 5-12', /* tuple */[
+eq('File "ppx_this_obj_test.ml", line 60, characters 5-12', /* tuple */[
       11,
       v2.hi(3, 2)
     ]);

diff --git a/jscomp/test/ppx_this_obj_test.ml b/jscomp/test/ppx_this_obj_test.ml
@@ -47,7 +47,11 @@ let v4 =
     method x () = 1.      
   end [@bs]
 
-
+(* let v5 =  *)
+(*   object *)
+(*     method x = x      *)
+(*   end [@bs]     *)
+
 (** guarantee they have the same type *)
 let collection = [| v ; v2 ; v3 ; v4 |]