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

Jump to bottom

Improve lexer by make cursor iterate over bytes #915

Merged
merged 12 commits into from
Dec 3, 2020
Merged

Improve lexer by make cursor iterate over bytes #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7057046
(WIP) Add byte iterating methods to cursor
jevancc Oct 27, 2020
f7765ae
Fix cursor bugs
jevancc Oct 27, 2020
a941c25
cargo fmt
jevancc Oct 27, 2020
1d16e5c
Fix cursor warnings
jevancc Oct 27, 2020
2079476
Fix warnings
jevancc Oct 27, 2020
7fd7d91
Compatible with rust stable
jevancc Oct 27, 2020
239571e
Fix clippy
jevancc Oct 27, 2020
e1dcc3a
Fix peek_n_bytes bug
jevancc Oct 27, 2020
b29ec33
Merge branch 'master' into lexer_on_bytes
jevancc Nov 2, 2020
2fb24d8
Fix comments and add inline
jevancc Nov 3, 2020
8bfe190
Add cursor tests
jevancc Nov 4, 2020
fed6215
Remove left over comment
jevancc Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions boa/src/syntax/lexer/comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ impl<R> Tokenizer<R> for SingleLineComment {

// Skip either to the end of the line or to the end of the input
while let Some(ch) = cursor.peek()? {
if ch == '\n' {
if ch == b'\n' {
break;
} else {
// Consume char.
cursor.next_char()?.expect("Comment character vansihed");
cursor.next_byte()?.expect("Comment character vansihed");
}
}
Ok(Token::new(
Expand Down Expand Up @@ -66,10 +66,10 @@ impl<R> Tokenizer<R> for MultiLineComment {

let mut new_line = false;
loop {
if let Some(ch) = cursor.next_char()? {
if ch == '*' && cursor.next_is('/')? {
if let Some(ch) = cursor.next_byte()? {
if ch == b'*' && cursor.next_is(b'/')? {
break;
} else if ch == '\n' {
} else if ch == b'\n' {
new_line = true;
}
} else {
Expand Down