Skip to content
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

Fix lexing escapes in string literal and minor refactor #1079

Merged
merged 23 commits into from
Jan 20, 2021
Merged

Fix lexing escapes in string literal and minor refactor #1079

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bded0ae
Refactor StringLiteral
jevancc Jan 18, 2021
54c6ffe
Fix octal escape in string literal
jevancc Jan 18, 2021
4c9a78f
Add tests
jevancc Jan 18, 2021
06513e9
Fix zero escape
jevancc Jan 18, 2021
0cae443
Fix zero escape lookahead
jevancc Jan 18, 2021
e783fe4
Rename variables
jevancc Jan 18, 2021
1f6b7b2
Rename helper functions
jevancc Jan 18, 2021
067f2a1
Refactor match arms
jevancc Jan 18, 2021
6cca4d9
Fix escape line terminator sequence
jevancc Jan 19, 2021
83e8647
Fix single character escape
jevancc Jan 19, 2021
5fd86a1
Fix escape followed by unicode char
jevancc Jan 19, 2021
b176702
Add NonOctalDecimalEscapeSequence
jevancc Jan 19, 2021
858a74d
Fix comment
jevancc Jan 19, 2021
e4bf635
Refactor
jevancc Jan 19, 2021
835a5bb
Modify error message
jevancc Jan 19, 2021
d67cec2
Add tests
jevancc Jan 19, 2021
f59a002
Rename tests
jevancc Jan 19, 2021
983d786
Add test for error
jevancc Jan 19, 2021
17803d0
Add comments for unsafe bytes to str
jevancc Jan 19, 2021
99a6096
Update boa/src/syntax/lexer/string.rs
jevancc Jan 19, 2021
b9d7b02
Minor refactor
jevancc Jan 19, 2021
dcf668e
Remove unsafe bytes to str
jevancc Jan 19, 2021
6fa0642
Fix panic when reading invalid utf-8 chars
jevancc Jan 19, 2021
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
Prev Previous commit
Next Next commit
Minor refactor
  • Loading branch information
@jevancc
jevancc committed Jan 19, 2021
commit b9d7b02d902d91e7aaca13767be35b105db55f12
9 changes: 4 additions & 5 deletions boa/src/syntax/lexer/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ impl StringLiteral {
'\\' => buf.push(0x005C /* \ */),
'0' if cursor
.peek()?
.and_then(|next_byte| char::try_from(next_byte).ok())
.filter(|next_ch| next_ch.is_digit(10))
.filter(|next_byte| (b'0'..=b'9').contains(next_byte))
.is_none() =>
{
buf.push(0x0000 /* NULL */)
Expand Down Expand Up @@ -303,14 +302,14 @@ impl StringLiteral {
// Grammar: ZeroToThree OctalDigit
// Grammar: FourToSeven OctalDigit
if let Some(byte) = cursor.peek()? {
if (b'0'..b'8').contains(&byte) {
if (b'0'..=b'7').contains(&byte) {
let _ = cursor.next_byte()?;
code_point = (code_point * 8) + (byte - b'0') as u32;

if (b'0'..b'4').contains(&init_byte) {
if (b'0'..=b'3').contains(&init_byte) {
// Grammar: ZeroToThree OctalDigit OctalDigit
if let Some(byte) = cursor.peek()? {
if (b'0'..b'8').contains(&byte) {
if (b'0'..=b'7').contains(&byte) {
let _ = cursor.next_byte()?;
code_point = (code_point * 8) + (byte - b'0') as u32;
}
Expand Down