mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-20 11:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

templater: rename string literal rules

Browse source 
This patch adds "string_" prefix to the related rules to discriminate them from
integer_literal. I also renamed "raw_literal" because it sounds like a raw
string literal that preserves backslash characters.
This commit is contained in:
Yuya Nishihara 2024-04-07 15:38:20 +09:00
parent 9b1eb03c73
commit 6039e9889c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/src/template.pest
View file

@ -19,10 +19,10 @@
whitespace = _{ " " | "\t" | "\r" | "\n" | "\x0c" }
escape = @{ "\\" ~ ("t" | "r" | "n" | "0" | "\"" | "\\") }
literal_char = @{ !("\"" | "\\") ~ ANY }
raw_literal = @{ literal_char+ }
literal = { "\"" ~ (raw_literal | escape)* ~ "\"" }
string_escape = @{ "\\" ~ ("t" | "r" | "n" | "0" | "\"" | "\\") }
string_content_char = @{ !("\"" | "\\") ~ ANY }
string_content = @{ string_content_char+ }
string_literal = { "\"" ~ (string_content | string_escape)* ~ "\"" }
integer_literal = {
ASCII_NONZERO_DIGIT ~ ASCII_DIGIT*
@ -58,7 +58,7 @@ primary = _{
| function
| lambda
| identifier
| literal
| string_literal
| integer_literal
}

16
cli/src/template_parser.rs
View file

@ -32,10 +32,10 @@ impl Rule {
match self {
Rule::EOI => None,
Rule::whitespace => None,
Rule::escape => None,
Rule::literal_char => None,
Rule::raw_literal => None,
Rule::literal => None,
Rule::string_escape => None,
Rule::string_content_char => None,
Rule::string_content => None,
Rule::string_literal => None,
Rule::integer_literal => None,
Rule::identifier => None,
Rule::concat_op => Some("++"),
@ -315,14 +315,14 @@ fn parse_identifier_name(pair: Pair<Rule>) -> TemplateParseResult<&str> {
}
fn parse_string_literal(pair: Pair<Rule>) -> String {
assert_eq!(pair.as_rule(), Rule::literal);
assert_eq!(pair.as_rule(), Rule::string_literal);
let mut result = String::new();
for part in pair.into_inner() {
match part.as_rule() {
Rule::raw_literal => {
Rule::string_content => {
result.push_str(part.as_str());
}
Rule::escape => match &part.as_str()[1..] {
Rule::string_escape => match &part.as_str()[1..] {
"\"" => result.push('"'),
"\\" => result.push('\\'),
"t" => result.push('\t'),
@ -396,7 +396,7 @@ fn parse_term_node(pair: Pair<Rule>) -> TemplateParseResult<ExpressionNode> {
let expr = inner.next().unwrap();
let span = expr.as_span();
let primary = match expr.as_rule() {
Rule::literal => {
Rule::string_literal => {
let text = parse_string_literal(expr);
ExpressionNode::new(ExpressionKind::String(text), span)
}