Skip to content

Forbid nested VariantLists #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2018
Merged

Forbid nested VariantLists #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions spec/fluent.ebnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ junk_line ::= /[^\n]*/ ("\u000A" | EOF)
/* Attributes of Messages and Terms. */
Attribute ::= line_end blank? "." Identifier blank_inline? "=" blank_inline? Pattern

/* Value types: Pattern and VariantList. */
/* Value types: Pattern and VariantList (deprecated). */
Value ::= Pattern
| VariantList
Pattern ::= PatternElement+
Expand Down Expand Up @@ -88,8 +88,8 @@ VariantExpression ::= TermReference VariantKey
/* Block Expressions */
SelectExpression ::= InlineExpression blank? "->" blank_inline? variant_list
variant_list ::= Variant* DefaultVariant Variant* line_end
Variant ::= line_end blank? VariantKey blank_inline? Value
DefaultVariant ::= line_end blank? "*" VariantKey blank_inline? Value
Variant ::= line_end blank? VariantKey blank_inline? Pattern
DefaultVariant ::= line_end blank? "*" VariantKey blank_inline? Pattern
VariantKey ::= "[" blank? (NumberLiteral | Identifier) blank? "]"

/* Identifier */
Expand Down
9 changes: 0 additions & 9 deletions syntax/abstract.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,6 @@ export function list_into(Type) {
return never(`Invalid selector type: ${selector.type}.`);
}

// DEPRECATED
let invalid_variants_found = variants.some(
variant => variant.value instanceof FTL.VariantList);
if (invalid_variants_found) {
return never(
"VariantLists are only allowed inside of " +
"other VariantLists.");
}

return always(new Type(selector, variants));
};
case FTL.VariantList:
Expand Down
8 changes: 4 additions & 4 deletions syntax/grammar.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ let Attribute = defer(() =>
.map(keep_abstract)
.chain(list_into(FTL.Attribute)));

/* ------------------------------------- */
/* Value types: Pattern and VariantList. */
/* -------------------------------------------------- */
/* Value types: Pattern and VariantList (deprecated). */
let Value = defer(() =>
either(
Pattern,
Expand Down Expand Up @@ -357,7 +357,7 @@ let Variant = defer(() =>
maybe(blank),
VariantKey.abstract,
maybe(blank_inline),
Value.abstract)
Pattern.abstract)
.map(keep_abstract)
.chain(list_into(FTL.Variant)));

Expand All @@ -368,7 +368,7 @@ let DefaultVariant = defer(() =>
string("*"),
VariantKey.abstract,
maybe(blank_inline),
Value.abstract)
Pattern.abstract)
.map(keep_abstract)
.chain(list_into(FTL.Variant))
.map(mutate({default: true})));
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/select_expressions.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ nested-select =
}
}

# ERROR VariantLists cannot appear in SelectExpressions
# ERROR VariantLists cannot be Variant values.
nested-variant-list =
{ 1 ->
*[one] {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/select_expressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
},
{
"type": "Comment",
"content": "ERROR VariantLists cannot appear in SelectExpressions"
"content": "ERROR VariantLists cannot be Variant values."
},
{
"type": "Junk",
Expand Down
3 changes: 2 additions & 1 deletion test/fixtures/variant_lists.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ variant-list-in-message-attr = Value
*[key] Value
}

# ERROR VariantLists cannot be Variant values.
-nested-variant-list-in-term =
{
*[one] {
Expand All @@ -37,7 +38,7 @@ variant-list-in-message-attr = Value
}
}

# ERROR VariantLists may not appear in SelectExpressions
# ERROR VariantLists cannot be Variant values.
nested-select-then-variant-list =
{
*[one] { 2 ->
Expand Down
51 changes: 8 additions & 43 deletions test/fixtures/variant_lists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,48 +94,13 @@
"content": " .attr =\n {\n *[key] Value\n }\n\n"
},
{
"type": "Term",
"id": {
"type": "Identifier",
"name": "nested-variant-list-in-term"
},
"value": {
"type": "VariantList",
"variants": [
{
"type": "Variant",
"key": {
"type": "Identifier",
"name": "one"
},
"value": {
"type": "VariantList",
"variants": [
{
"type": "Variant",
"key": {
"type": "Identifier",
"name": "two"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "TextElement",
"value": "Value"
}
]
},
"default": true
}
]
},
"default": true
}
]
},
"attributes": [],
"comment": null
"type": "Comment",
"content": "ERROR VariantLists cannot be Variant values."
},
{
"type": "Junk",
"annotations": [],
"content": "-nested-variant-list-in-term =\n {\n *[one] {\n *[two] Value\n }\n }\n\n"
},
{
"type": "Term",
Expand Down Expand Up @@ -195,7 +160,7 @@
},
{
"type": "Comment",
"content": "ERROR VariantLists may not appear in SelectExpressions"
"content": "ERROR VariantLists cannot be Variant values."
},
{
"type": "Junk",
Expand Down