Skip to content

refactor(lexer): simplify macros for string parsing + correct comment #10039

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
graphite-app merged 1 commit into from
Mar 28, 2025
Merged

refactor(lexer): simplify macros for string parsing + correct comment #10039

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 crates/oxc_parser/src/lexer/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static SINGLE_QUOTE_STRING_END_TABLE: SafeByteMatchTable =
/// `$table` must be a `SafeByteMatchTable`.
/// `$table` must only match `$delimiter`, '\', '\r' or '\n'.
macro_rules! handle_string_literal {
($lexer:ident, $delimiter:expr_2021, $table:ident) => {{
($lexer:ident, $delimiter:literal, $table:ident) => {{
debug_assert!($delimiter.is_ascii());

if $lexer.context == LexerContext::JsxAttributeValue {
Expand All @@ -37,7 +37,7 @@ macro_rules! handle_string_literal {
// SAFETY: Caller guarantees next byte is ASCII, so safe to advance past it.
let after_opening_quote = $lexer.source.position().add(1);

// Consume bytes which are part of identifier
// Consume bytes which are part of string
let next_byte = byte_search! {
lexer: $lexer,
table: $table,
Expand Down Expand Up @@ -74,7 +74,7 @@ macro_rules! handle_string_literal {
}

macro_rules! handle_string_literal_escape {
($lexer:ident, $delimiter:expr_2021, $table:ident, $after_opening_quote:ident) => {{
($lexer:ident, $delimiter:literal, $table:ident, $after_opening_quote:ident) => {{
// Create arena string to hold unescaped string.
// We don't know how long string will end up being. Take a guess that total length
// will be double what we've seen so far, or `MIN_ESCAPED_STR_LEN` minimum.
Expand Down