Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/productions/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ export class Default extends Base {
if (!assign) {
return null;
}
const def = const_value(tokeniser) || tokeniser.consume("string", "null", "[") || tokeniser.error("No value for default");
const def = const_value(tokeniser) || tokeniser.consume("string", "null", "[", "{") || tokeniser.error("No value for default");
const expression = [def];
if (def.type === "[") {
const close = tokeniser.consume("]") || tokeniser.error("Default sequence value must be empty");
expression.push(close);
} else if (def.type === "{") {
const close = tokeniser.consume("}") || tokeniser.error("Default dictionary value must be empty");
expression.push(close);
}
return new Default({ source: tokeniser.source, tokens: { assign }, expression });
}
Expand Down
2 changes: 2 additions & 0 deletions lib/productions/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ export function const_data({ type, value }) {
return { type: "Infinity", negative: type.startsWith("-") };
case "[":
return { type: "sequence", value: [] };
case "{":
return { type: "dictionary" };
case "decimal":
case "integer":
return { type: "number", value };
Expand Down
17 changes: 17 additions & 0 deletions test/syntax/baseline/dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,23 @@
},
"default": null,
"required": true
},
{
"type": "field",
"name": "dict",
"extAttrs": [],
"idlType": {
"type": "dictionary-type",
"extAttrs": [],
"generic": "",
"nullable": false,
"union": false,
"idlType": "Dictionary"
},
"default": {
"type": "dictionary"
},
"required": false
}
],
"extAttrs": [],
Expand Down
1 change: 1 addition & 0 deletions test/syntax/idl/dictionary.widl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dictionary PaintOptions {
sequence<long> seq = [];
// https://heycam.github.io/webidl/#required-dictionary-member
required long reqSeq;
Dictionary dict = {};
};

partial dictionary _A {
Expand Down