Skip to content

Commit 3b63c77

Browse files
committed
update tests
1 parent e3ac007 commit 3b63c77

File tree

14 files changed

+63
-40
lines changed

14 files changed

+63
-40
lines changed

jscomp/syntax/tests/parsing/errors/expressions/expected/array.res.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@
88

99
Did you forget a `]` here?
1010

11-
let xs = x.map (fun key -> [|key;(predicates.(key))|])
11+
let xs =
12+
x.map
13+
(fun key -> [|key;(((Array.get)[@res.syntaxSugar ]) predicates key)|])

jscomp/syntax/tests/parsing/grammar/expressions/expected/async.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let async =
2121
() |. async;
2222
async ();
2323
async.async;
24-
{ async = (async.(async)) };
24+
{ async = (((Array.get)[@res.syntaxSugar ]) async async) };
2525
(result |. async) |. (mapAsync (fun a -> doStuff a)))
2626
[@res.braces ])
2727
let f =

jscomp/syntax/tests/parsing/grammar/expressions/expected/await.res.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ let () =
99
((let response = ((fetch {js|/users.json|js})[@res.await ]) in
1010
let users = ((response.json ())[@res.await ]) in
1111
let comments =
12-
((((fetch {js|comment.json|js})[@res.await ]).json ())
13-
[@res.await ]).(0) in
12+
((Array.get)[@res.syntaxSugar ])
13+
((((fetch {js|comment.json|js})[@res.await ]).json ())[@res.await ])
14+
0 in
1415
Js.log2 users comments)
1516
[@res.braces ])
1617
let () = ((delay 10)[@res.braces ][@res.await ])

jscomp/syntax/tests/parsing/grammar/expressions/expected/binaryNoEs6Arrow.res.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@
3131
| _ -> ())
3232
[@res.braces ]))[@res.namedArgLoc ][@res.braces ])
3333
~children:[] ())[@JSX ])
34-
;;if inclusions.(index) <- (uid, url) then onChange inclusions
34+
;;if ((inclusions.(index) <- (uid, url))[@res.syntaxSugar ])
35+
then onChange inclusions

jscomp/syntax/tests/parsing/grammar/expressions/expected/bracedOrRecord.res.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ let e = ((a + b)[@res.braces ])
1212
let e = ((if a then true else false)[@res.braces ][@res.ternary ])
1313
let e = ((if a |> computation then true else false)
1414
[@res.braces ][@res.ternary ])
15-
let e = ((a.(0))[@res.braces ])
15+
let e = ((((Array.get)[@res.syntaxSugar ]) a 0)[@res.braces ])
1616
let e = ((f b)[@res.braces ])
1717
let e = (((a.b).c)[@res.braces ])
18-
let e = ((arr.(x) <- 20)[@res.braces ])
18+
let e = ((arr.(x) <- 20)[@res.braces ][@res.syntaxSugar ])
1919
let e = ((fun x -> (x + 1) |> (doStuff config))[@res.braces ])
2020
let e = (((fun x -> x + 1) |> (doStuff config))[@res.braces ])
2121
let e = ((if fun x -> x + 1 then true else false)

jscomp/syntax/tests/parsing/grammar/expressions/expected/bsObject.res.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let y = [%obj { age = 30; name = {js|steve|js} }]
66
let z =
77
[%obj { \xff = 1; \u2212 = {js|two|js}; \0 = zero; \o123 = {js|o123|js} }]
88
let x = (({js|age|js})[@res.braces ])
9-
let x = (({js|age|js}.(0))[@res.braces ])
9+
let x = ((((Array.get)[@res.syntaxSugar ]) {js|age|js} 0)[@res.braces ])
1010
let x = (({js|age|js} |. Js.log)[@res.braces ])
1111
let x = ((if {js|age|js} then true else false)[@res.braces ][@res.ternary ])
1212
let x = (({js|age|js} |. Js.log; (let foo = 1 in let bar = 2 in foo + bar))
@@ -16,5 +16,7 @@ let x =
1616
[@res.ternary ]);
1717
(let foo = 1 in let bar = 2 in foo + bar))
1818
[@res.braces ])
19-
let x = (({js|age|js}.(0); (let foo = 1 in let bar = 2 in foo + bar))
19+
let x =
20+
((((Array.get)[@res.syntaxSugar ]) {js|age|js} 0;
21+
(let foo = 1 in let bar = 2 in foo + bar))
2022
[@res.braces ])

jscomp/syntax/tests/parsing/grammar/expressions/expected/firstClassModule.res.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,41 @@ let build_dispatch_table handlers =
4141
[@res.braces ])
4242
;;(module Three)
4343
;;((module Three) : (module X_int))
44-
;;(module Teenager).(0)
44+
;;((Array.get)[@res.syntaxSugar ]) (module Teenager) 0
4545
;;((module Teenager) |. age) |. Js.log
46-
;;((module Teenager).(0)) |. Js.log
46+
;;(((Array.get)[@res.syntaxSugar ]) (module Teenager) 0) |. Js.log
4747
;;((if ((module Teenager) |. age) |. isAdult
4848
then Js.log {js|has responsibilities|js}
4949
else Js.log {js|can play in the playground|js})[@res.ternary ])
50-
;;((if ((module Streets).(0)) |. isExpensive
50+
;;((if (((Array.get)[@res.syntaxSugar ]) (module Streets) 0) |. isExpensive
5151
then Js.log {js|big money|js}
5252
else Js.log {js|affordable|js})[@res.ternary ])
5353
let () = ((((module Teenager) |. age) |. Js.log)[@res.braces ])
54-
let () = (((module Teenager).(0))[@res.braces ])
54+
let () = ((((Array.get)[@res.syntaxSugar ]) (module Teenager) 0)
55+
[@res.braces ])
5556
let () =
5657
((if ((module Teenager) |. age) |. isAdult
5758
then Js.log {js|has responsibilities|js}
5859
else Js.log {js|can play in the playground|js})
5960
[@res.braces ][@res.ternary ])
6061
let () =
61-
((if ((module Streets).(0)) |. isExpensive
62+
((if (((Array.get)[@res.syntaxSugar ]) (module Streets) 0) |. isExpensive
6263
then Js.log {js|big money|js}
6364
else Js.log {js|affordable|js})
6465
[@res.braces ][@res.ternary ])
6566
let () =
6667
((let a = 1 in
67-
let b = 2 in (module Teenager).(0); ((module Teenager) |. age) |. Js.log)
68+
let b = 2 in
69+
((Array.get)[@res.syntaxSugar ]) (module Teenager) 0;
70+
((module Teenager) |. age) |. Js.log)
6871
[@res.braces ])
6972
let () =
7073
((let a = 1 in
7174
let b = 2 in
7275
((module Teenager) |. age) |. Js.log;
73-
((if (((module Teenager).(0)) |. age) |. isAdult
76+
((if
77+
((((Array.get)[@res.syntaxSugar ]) (module Teenager) 0) |. age) |.
78+
isAdult
7479
then Js.log {js|has responsibilities|js}
7580
else Js.log {js|can play in the playground|js})
7681
[@res.ternary ]))

jscomp/syntax/tests/parsing/grammar/expressions/expected/primary.res.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ let x = p.Parser.token
55
let x = (p.Lang.Parser.token).pos
66
;;lexbuf.lnum <- (lexbuf.lnum + 1)
77
;;(parser.lexbuf).lnum <- ((parser.lexbuf).lnum + 1)
8-
let x = arr.(0)
9-
let x = arr.((x : int))
10-
let x = (arr.(0)).(1)
11-
let x = (arr.((x : int))).((y : int))
12-
;;arr.(0) <- (a + b)
8+
let x = ((Array.get)[@res.syntaxSugar ]) arr 0
9+
let x = ((Array.get)[@res.syntaxSugar ]) arr (x : int)
10+
let x =
11+
((Array.get)[@res.syntaxSugar ]) (((Array.get)[@res.syntaxSugar ]) arr 0) 1
12+
let x =
13+
((Array.get)[@res.syntaxSugar ])
14+
(((Array.get)[@res.syntaxSugar ]) arr (x : int)) (y : int)
15+
;;((arr.(0) <- (a + b))[@res.syntaxSugar ])
1316
;;f ()
1417
;;(f ()) ()
1518
;;f a

jscomp/syntax/tests/printer/comments/expected/array.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
a[/* zz */ 0] = 7
1+
(@res.syntaxSugar a[/* zz */ 0] = 7)
22

33
let _ = /* zz */ a[0]
44

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
numbers[20] = 10
1+
(@res.syntaxSugar numbers[20] = 10)
22

3-
streetsAddressBookThisIsALongName[
4-
streets->Belt.Array.length - 1
5-
] = streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName
3+
(
4+
@res.syntaxSugar
5+
streetsAddressBookThisIsALongName[
6+
streets->Belt.Array.length - 1
7+
] = streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName
8+
)

jscomp/syntax/tests/printer/expr/expected/braced.res.txt

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,24 @@ let _ = {module(ME: MyMod)}
220220
}[{
221221
0
222222
}]
223-
{myArray}[{0}] = {20}
224-
{
225-
myArray
226-
}[{
227-
0
228-
}] = {
229-
20
230-
}
223+
(@res.syntaxSugar {myArray}[{0}] = {20})
224+
(
225+
@res.syntaxSugar
226+
{
227+
myArray
228+
}[{
229+
0
230+
}] = {
231+
20
232+
}
233+
)
231234

232-
myArray[20] = {
233-
a + b
234-
}
235+
(
236+
@res.syntaxSugar
237+
myArray[20] = {
238+
a + b
239+
}
240+
)
235241

236242
{jsObject}["foo"]
237243
{jsObject}["foo"] = {"bar"}

jscomp/syntax/tests/printer/expr/expected/if.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let x =
3636
sideEffect()
3737
}
3838

39-
if inclusions[index] = (uid, url) {
39+
if @res.syntaxSugar inclusions[index] = (uid, url) {
4040
onChange(inclusions)
4141
}
4242

jscomp/syntax/tests/printer/expr/expected/unary.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ let () = {
8484
}
8585

8686
let x = (!truths)[0]
87-
(!streets)[0] = "foo-street"
87+
(@res.syntaxSugar (!streets)[0] = "foo-street")

jscomp/syntax/tests/printer/expr/expected/underscoreApply.res.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ f(a, b, _) ? g(x, y, _) : h(alpha, beta, _)
4949
<div> {f(a, b, _)} </div>
5050

5151
f(a, b, _)[ix]
52-
f(a, b, _)[ix] = 2
52+
(@res.syntaxSugar f(a, b, _)[ix] = 2)
5353

5454
getDirector(a, b, _).name = "Steve"
5555

0 commit comments

Comments
 (0)