Skip to content

Commit 14c1bdb

Browse files
mediremimediremi
committed
Merge branch 'master' into compiler-error-variant-tag-constructor-field
2 parents 314988f + fbb8a4e commit 14c1bdb

File tree

136 files changed

+76
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+76
-439
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- Keep track of compiler info during build. https://github.com/rescript-lang/rescript/pull/7889
3131
- Improve option optimization for constants. https://github.com/rescript-lang/rescript/pull/7913
3232
- Option optimization: do not create redundant local vars. https://github.com/rescript-lang/rescript/pull/7915
33+
- Js output: remove superfluous newline after every `if`. https://github.com/rescript-lang/rescript/pull/7920
3334

3435
#### :house: Internal
3536

‎compiler/core/js_dump.ml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,9 +1365,7 @@ and statement_desc top cxt f (s : J.statement_desc) : cxt =
13651365
P.space f;
13661366
let cxt = brace_block cxt f s1 in
13671367
match s2 with
1368-
| [] | [{statement_desc = Block [] | Exp {expression_desc = Var _}}] ->
1369-
P.newline f;
1370-
cxt
1368+
| [] | [{statement_desc = Block [] | Exp {expression_desc = Var _}}] -> cxt
13711369
| [({statement_desc = If _} as nest)]
13721370
| [{statement_desc = Block [({statement_desc = If _; _} as nest)]; _}] ->
13731371
P.space f;

‎packages/@rescript/runtime/Stdlib_DataView.resi‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ See [`DataView`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Referen
4242
## Examples
4343
4444
```rescript
45-
DataView.fromBuffer(ArrayBuffer.make(16))
46-
DataView.fromBuffer(ArrayBuffer.make(16), ~byteOffset=4)
47-
DataView.fromBuffer(ArrayBuffer.make(16), ~byteOffset=4, ~length=8)
45+
DataView.fromBuffer(ArrayBuffer.make(16))
46+
DataView.fromBuffer(ArrayBuffer.make(16), ~byteOffset=4)
47+
DataView.fromBuffer(ArrayBuffer.make(16), ~byteOffset=4, ~length=8)
4848
```
4949
*/
5050
@new external fromBuffer: (Stdlib_ArrayBuffer.t, ~byteOffset: int=?, ~length: int=?) => t =
@@ -65,7 +65,7 @@ DataView.fromBufferToEnd(buffer, ~byteOffset=4)
6565
external fromBufferToEnd: (Stdlib_ArrayBuffer.t, ~byteOffset: int) => t = "DataView"
6666

6767
/**
68-
`fromBufferWithRange(buffer, ~byteOffset, ~length)` creates a DataView for a specific byte range.
68+
`fromBufferWithRange(buffer, ~byteOffset, ~length)` creates a DataView for a specific byte range.
6969
7070
See [`DataView`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView) on MDN.
7171
@@ -74,7 +74,7 @@ See [`DataView`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Referen
7474
## Examples
7575
7676
```rescript
77-
DataView.fromBufferWithRange(ArrayBuffer.make(16), ~byteOffset=2, ~length=8)
77+
DataView.fromBufferWithRange(ArrayBuffer.make(16), ~byteOffset=2, ~length=8)
7878
```
7979
*/
8080
@deprecated("Use `fromBuffer` instead") @new
@@ -135,7 +135,7 @@ See [`DataView.getInt8`](https://developer.mozilla.org/en-US/docs/Web/JavaScript
135135
136136
```rescript
137137
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
138-
dv->DateView.setInt8(0, -12)
138+
dv->DataView.setInt8(0, -12)
139139
DataView.getInt8(dv, 0) == -12
140140
```
141141
*/
@@ -150,7 +150,7 @@ See [`DataView.getUint8`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
150150
151151
```rescript
152152
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
153-
dv->DateView.setUint8(1, 255)
153+
dv->DataView.setUint8(1, 255)
154154
DataView.getUint8(dv, 1) == 255
155155
```
156156
*/
@@ -165,8 +165,8 @@ See [`DataView.getInt16`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
165165
166166
```rescript
167167
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
168-
dv->DateView.setInt16(0, -1234)
169-
dv->DateView.setInt16(2, -1234, ~littleEndian=true)
168+
dv->DataView.setInt16(0, -1234)
169+
dv->DataView.setInt16(2, -1234, ~littleEndian=true)
170170
DataView.getInt16(dv, 0) == -1234
171171
DataView.getInt16(dv, 2, ~littleEndian=true) == -1234
172172
```
@@ -182,8 +182,8 @@ See [`DataView.getUint16`](https://developer.mozilla.org/en-US/docs/Web/JavaScri
182182
183183
```rescript
184184
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
185-
dv->DateView.setUint16(0, 1234)
186-
dv->DateView.setUint16(2, 1234, ~littleEndian=true)
185+
dv->DataView.setUint16(0, 1234)
186+
dv->DataView.setUint16(2, 1234, ~littleEndian=true)
187187
DataView.getUint16(dv, 0) == 1234
188188
DataView.getUint16(dv, 2, ~littleEndian=true) == 1234
189189
```
@@ -199,8 +199,8 @@ See [`DataView.getInt32`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
199199
200200
```rescript
201201
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
202-
dv->DateView.setInt32(0, -123456)
203-
dv->DateView.setInt32(4, -123456, ~littleEndian=true)
202+
dv->DataView.setInt32(0, -123456)
203+
dv->DataView.setInt32(4, -123456, ~littleEndian=true)
204204
DataView.getInt32(dv, 0) == -123456
205205
DataView.getInt32(dv, 4, ~littleEndian=true) == -123456
206206
```
@@ -216,8 +216,8 @@ See [`DataView.getUint32`](https://developer.mozilla.org/en-US/docs/Web/JavaScri
216216
217217
```rescript
218218
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
219-
dv->DateView.setUint32(0, 123456)
220-
dv->DateView.setUint32(4, 123456, ~littleEndian=true)
219+
dv->DataView.setUint32(0, 123456)
220+
dv->DataView.setUint32(4, 123456, ~littleEndian=true)
221221
DataView.getUint32(dv, 0) == 123456
222222
DataView.getUint32(dv, 4, ~littleEndian=true) == 123456
223223
```
@@ -232,8 +232,8 @@ See [`DataView.getFloat16`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
232232
## Examples
233233
```rescript
234234
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
235-
dv->DateView.setFloat16(0, 1.5)
236-
dv->DateView.setFloat16(2, 1.5, ~littleEndian=true)
235+
dv->DataView.setFloat16(0, 1.5)
236+
dv->DataView.setFloat16(2, 1.5, ~littleEndian=true)
237237
DataView.getFloat16(dv, 0) == 1.5
238238
DataView.getFloat16(dv, 2, ~littleEndian=true) == 1.5
239239
```
@@ -249,10 +249,10 @@ See [`DataView.getFloat32`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
249249
250250
```rescript
251251
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
252-
dv->DateView.setFloat32(0, 3.14)
253-
dv->DateView.setFloat32(4, 3.14, ~littleEndian=true
254-
DataView.getFloat32(dv, 0) == 3.14
255-
DataView.getFloat32(dv, 4, ~littleEndian=true) == 3.14
252+
dv->DataView.setFloat32(0, 3.14)
253+
dv->DataView.setFloat32(4, 3.14, ~littleEndian=true)
254+
// DataView.getFloat32(dv, 0) == 3.14
255+
// DataView.getFloat32(dv, 4, ~littleEndian=true) == 3.14
256256
```
257257
*/
258258
@send external getFloat32: (t, int, ~littleEndian: bool=?) => float = "getFloat32"
@@ -266,8 +266,8 @@ See [`DataView.getFloat64`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
266266
267267
```rescript
268268
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
269-
dv->DateView.setFloat64(0, 6.28)
270-
dv->DateView.setFloat64(8, 6.28, ~littleEndian=true)
269+
dv->DataView.setFloat64(0, 6.28)
270+
dv->DataView.setFloat64(8, 6.28, ~littleEndian=true)
271271
DataView.getFloat64(dv, 0) == 6.28
272272
DataView.getFloat64(dv, 8, ~littleEndian=true) == 6.28
273273
```
@@ -282,8 +282,8 @@ See [`DataView.getBigInt64`](https://developer.mozilla.org/en-US/docs/Web/JavaSc
282282
## Examples
283283
```rescript
284284
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
285-
dv->DateView.setBigInt64(0, -123456789n)
286-
dv->DateView.setBigInt64(8, -123456789n, ~littleEndian=true)
285+
dv->DataView.setBigInt64(0, -123456789n)
286+
dv->DataView.setBigInt64(8, -123456789n, ~littleEndian=true)
287287
DataView.getBigInt64(dv, 0) == -123456789n
288288
DataView.getBigInt64(dv, 8, ~littleEndian=true) == -123456789n
289289
```
@@ -299,8 +299,8 @@ See [`DataView.getBigUint64`](https://developer.mozilla.org/en-US/docs/Web/JavaS
299299
300300
```rescript
301301
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
302-
dv->DateView.setBigUint64(0, 123456789n)
303-
dv->DateView.setBigUint64(8, 123456789n, ~littleEndian=true)
302+
dv->DataView.setBigUint64(0, 123456789n)
303+
dv->DataView.setBigUint64(8, 123456789n, ~littleEndian=true)
304304
DataView.getBigUint64(dv, 0) == 123456789n
305305
DataView.getBigUint64(dv, 8, ~littleEndian=true) == 123456789n
306306
```
@@ -317,7 +317,7 @@ See [`DataView.setInt8`](https://developer.mozilla.org/en-US/docs/Web/JavaScript
317317
```rescript
318318
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
319319
DataView.setInt8(dv, 0, -12)
320-
dv->DateView.getInt8(0) == -12
320+
dv->DataView.getInt8(0) == -12
321321
```
322322
*/
323323
@send external setInt8: (t, int, int) => unit = "setInt8"
@@ -332,7 +332,7 @@ See [`DataView.setUint8`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
332332
```rescript
333333
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
334334
DataView.setUint8(dv, 0, 255)
335-
dv->DateView.getUint8(0) == 255
335+
dv->DataView.getUint8(0) == 255
336336
```
337337
*/
338338
@send external setUint8: (t, int, int) => unit = "setUint8"
@@ -346,10 +346,10 @@ See [`DataView.setInt16`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
346346
347347
```rescript
348348
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
349-
DataView.setInt16(dv, 0 -1234)
349+
DataView.setInt16(dv, 0, -1234)
350350
DataView.setInt16(dv, 2, -1234, ~littleEndian=true)
351-
dv->DateView.getInt16(0) == -1234
352-
dv->DateView.getInt16(2, ~littleEndian=true) == -1234
351+
dv->DataView.getInt16(0) == -1234
352+
dv->DataView.getInt16(2, ~littleEndian=true) == -1234
353353
```
354354
*/
355355
@send external setInt16: (t, int, int, ~littleEndian: bool=?) => unit = "setInt16"
@@ -365,8 +365,8 @@ See [`DataView.setUint16`](https://developer.mozilla.org/en-US/docs/Web/JavaScri
365365
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
366366
DataView.setUint16(dv, 0, 1234)
367367
DataView.setUint16(dv, 2, 1234, ~littleEndian=true)
368-
dv->DateView.getUint16(0) == 1234
369-
dv->DateView.getUint16(2, ~littleEndian=true) == 1234
368+
dv->DataView.getUint16(0) == 1234
369+
dv->DataView.getUint16(2, ~littleEndian=true) == 1234
370370
```
371371
*/
372372
@send external setUint16: (t, int, int, ~littleEndian: bool=?) => unit = "setUint16"
@@ -382,8 +382,8 @@ See [`DataView.setInt32`](https://developer.mozilla.org/en-US/docs/Web/JavaScrip
382382
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
383383
DataView.setInt32(dv, 0, -123456)
384384
DataView.setInt32(dv, 4, -123456, ~littleEndian=true)
385-
dv->DateView.getInt32(0) == -123456
386-
dv->DateView.getInt32(4, ~littleEndian=true) == -123456
385+
dv->DataView.getInt32(0) == -123456
386+
dv->DataView.getInt32(4, ~littleEndian=true) == -123456
387387
```
388388
*/
389389
@send external setInt32: (t, int, int, ~littleEndian: bool=?) => unit = "setInt32"
@@ -397,10 +397,10 @@ See [`DataView.setUint32`](https://developer.mozilla.org/en-US/docs/Web/JavaScri
397397
398398
```rescript
399399
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
400-
DataView.setUint32(dv, 0 123456)
400+
DataView.setUint32(dv, 0, 123456)
401401
DataView.setUint32(dv, 4, 123456, ~littleEndian=true)
402-
dv->DateView.getUint32(0) == 123456
403-
dv->DateView.getUint32(4, ~littleEndian=true) == 123456
402+
dv->DataView.getUint32(0) == 123456
403+
dv->DataView.getUint32(4, ~littleEndian=true) == 123456
404404
```
405405
*/
406406
@send external setUint32: (t, int, int, ~littleEndian: bool=?) => unit = "setUint32"
@@ -416,8 +416,8 @@ See [`DataView.setFloat16`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
416416
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
417417
DataView.setFloat16(dv, 0, 1.5)
418418
DataView.setFloat16(dv, 2, 1.5, ~littleEndian=true)
419-
dv->DateView.getFloat16(0) == 1.5
420-
dv->DateView.getFloat16(2, ~littleEndian=true) == 1.5
419+
dv->DataView.getFloat16(0) == 1.5
420+
dv->DataView.getFloat16(2, ~littleEndian=true) == 1.5
421421
```
422422
*/
423423
@send external setFloat16: (t, int, float, ~littleEndian: bool=?) => unit = "setFloat16"
@@ -433,8 +433,8 @@ See [`DataView.setFloat32`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
433433
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
434434
DataView.setFloat32(dv, 0, 3.14)
435435
DataView.setFloat32(dv, 4, 3.14, ~littleEndian=true)
436-
dv->DateView.getFloat32(0) == 3.14
437-
dv->DateView.getFloat32(4, ~littleEndian=true) == 3.14
436+
// dv->DataView.getFloat32(0) == 3.14
437+
// dv->DataView.getFloat32(4, ~littleEndian=true) == 3.14
438438
```
439439
*/
440440
@send external setFloat32: (t, int, float, ~littleEndian: bool=?) => unit = "setFloat32"
@@ -450,8 +450,8 @@ See [`DataView.setFloat64`](https://developer.mozilla.org/en-US/docs/Web/JavaScr
450450
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
451451
DataView.setFloat64(dv, 0, 6.28)
452452
DataView.setFloat64(dv, 8, 6.28, ~littleEndian=true)
453-
dv->DateView.getFloat64(0) == 6.28
454-
dv->DateView.getFloat64(8, ~littleEndian=true) == 6.28
453+
dv->DataView.getFloat64(0) == 6.28
454+
dv->DataView.getFloat64(8, ~littleEndian=true) == 6.28
455455
```
456456
*/
457457
@send external setFloat64: (t, int, float, ~littleEndian: bool=?) => unit = "setFloat64"
@@ -467,8 +467,8 @@ See [`DataView.setBigInt64`](https://developer.mozilla.org/en-US/docs/Web/JavaSc
467467
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
468468
DataView.setBigInt64(dv, 0, -123456789n)
469469
DataView.setBigInt64(dv, 8, -123456789n, ~littleEndian=true)
470-
dv->DateView.getBigInt64(0) == -123456789n
471-
dv->DateView.getBigInt64(8, ~littleEndian=true) == -123456789n
470+
dv->DataView.getBigInt64(0) == -123456789n
471+
dv->DataView.getBigInt64(8, ~littleEndian=true) == -123456789n
472472
```
473473
*/
474474
@send external setBigInt64: (t, int, bigint, ~littleEndian: bool=?) => unit = "setBigInt64"
@@ -484,8 +484,8 @@ See [`DataView.setBigUint64`](https://developer.mozilla.org/en-US/docs/Web/JavaS
484484
let dv = DataView.fromBuffer(ArrayBuffer.make(16))
485485
DataView.setBigUint64(dv, 0, 123456789n)
486486
DataView.setBigUint64(dv, 8, 123456789n, ~littleEndian=true)
487-
dv->DateView.getBigUint64(0) == 123456789n
488-
dv->DateView.getBigUint64(8, ~littleEndian=true) == 123456789n
487+
dv->DataView.getBigUint64(0) == 123456789n
488+
dv->DataView.getBigUint64(8, ~littleEndian=true) == 123456789n
489489
```
490490
*/
491491
@send external setBigUint64: (t, int, bigint, ~littleEndian: bool=?) => unit = "setBigUint64"

‎packages/@rescript/runtime/lib/es6/Belt_Array.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function get(arr, i) {
77
if (i >= 0 && i < arr.length) {
88
return Primitive_option.some(arr[i]);
99
}
10-
1110
}
1211

1312
function getOrThrow(arr, i) {
@@ -328,7 +327,6 @@ function keep(a, f) {
328327
r[j] = v;
329328
j = j + 1 | 0;
330329
}
331-
332330
}
333331
r.length = j;
334332
return r;
@@ -344,7 +342,6 @@ function keepWithIndex(a, f) {
344342
r[j] = v;
345343
j = j + 1 | 0;
346344
}
347-
348345
}
349346
r.length = j;
350347
return r;
@@ -361,7 +358,6 @@ function keepMap(a, f) {
361358
r[j] = Primitive_option.valFromOption(v$1);
362359
j = j + 1 | 0;
363360
}
364-
365361
}
366362
r.length = j;
367363
return r;

‎packages/@rescript/runtime/lib/es6/Belt_HashMap.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ function set0(h, key, value, eq, hash) {
5757
};
5858
h.size = h.size + 1 | 0;
5959
}
60-
6160
} else {
6261
h_buckets[i] = {
6362
key: key,
@@ -84,11 +83,9 @@ function set0(h, key, value, eq, hash) {
8483
if (tail !== undefined) {
8584
tail.next = undefined;
8685
}
87-
8886
}
8987
return;
9088
}
91-
9289
}
9390

9491
function set(h, key, value) {
@@ -166,7 +163,6 @@ function get(h, key) {
166163
};
167164
}
168165
}
169-
170166
}
171167

172168
function has(h, key) {

‎packages/@rescript/runtime/lib/es6/Belt_HashMapInt.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ function set(h, key, value) {
5454
};
5555
h.size = h.size + 1 | 0;
5656
}
57-
5857
} else {
5958
h_buckets[i] = {
6059
key: key,
@@ -81,11 +80,9 @@ function set(h, key, value) {
8180
if (tail !== undefined) {
8281
tail.next = undefined;
8382
}
84-
8583
}
8684
return;
8785
}
88-
8986
}
9087

9188
function remove(h, key) {
@@ -118,7 +115,6 @@ function remove(h, key) {
118115
};
119116
}
120117
}
121-
122118
}
123119

124120
function get(h, key) {
@@ -157,7 +153,6 @@ function get(h, key) {
157153
};
158154
}
159155
}
160-
161156
}
162157

163158
function has(h, key) {

0 commit comments

Comments
 (0)