Skip to content

Only allow the \u{…} Unicode escapes #202

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

Closed
wants to merge 2 commits into from
Closed

Only allow the \u{…} Unicode escapes #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46c22e2
Recognize \UHHHHHH as an escape sequence
stasm Nov 5, 2018
58ab878
Only allow the \u{…} escapes
stasm Nov 5, 2018
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
2 changes: 1 addition & 1 deletion spec/fluent.ebnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ indented_char ::= text_char - "[" - "*" - "."
special_quoted_char ::= "\""
| "\\"
special_escape ::= "\\" special_quoted_char
unicode_escape ::= "\\u" /[0-9a-fA-F]{4}/
unicode_escape ::= "\\u{" /[0-9a-fA-F]{1,6}/ "}"
quoted_char ::= (any_char - special_quoted_char)
| special_escape
| unicode_escape
Expand Down
5 changes: 3 additions & 2 deletions syntax/grammar.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,9 @@ let special_escape =

let unicode_escape =
sequence(
string("\\u"),
regex(/[0-9a-fA-F]{4}/))
string("\\u{"),
regex(/[0-9a-fA-F]{1,6}/),
string("}"))
.map(join);

let quoted_char =
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/astral.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ face-with-tears-of-joy = 😂
tetragram-for-centre = 𝌆

surrogates-in-text = \uD83D\uDE02
surrogates-in-string = {"\uD83D\uDE02"}
surrogates-in-adjacent-strings = {"\uD83D"}{"\uDE02"}
surrogates-in-string = {"\u{D83D}\u{DE02}"}
surrogates-in-adjacent-strings = {"\u{D83D}"}{"\u{DE02}"}

emoji-in-text = A face 😂 with tears of joy.
emoji-in-string = {"A face 😂 with tears of joy."}
Expand Down
6 changes: 3 additions & 3 deletions test/fixtures/astral.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\uD83D\\uDE02"
"value": "\\u{D83D}\\u{DE02}"
}
}
]
Expand All @@ -89,14 +89,14 @@
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\uD83D"
"value": "\\u{D83D}"
}
},
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\uDE02"
"value": "\\u{DE02}"
}
}
]
Expand Down
25 changes: 21 additions & 4 deletions test/fixtures/escaped_characters.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
text-backslash-one = Value with \ a backslash
text-backslash-two = Value with \\ two backslashes
text-backslash-brace = Value with \{placeable}
text-backslash-u = \u0041
text-backslash-backslash-u = \\u0041
text-backslash-u = \u{41}
text-backslash-backslash-u = \\u{41}

## String literals
quote-in-string = {"\""}
Expand All @@ -14,8 +14,25 @@ mismatched-quote = {"\\""}
unknown-escape = {"\x"}

## Unicode escapes
string-unicode-sequence = {"\u0041"}
string-escaped-unicode = {"\\u0041"}
string-unicode-1digit = {"\u{9}"}
string-unicode-2digits = {"\u{09}"}
string-unicode-3digits = {"\u{009}"}
string-unicode-4digits = {"\u{0009}"}
string-unicode-5digits = {"\u{00009}"}
string-unicode-6digits = {"\u{000009}"}

escape-unicode-4digits = {"\\u{41}"}
escape-unicode-6digits = {"\\u{01F602}"}

# ERROR Too few hex digits.
string-unicode-0digits = {"\u{}"}
# ERROR Too many hex digits.
string-unicode-7digits = {"\U{001F602}"}

# ERROR Missing opening brace.
string-unicode-missing-open = {"\u9}"}
# ERROR Missing closing brace.
string-unicode-missing-close = {"\u{9"}

## Literal braces
brace-open = An opening {"{"} brace.
Expand Down
188 changes: 182 additions & 6 deletions test/fixtures/escaped_characters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,14 @@
"elements": [
{
"type": "TextElement",
"value": "\\u0041"
"value": "\\u"
},
{
"type": "Placeable",
"expression": {
"type": "NumberLiteral",
"value": "41"
}
}
]
},
Expand All @@ -98,7 +105,14 @@
"elements": [
{
"type": "TextElement",
"value": "\\\\u0041"
"value": "\\\\u"
},
{
"type": "Placeable",
"expression": {
"type": "NumberLiteral",
"value": "41"
}
}
]
},
Expand Down Expand Up @@ -177,7 +191,133 @@
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-sequence"
"name": "string-unicode-1digit"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{9}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-2digits"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{09}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-3digits"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{009}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-4digits"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{0009}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-5digits"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{00009}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-unicode-6digits"
},
"value": {
"type": "Pattern",
"elements": [
{
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u{000009}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Message",
"id": {
"type": "Identifier",
"name": "escape-unicode-4digits"
},
"value": {
"type": "Pattern",
Expand All @@ -186,7 +326,7 @@
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\u0041"
"value": "\\\\u{41}"
}
}
]
Expand All @@ -198,7 +338,7 @@
"type": "Message",
"id": {
"type": "Identifier",
"name": "string-escaped-unicode"
"name": "escape-unicode-6digits"
},
"value": {
"type": "Pattern",
Expand All @@ -207,14 +347,50 @@
"type": "Placeable",
"expression": {
"type": "StringLiteral",
"value": "\\\\u0041"
"value": "\\\\u{01F602}"
}
}
]
},
"attributes": [],
"comment": null
},
{
"type": "Comment",
"content": "ERROR Too few hex digits."
},
{
"type": "Junk",
"annotations": [],
"content": "string-unicode-0digits = {\"\\u{}\"}\n"
},
{
"type": "Comment",
"content": "ERROR Too many hex digits."
},
{
"type": "Junk",
"annotations": [],
"content": "string-unicode-7digits = {\"\\U{001F602}\"}\n"
},
{
"type": "Comment",
"content": "ERROR Missing opening brace."
},
{
"type": "Junk",
"annotations": [],
"content": "string-unicode-missing-open = {\"\\u9}\"}\n"
},
{
"type": "Comment",
"content": "ERROR Missing closing brace."
},
{
"type": "Junk",
"annotations": [],
"content": "string-unicode-missing-close = {\"\\u{9\"}\n"
},
{
"type": "GroupComment",
"content": "Literal braces"
Expand Down