Skip to content

Commit eee443f

Browse files
bobzhangbobzhang
committed
Not using punning in test cases
1 parent c90ced0 commit eee443f

35 files changed

+106
-106
lines changed

‎jscomp/ounit_tests/ounit_cmd_tests.ml

+6-6
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ let suites =
6767
end;
6868
__LOC__ >:: begin fun _ ->
6969
let should_be_warning =
70-
bsc_check_eval {| external mk : int -> ([`a|`b [@bs.string]]) = "" [@@bs.val] |} in
70+
bsc_check_eval {| external mk : int -> ([`a|`b [@bs.string]]) = "mk" [@@bs.val] |} in
7171
OUnit.assert_bool __LOC__
7272
(Ext_string.contain_substring
7373
should_be_warning.stderr "Unused")
@@ -92,7 +92,7 @@ external ff :
9292
let should_err = bsc_check_eval {|
9393
external v3 :
9494
int -> int -> (int -> int -> int [@bs.uncurry])
95-
= ""[@@bs.val]
95+
= "v3"[@@bs.val]
9696

9797
|} in
9898
(* Ounit_cmd_util.debug_output should_err;*)
@@ -130,7 +130,7 @@ external ff :
130130

131131
__LOC__ >:: begin fun _ ->
132132
let should_err = bsc_check_eval {|
133-
external mk : int -> ([`a|`b] ) = "" [@@bs.val]
133+
external mk : int -> ([`a|`b] ) = "mk" [@@bs.val]
134134
|} in
135135
OUnit.assert_bool __LOC__ ( Ext_string.is_empty should_err.stderr)
136136
(* give a warning or ?
@@ -142,15 +142,15 @@ external ff :
142142
__LOC__ >:: begin fun _ ->
143143
let should_err = bsc_check_eval {|
144144
type t
145-
external mk : int -> (_ [@bs.as {json| { x : 3 } |json}]) -> t = "" [@@bs.val]
145+
external mk : int -> (_ [@bs.as {json| { x : 3 } |json}]) -> t = "mk" [@@bs.val]
146146
|} in
147147
OUnit.assert_bool __LOC__ (Ext_string.contain_substring should_err.stderr "Invalid json literal")
148148
end
149149
;
150150
__LOC__ >:: begin fun _ ->
151151
let should_err = bsc_check_eval {|
152152
type t
153-
external mk : int -> (_ [@bs.as {json| { "x" : 3 } |json}]) -> t = "" [@@bs.val]
153+
external mk : int -> (_ [@bs.as {json| { "x" : 3 } |json}]) -> t = "mk" [@@bs.val]
154154
|} in
155155
OUnit.assert_bool __LOC__ (Ext_string.is_empty should_err.stderr)
156156
end
@@ -249,7 +249,7 @@ external ff :
249249
(
250250
[`a|`b]
251251
[@bs.string]
252-
) = "" [@@bs.val]
252+
) = "mk" [@@bs.val]
253253
|} in
254254
(* Ounit_cmd_util.debug_output should_err ; *)
255255
OUnit.assert_bool __LOC__

‎jscomp/ounit_tests/ounit_ffi_error_debug_test.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let output = bsc_eval {|
4141
let output = bsc_eval {|
4242
external err :
4343
?hi_should_error:([`a of int | `b of string ] [@bs.string]) ->
44-
unit -> unit = "" [@@bs.val]
44+
unit -> unit = "err" [@@bs.val]
4545
|} in
4646
OUnit.assert_bool __LOC__
4747
(Ext_string.contain_substring output.stderr "hi_should_error")
@@ -54,7 +54,7 @@ let output = bsc_eval {|
5454
let output =
5555
bsc_eval {|
5656
external err :
57-
?hi_should_error:([`a of int | `b] [@bs.unwrap]) -> unit -> unit = "" [@@bs.val]
57+
?hi_should_error:([`a of int | `b] [@bs.unwrap]) -> unit -> unit = "err" [@@bs.val]
5858
|}
5959
in
6060
OUnit.assert_bool __LOC__

‎jscomp/test/attr_test.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let max2 : float -> float -> float [@bs] =
3333

3434
let hh = max2 1. 2. [@bs]
3535

36-
external des : string -> (unit -> unit [@bs.uncurry]) -> unit = "" [@@bs.val]
36+
external des : string -> (unit -> unit [@bs.uncurry]) -> unit = "des" [@@bs.val]
3737

3838
let f x =
3939
des x (fun () -> Js.log "hei")

‎jscomp/test/bs_auto_uncurry.ml

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ external map2 :
4040

4141
external ff :
4242
int -> (int [@bs.ignore]) -> (int -> int -> int [@bs.uncurry]) -> int
43-
= "" [@@bs.val]
43+
= "ff" [@@bs.val]
4444

4545
external ff1 :
4646
int -> (_ [@bs.as 3 ]) -> (int -> int -> int [@bs.uncurry]) -> int
47-
= "" [@@bs.val]
47+
= "ff1" [@@bs.val]
4848

4949

5050
external ff2 :
5151
int -> (_ [@bs.as "3" ]) -> (int -> int -> int [@bs.uncurry]) -> int
52-
= "" [@@bs.val]
52+
= "ff2" [@@bs.val]
5353

5454
external
55-
hi: (unit -> unit [@bs.uncurry 0]) -> int = "" [@@bs.val]
55+
hi: (unit -> unit [@bs.uncurry 0]) -> int = "hi" [@@bs.val]
5656

5757
(**
5858
fun (_){
@@ -106,7 +106,7 @@ let h6 x =
106106
type elem
107107
external optional_cb :
108108
(string -> ?props:elem -> int array -> elem [@bs.uncurry] (* This should emit a warning ? *)
109-
) -> string -> int = "" [@@bs.val]
109+
) -> string -> int = "optional_cb" [@@bs.val]
110110

111111

112112

@@ -202,6 +202,6 @@ let unit_magic () =
202202

203203
let f_unit_magic = unit_magic ()
204204

205-
external f_0002 : string -> int array -> unit = "" [@@bs.splice] [@@bs.val]
205+
external f_0002 : string -> int array -> unit = "f_0002" [@@bs.splice] [@@bs.val]
206206

207207
let hh xs = f_0002 xs

‎jscomp/test/bs_auto_uncurry_test.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let eq loc x y =
88

99
external map :
1010
('a -> 'b [@bs.uncurry]) -> 'b array =
11-
"" [@@bs.send.pipe: 'a array]
11+
"map" [@@bs.send.pipe: 'a array]
1212

1313

1414
[%%raw{|
@@ -18,7 +18,7 @@ function hi (cb){
1818
}
1919
|}]
2020

21-
external hi : (unit -> unit [@bs.uncurry]) -> unit = "" [@@bs.val]
21+
external hi : (unit -> unit [@bs.uncurry]) -> unit = "hi" [@@bs.val]
2222

2323
let () =
2424
let xs = ref [] in

‎jscomp/test/bs_ignore_effect.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function add(x,y){
1313
type _ kind =
1414
| Float : float kind
1515
| String : string kind
16-
external add : ('a kind [@bs.ignore]) -> 'a -> 'a -> 'a = "" [@@bs.val]
16+
external add : ('a kind [@bs.ignore]) -> 'a -> 'a -> 'a = "add" [@@bs.val]
1717

1818
let v = ref 0
1919

‎jscomp/test/bs_ignore_test.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function add(x,y){
88
type _ kind =
99
| Float : float kind
1010
| String : string kind
11-
external add : ('a kind [@bs.ignore]) -> 'a -> 'a -> 'a = "" [@@bs.val]
11+
external add : ('a kind [@bs.ignore]) -> 'a -> 'a -> 'a = "add" [@@bs.val]
1212

1313
let () =
1414
Js.log (add Float 3.0 2.0);
@@ -30,7 +30,7 @@ let string_of_kind (type t) (kind : t kind) =
3030
| Float -> "float"
3131
| String -> "string"
3232

33-
external add_dyn : ('a kind [@bs.ignore]) -> string -> 'a -> 'a -> 'a = "" [@@bs.val]
33+
external add_dyn : ('a kind [@bs.ignore]) -> string -> 'a -> 'a -> 'a = "add_dyn" [@@bs.val]
3434

3535
let add2 k x y =
3636
add_dyn k (string_of_kind k) x y

‎jscomp/test/bs_qualified.ml

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33

44

5-
external xx : string -> unit = "" [@@bs.module "x", "X"]
5+
external xx : string -> unit = "xx" [@@bs.module "x", "X"]
66

77
type param
88

9-
external executeCommands : string -> param array -> unit = ""
9+
external executeCommands : string -> param array -> unit = "executeCommands"
1010
[@@bs.scope "commands"] [@@bs.module "vscode"][@@bs.splice]
1111

12-
external env : string Js.Dict.t = "" [@@bs.scope "process"] [@@bs.val]
12+
external env : string Js.Dict.t = "env" [@@bs.scope "process"] [@@bs.val]
1313

1414
let f a b c =
1515
executeCommands "hi" [|a;b;c|];
1616
env
1717

18-
external hi : string = ""
18+
external hi : string = "hi"
1919
[@@bs.module "z"] [@@bs.scope "a0", "a1", "a2"]
20-
external ho : string = ""
20+
external ho : string = "ho"
2121
[@@bs.val] [@@bs.scope "a0","a1","a2"]
22-
external imul : int -> int -> int = ""
22+
external imul : int -> int -> int = "imul"
2323
[@@bs.val] [@@bs.scope "Math"]
2424
let f2 () =
2525
hi , ho, imul 1 2
@@ -35,16 +35,16 @@ external makeBuffer1 : int -> buffer = "Buffer"
3535
external makeBuffer2 : int -> buffer = "Buffer"
3636
[@@bs.new] [@@bs.scope "global", "a0","a1","a2"] [@@bs.module "X","ZZ"]
3737

38-
external makeBuffer3 : int -> buffer = ""
38+
external makeBuffer3 : int -> buffer = "makeBuffer3"
3939
[@@bs.new] [@@bs.scope "global", "a0","a1","a2"] [@@bs.module "X", "Z"]
4040

41-
external max : float -> float -> float = ""
41+
external max : float -> float -> float = "max"
4242
[@@bs.scope "Math"] [@@bs.val]
4343
(* TODO: `bs.val` is not necessary, by default is good?
4444
*)
4545

4646
type t
47-
external create : unit -> t = "" [@@bs.scope "mat4"] [@@bs.module "gl-matrix"]
47+
external create : unit -> t = "create" [@@bs.scope "mat4"] [@@bs.module "gl-matrix"]
4848

4949

5050
(* external scope_f : t -> int = "" [@@bs.get] [@@bs.scope "hi"]*)
@@ -67,39 +67,39 @@ external setMocFn2 : t -> int -> string -> unit = ""
6767
external setMocFn3 : t -> int -> string -> unit = ""
6868
[@@bs.set_index] [@@bs.scope "a0", "a1", "a2"]
6969

70-
external getX1 : t -> int = ""
70+
external getX1 : t -> int = "getX1"
7171
[@@bs.get] [@@bs.scope "a0"]
7272

73-
external getX2 : t -> int = ""
73+
external getX2 : t -> int = "getX2"
7474
[@@bs.get] [@@bs.scope "a0", "a1"]
7575

76-
external getX3 : t -> int = ""
76+
external getX3 : t -> int = "getX3"
7777
[@@bs.get] [@@bs.scope "a0", "a1", "a2"]
7878

79-
external setX1 : t -> int -> unit = ""
79+
external setX1 : t -> int -> unit = "setX1"
8080
[@@bs.set] [@@bs.scope "a0"]
8181

82-
external setX2 : t -> int -> unit = ""
82+
external setX2 : t -> int -> unit = "setX2"
8383
[@@bs.set] [@@bs.scope "a0", "a1"]
8484

85-
external setX3 : t -> int -> unit = ""
85+
external setX3 : t -> int -> unit = "setX3"
8686
[@@bs.set] [@@bs.scope "a0","a1","a2"]
8787

88-
external setXWeird3 : t -> int -> unit = ""
88+
external setXWeird3 : t -> int -> unit = "setXWeird3"
8989
[@@bs.set] [@@bs.scope "a0-hi","a1","a2"]
9090

91-
external send1 : t -> int -> unit = ""
91+
external send1 : t -> int -> unit = "send1"
9292
[@@bs.send] [@@bs.scope "a0"]
93-
external send2 : t -> int -> unit = ""
93+
external send2 : t -> int -> unit = "send2"
9494
[@@bs.send] [@@bs.scope "a0","a1"]
95-
external send3 : t -> int -> unit = ""
95+
external send3 : t -> int -> unit = "send3"
9696
[@@bs.send] [@@bs.scope "a0","a1"]
9797

98-
external psend1 : int -> unit = ""
98+
external psend1 : int -> unit = "psend1"
9999
[@@bs.send.pipe:t] [@@bs.scope "a0"]
100-
external psend2 : int -> unit = ""
100+
external psend2 : int -> unit = "psend2"
101101
[@@bs.send.pipe:t] [@@bs.scope "a0","a1"]
102-
external psend3 : int -> unit = ""
102+
external psend3 : int -> unit = "psend3"
103103
[@@bs.send.pipe:t] [@@bs.scope "a0","a1"]
104104

105105
let f3 x =

‎jscomp/test/bs_splice_partial.ml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ external on_exit_slice3 :
2424
*)
2525

2626

27-
external hi : int array -> int option = ""
27+
external hi : int array -> int option = "hi"
2828
[@@bs.splice] [@@bs.return {null_to_opt}]
2929
[@@bs.send.pipe:int]
3030

@@ -35,7 +35,7 @@ let test_hi x =
3535
| Some y -> Js.log y ; 2
3636

3737

38-
external hi__2 : int array -> int option = ""
38+
external hi__2 : int array -> int option = "hi__2"
3939
[@@bs.splice] [@@bs.return nullable ]
4040
[@@bs.send.pipe:int]
4141

@@ -46,12 +46,12 @@ let test_hi__2 x =
4646

4747
type id = int -> int
4848

49-
external cb : string -> int array -> id = ""
49+
external cb : string -> int array -> id = "cb"
5050
[@@bs.splice] [@@bs.send.pipe: int]
5151

5252

5353
type id2 = int -> int [@bs]
54-
external cb2 : string -> int array -> id2 = ""
54+
external cb2 : string -> int array -> id2 = "cb2"
5555
[@@bs.splice] [@@bs.send.pipe: int]
5656

5757

@@ -62,7 +62,7 @@ let test_cb x =
6262

6363

6464
type u = int -> int [@bs]
65-
external v : u = "" [@@bs.val]
65+
external v : u = "v" [@@bs.val]
6666

6767
let f x =
6868
ignore @@ (v x [@bs])

‎jscomp/test/console_log_test.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ external min_int : int -> int -> int = "min" [@@bs.val] [@@bs.scope "Math"]
1919
let min_int = min_int
2020

2121
type t
22-
external say : int -> int = ""[@@bs.send.pipe:t]
22+
external say : int -> int = "say"[@@bs.send.pipe:t]
2323

2424
let say = say
2525

‎jscomp/test/demo_pipe.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ external on :
44
| `close of unit -> unit]
55
[@bs.string]) ->
66
readline =
7-
"" [@@bs.send.pipe:readline]
7+
"on" [@@bs.send.pipe:readline]
88
let register rl =
99
rl
1010
|> on (`line (fun x -> Js.log x ))

‎jscomp/test/external_ppx.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ external opt_make :
1717
"" [@@bs.obj]
1818

1919

20-
external f : int -> int = "" [@@genType.import "hh"]
20+
external f : int -> int = "f" [@@genType.import "hh"]

‎jscomp/test/ffi_js_test.ml

+8-8
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ let () =
5555

5656
type null_obj
5757

58-
external hh : null_obj -> int = "" [@@bs.send] (* it also work *)
59-
external ff : null_obj -> unit -> int = "" [@@bs.send]
60-
external ff_pipe : unit -> int = "" [@@bs.send.pipe: null_obj]
61-
external ff_pipe2 : int = "" [@@bs.send.pipe: null_obj]
58+
external hh : null_obj -> int = "hh" [@@bs.send] (* it also work *)
59+
external ff : null_obj -> unit -> int = "ff" [@@bs.send]
60+
external ff_pipe : unit -> int = "ff_pipe" [@@bs.send.pipe: null_obj]
61+
external ff_pipe2 : int = "ff_pipe2" [@@bs.send.pipe: null_obj] (* FIXME *)
6262
let vv z = hh z
6363

6464
let v z = ff z ()
@@ -69,19 +69,19 @@ let vvvv z = z |> ff_pipe2
6969
let create_prim () = [%obj{ x' = 3 ; x'' = 3; x'''' = 2}]
7070

7171
type t
72-
external setGADT : t -> ('a kind [@bs.ignore]) -> 'a -> unit = "" [@@bs.set]
72+
external setGADT : t -> ('a kind [@bs.ignore]) -> 'a -> unit = "setGADT" [@@bs.set]
7373
external setGADT2 :
7474
t ->
7575
('a kind [@bs.ignore]) ->
7676
('b kind [@bs.ignore]) ->
77-
('a * 'b) -> unit = "" [@@bs.set]
77+
('a * 'b) -> unit = "setGADT2" [@@bs.set]
7878

79-
external getGADT : t -> ('a kind [@bs.ignore]) -> 'a = "" [@@bs.get]
79+
external getGADT : t -> ('a kind [@bs.ignore]) -> 'a = "getGADT" [@@bs.get]
8080

8181
external getGADT2 :
8282
t -> ('a kind [@bs.ignore]) ->
8383
('b kind [@bs.ignore])
84-
-> ('a * 'b) = "" [@@bs.get]
84+
-> ('a * 'b) = "getGADT2" [@@bs.get]
8585

8686
external getGADTI2 :
8787
t -> ('a kind [@bs.ignore]) ->

‎jscomp/test/ffi_splice_test.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ type t
3636
external make : int -> int -> int -> int -> t = "Make" [@@bs.new]
3737

3838

39-
external sum : t -> unit -> int = "" [@@bs.send]
39+
external sum : t -> unit -> int = "sum" [@@bs.send]
4040

4141
(* compile error *)
4242
(* external join : string -> string = "" [@@bs.module "path"] [@@bs.splice] *)
43-
external join : string array -> string = "" [@@bs.module "path"] [@@bs.splice]
43+
external join : string array -> string = "join" [@@bs.module "path"] [@@bs.splice]
4444

45-
external test : string array -> t = "" [@@bs.send.pipe: t ] [@@bs.splice]
45+
external test : string array -> t = "test" [@@bs.send.pipe: t ] [@@bs.splice] (*FIXME*)
4646

4747
(* compile error *)
4848
(* external test2 : int -> string -> t= "" [@@bs.send.pipe: t ] [@@bs.splice] *)

0 commit comments

Comments
 (0)