beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 17:10:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb/CSS: Rename Token::representation() to original_source_text()

Browse source 
This is the term used in the Syntax-3 spec as of right now.
This commit is contained in:
Sam Atkins 2024-10-14 15:33:42 +01:00 committed by Andreas Kling
parent 301502a3a1
commit 04939d68f0
Notes: github-actions[bot] 2024-10-16 12:23:55 +00:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/LadybirdBrowser/ladybird/commit/04939d68f0b
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1795
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -2238,13 +2238,13 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(TokenStream<ComponentVal
if (second_token.is_delim('+')) {
auto local_transaction = tokens.begin_transaction();
StringBuilder string_builder;
string_builder.append(second_token.token().representation());
string_builder.append(second_token.token().original_source_text());
auto const& third_token = tokens.consume_a_token();
if (third_token.is(Token::Type::Ident) || third_token.is_delim('?')) {
string_builder.append(third_token.token().representation());
string_builder.append(third_token.token().original_source_text());
while (tokens.next_token().is_delim('?'))
string_builder.append(tokens.consume_a_token().token().representation());
string_builder.append(tokens.consume_a_token().token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
}
@ -2254,9 +2254,9 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(TokenStream<ComponentVal
if (second_token.is(Token::Type::Dimension)) {
auto local_transaction = tokens.begin_transaction();
StringBuilder string_builder;
string_builder.append(second_token.token().representation());
string_builder.append(second_token.token().original_source_text());
while (tokens.next_token().is_delim('?'))
string_builder.append(tokens.consume_a_token().token().representation());
string_builder.append(tokens.consume_a_token().token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
}
@ -2267,24 +2267,24 @@ Optional<Gfx::UnicodeRange> Parser::parse_unicode_range(TokenStream<ComponentVal
if (second_token.is(Token::Type::Number)) {
auto local_transaction = tokens.begin_transaction();
StringBuilder string_builder;
string_builder.append(second_token.token().representation());
string_builder.append(second_token.token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
auto const& third_token = tokens.consume_a_token();
if (third_token.is_delim('?')) {
string_builder.append(third_token.token().representation());
string_builder.append(third_token.token().original_source_text());
while (tokens.next_token().is_delim('?'))
string_builder.append(tokens.consume_a_token().token().representation());
string_builder.append(tokens.consume_a_token().token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
} else if (third_token.is(Token::Type::Dimension)) {
string_builder.append(third_token.token().representation());
string_builder.append(third_token.token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
} else if (third_token.is(Token::Type::Number)) {
string_builder.append(third_token.token().representation());
string_builder.append(third_token.token().original_source_text());
if (is_ending_token(tokens.next_token()))
return create_unicode_range(string_builder.string_view(), local_transaction);
}

4
Userland/Libraries/LibWeb/CSS/Parser/Token.h
View file

@ -146,7 +146,7 @@ public:
String to_string() const;
String to_debug_string() const;
String const& representation() const { return m_representation; }
String const& original_source_text() const { return m_original_source_text; }
Position const& start_position() const { return m_start_position; }
Position const& end_position() const { return m_end_position; }
@ -206,7 +206,7 @@ private:
Number m_number_value;
HashType m_hash_type { HashType::Unrestricted };
String m_representation;
String m_original_source_text;
Position m_start_position;
Position m_end_position;
};

48
Userland/Libraries/LibWeb/CSS/Parser/Tokenizer.cpp
View file

@ -376,7 +376,7 @@ Token Tokenizer::create_value_token(Token::Type type, FlyString&& value, String&
{
auto token = create_new_token(type);
token.m_value = move(value);
token.m_representation = move(representation);
token.m_original_source_text = move(representation);
return token;
}
@ -384,7 +384,7 @@ Token Tokenizer::create_value_token(Token::Type type, u32 value, String&& repres
{
auto token = create_new_token(type);
token.m_value = String::from_code_point(value);
token.m_representation = move(representation);
token.m_original_source_text = move(representation);
return token;
}
@ -661,7 +661,7 @@ Token Tokenizer::consume_a_url_token()
auto make_token = [&]() -> Token {
token.m_value = builder.to_fly_string_without_validation();
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
};
@ -705,7 +705,7 @@ Token Tokenizer::consume_a_url_token()
// otherwise, consume the remnants of a bad url, create a <bad-url-token>, and return it.
consume_the_remnants_of_a_bad_url();
auto bad_url_token = create_new_token(Token::Type::BadUrl);
bad_url_token.m_representation = input_since(start_byte_offset);
bad_url_token.m_original_source_text = input_since(start_byte_offset);
return bad_url_token;
}
@ -718,7 +718,7 @@ Token Tokenizer::consume_a_url_token()
log_parse_error();
consume_the_remnants_of_a_bad_url();
auto bad_url_token = create_new_token(Token::Type::BadUrl);
bad_url_token.m_representation = input_since(start_byte_offset);
bad_url_token.m_original_source_text = input_since(start_byte_offset);
return bad_url_token;
}
@ -735,7 +735,7 @@ Token Tokenizer::consume_a_url_token()
// Consume the remnants of a bad url, create a <bad-url-token>, and return it.
consume_the_remnants_of_a_bad_url();
auto bad_url_token = create_new_token(Token::Type::BadUrl);
bad_url_token.m_representation = input_since(start_byte_offset);
bad_url_token.m_original_source_text = input_since(start_byte_offset);
return bad_url_token;
}
}
@ -816,7 +816,7 @@ Token Tokenizer::consume_a_numeric_token()
token.m_value = move(unit);
// 3. Return the <dimension-token>.
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -827,14 +827,14 @@ Token Tokenizer::consume_a_numeric_token()
// Create a <percentage-token> with the same value as number, and return it.
auto token = create_new_token(Token::Type::Percentage);
token.m_number_value = number;
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
// Otherwise, create a <number-token> with the same value and type flag as number, and return it.
auto token = create_new_token(Token::Type::Number);
token.m_number_value = number;
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -965,7 +965,7 @@ Token Tokenizer::consume_string_token(u32 ending_code_point)
auto make_token = [&]() -> Token {
token.m_value = builder.to_fly_string_without_validation();
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
};
@ -990,7 +990,7 @@ Token Tokenizer::consume_string_token(u32 ending_code_point)
// <bad-string-token>, and return it.
reconsume_current_input_code_point();
auto bad_string_token = create_new_token(Token::Type::BadString);
bad_string_token.m_representation = input_since(start_byte_offset);
bad_string_token.m_original_source_text = input_since(start_byte_offset);
return bad_string_token;
}
@ -1077,7 +1077,7 @@ Token Tokenizer::consume_a_token()
// Consume as much whitespace as possible. Return a <whitespace-token>.
consume_as_much_whitespace_as_possible();
auto token = create_new_token(Token::Type::Whitespace);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1111,7 +1111,7 @@ Token Tokenizer::consume_a_token()
token.m_value = move(name);
// 4. Return the <hash-token>.
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1131,7 +1131,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is left paren");
// Return a <(-token>.
Token token = create_new_token(Token::Type::OpenParen);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1140,7 +1140,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is right paren");
// Return a <)-token>.
Token token = create_new_token(Token::Type::CloseParen);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1163,7 +1163,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is comma");
// Return a <comma-token>.
Token token = create_new_token(Token::Type::Comma);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1185,7 +1185,7 @@ Token Tokenizer::consume_a_token()
(void)next_code_point();
Token token = create_new_token(Token::Type::CDC);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1219,7 +1219,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is colon");
// Return a <colon-token>.
Token token = create_new_token(Token::Type::Colon);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1228,7 +1228,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is semicolon");
// Return a <semicolon-token>.
Token token = create_new_token(Token::Type::Semicolon);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1244,7 +1244,7 @@ Token Tokenizer::consume_a_token()
(void)next_code_point();
Token token = create_new_token(Token::Type::CDO);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1271,7 +1271,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is open square");
// Return a <[-token>.
Token token = create_new_token(Token::Type::OpenSquare);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1296,7 +1296,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is closed square");
// Return a <]-token>.
Token token = create_new_token(Token::Type::CloseSquare);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1305,7 +1305,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is open curly");
// Return a <{-token>.
Token token = create_new_token(Token::Type::OpenCurly);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}
@ -1314,7 +1314,7 @@ Token Tokenizer::consume_a_token()
dbgln_if(CSS_TOKENIZER_DEBUG, "is closed curly");
// Return a <}-token>.
Token token = create_new_token(Token::Type::CloseCurly);
token.m_representation = input_since(start_byte_offset);
token.m_original_source_text = input_since(start_byte_offset);
return token;
}