snapshot

Author: bobzhang

jscomp/core/lam_compile_external_call.ml

@@ -382,7 +382,7 @@ let translate_ffi
 
     (* TODO #11
        1. check args -- error checking 
-       2. support [@@bs.scope "window"]
+       2. support [@@scope "window"]
        we need know whether we should call [add_js_module] or not 
     *)
       translate_scoped_module_val external_module_name name scopes

jscomp/syntax/ast_external_process.ml

@@ -315,7 +315,7 @@ let parse_external_attributes
                 | _  ->
                   Bs_syntaxerr.err loc Illegal_attribute
               end
-            | "bs.scope" ->
+            | "bs.scope" | "scope" ->
               begin match Ast_payload.assert_strings loc payload with
                 | [] ->
                   Bs_syntaxerr.err loc Illegal_attribute

jscomp/test/format_test.ml

@@ -14,7 +14,7 @@ let u () = "xx %s" ^^ "yy"
 
 module M = struct 
   external infinity : float = "POSITIVE_INFINITY" 
-  [@@bs.val]  [@@bs.scope "Number"]
+  [@@val]  [@@scope "Number"]
   external neg_infinity : float = "NEGATIVE_INFINITY"
   [@@bs.val]  [@@bs.scope "Number"]
   external nan : float = "NaN"

lib/4.06.1/unstable/js_compiler.ml

@@ -109025,7 +109025,7 @@ let translate_ffi
 
     (* TODO #11
        1. check args -- error checking 
-       2. support [@@bs.scope "window"]
+       2. support [@@scope "window"]
        we need know whether we should call [add_js_module] or not 
     *)
       translate_scoped_module_val external_module_name name scopes
@@ -404913,7 +404913,7 @@ let parse_external_attributes
                 | _  ->
                   Bs_syntaxerr.err loc Illegal_attribute
               end
-            | "bs.scope" ->
+            | "bs.scope" | "scope" ->
               begin match Ast_payload.assert_strings loc payload with
                 | [] ->
                   Bs_syntaxerr.err loc Illegal_attribute

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -84648,7 +84648,7 @@ type call_info =
   | Call_ml (* called by plain ocaml expression *)
   | Call_builtin_runtime (* built-in externals *)
   | Call_na 
-  (* either from [@@bs.val] or not available, 
+  (* either from [@@val] or not available, 
      such calls does not follow such rules
      {[ fun x y -> f x y === f ]} when [f] is an atom     
   *) 
@@ -109025,7 +109025,7 @@ let translate_ffi
 
     (* TODO #11
        1. check args -- error checking 
-       2. support [@@bs.scope "window"]
+       2. support [@@scope "window"]
        we need know whether we should call [add_js_module] or not 
     *)
       translate_scoped_module_val external_module_name name scopes
@@ -404913,7 +404913,7 @@ let parse_external_attributes
                 | _  ->
                   Bs_syntaxerr.err loc Illegal_attribute
               end
-            | "bs.scope" ->
+            | "bs.scope" | "scope" ->
               begin match Ast_payload.assert_strings loc payload with
                 | [] ->
                   Bs_syntaxerr.err loc Illegal_attribute

lib/4.06.1/whole_compiler.ml

@@ -391552,7 +391552,7 @@ let translate_ffi
 
     (* TODO #11
        1. check args -- error checking 
-       2. support [@@bs.scope "window"]
+       2. support [@@scope "window"]
        we need know whether we should call [add_js_module] or not 
     *)
       translate_scoped_module_val external_module_name name scopes
@@ -407793,7 +407793,7 @@ let parse_external_attributes
                 | _  ->
                   Bs_syntaxerr.err loc Illegal_attribute
               end
-            | "bs.scope" ->
+            | "bs.scope" | "scope" ->
               begin match Ast_payload.assert_strings loc payload with
                 | [] ->
                   Bs_syntaxerr.err loc Illegal_attribute