Skip to content

Commit 908273f

Browse files
authored
fix: pass parent type recursively (#752)
1 parent 7193ff1 commit 908273f

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

lib/productions/type.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ function union_type(tokeniser, type) {
129129
ret.type = type || null;
130130
while (true) {
131131
const typ =
132-
type_with_extended_attributes(tokeniser) ||
132+
type_with_extended_attributes(tokeniser, type) ||
133133
tokeniser.error("No type after open parenthesis or 'or' in union type");
134134
if (typ.idlType === "any")
135135
tokeniser.error("Type `any` cannot be included in a union type");

test/syntax/baseline/bigint.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@
130130
"union": true,
131131
"idlType": [
132132
{
133-
"type": null,
133+
"type": "typedef-type",
134134
"extAttrs": [],
135135
"generic": "",
136136
"nullable": false,
137137
"union": false,
138138
"idlType": "bigint"
139139
},
140140
{
141-
"type": null,
141+
"type": "typedef-type",
142142
"extAttrs": [],
143143
"generic": "",
144144
"nullable": false,

test/syntax/baseline/constructor.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@
102102
"union": true,
103103
"idlType": [
104104
{
105-
"type": null,
105+
"type": "argument-type",
106106
"extAttrs": [],
107107
"generic": "",
108108
"nullable": false,
109109
"union": false,
110110
"idlType": "Type1"
111111
},
112112
{
113-
"type": null,
113+
"type": "argument-type",
114114
"extAttrs": [],
115115
"generic": "",
116116
"nullable": false,

test/syntax/baseline/extended-attributes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,15 @@
229229
"union": true,
230230
"idlType": [
231231
{
232-
"type": null,
232+
"type": "attribute-type",
233233
"extAttrs": [],
234234
"generic": "",
235235
"nullable": false,
236236
"union": false,
237237
"idlType": "long"
238238
},
239239
{
240-
"type": null,
240+
"type": "attribute-type",
241241
"extAttrs": [],
242242
"generic": "",
243243
"nullable": false,

test/syntax/baseline/record.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@
8888
"union": true,
8989
"idlType": [
9090
{
91-
"type": null,
91+
"type": "return-type",
9292
"extAttrs": [],
9393
"generic": "",
9494
"nullable": false,
9595
"union": false,
9696
"idlType": "float"
9797
},
9898
{
99-
"type": null,
99+
"type": "return-type",
100100
"extAttrs": [],
101101
"generic": "",
102102
"nullable": false,

test/syntax/baseline/typedef-union.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
"union": true,
1111
"idlType": [
1212
{
13-
"type": null,
13+
"type": "typedef-type",
1414
"extAttrs": [],
1515
"generic": "",
1616
"nullable": false,
1717
"union": false,
1818
"idlType": "ImageData"
1919
},
2020
{
21-
"type": null,
21+
"type": "typedef-type",
2222
"extAttrs": [],
2323
"generic": "",
2424
"nullable": false,
2525
"union": false,
2626
"idlType": "HTMLImageElement"
2727
},
2828
{
29-
"type": null,
29+
"type": "typedef-type",
3030
"extAttrs": [],
3131
"generic": "",
3232
"nullable": false,
3333
"union": false,
3434
"idlType": "HTMLCanvasElement"
3535
},
3636
{
37-
"type": null,
37+
"type": "typedef-type",
3838
"extAttrs": [],
3939
"generic": "",
4040
"nullable": false,

test/syntax/baseline/undefined.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
"union": true,
3838
"idlType": [
3939
{
40-
"type": null,
40+
"type": "return-type",
4141
"extAttrs": [],
4242
"generic": "",
4343
"nullable": false,
4444
"union": false,
4545
"idlType": "DOMString"
4646
},
4747
{
48-
"type": null,
48+
"type": "return-type",
4949
"extAttrs": [],
5050
"generic": "",
5151
"nullable": false,

test/syntax/baseline/uniontype.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
"union": true,
1616
"idlType": [
1717
{
18-
"type": null,
18+
"type": "attribute-type",
1919
"extAttrs": [],
2020
"generic": "",
2121
"nullable": false,
2222
"union": false,
2323
"idlType": "float"
2424
},
2525
{
26-
"type": null,
26+
"type": "attribute-type",
2727
"extAttrs": [],
2828
"generic": "",
2929
"nullable": false,
3030
"union": true,
3131
"idlType": [
3232
{
33-
"type": null,
33+
"type": "attribute-type",
3434
"extAttrs": [],
3535
"generic": "",
3636
"nullable": false,
3737
"union": false,
3838
"idlType": "Date"
3939
},
4040
{
41-
"type": null,
41+
"type": "attribute-type",
4242
"extAttrs": [],
4343
"generic": "",
4444
"nullable": false,
@@ -48,22 +48,22 @@
4848
]
4949
},
5050
{
51-
"type": null,
51+
"type": "attribute-type",
5252
"extAttrs": [],
5353
"generic": "",
5454
"nullable": true,
5555
"union": true,
5656
"idlType": [
5757
{
58-
"type": null,
58+
"type": "attribute-type",
5959
"extAttrs": [],
6060
"generic": "",
6161
"nullable": false,
6262
"union": false,
6363
"idlType": "Node"
6464
},
6565
{
66-
"type": null,
66+
"type": "attribute-type",
6767
"extAttrs": [],
6868
"generic": "",
6969
"nullable": false,
@@ -89,7 +89,7 @@
8989
"union": true,
9090
"idlType": [
9191
{
92-
"type": null,
92+
"type": "attribute-type",
9393
"extAttrs": [
9494
{
9595
"type": "extended-attribute",
@@ -104,7 +104,7 @@
104104
"idlType": "long"
105105
},
106106
{
107-
"type": null,
107+
"type": "attribute-type",
108108
"extAttrs": [],
109109
"generic": "",
110110
"nullable": false,

0 commit comments

Comments
 (0)