pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add alternative string syntax with single quotes and backticks

Browse source
This commit is contained in:
elkowar 2021-07-27 00:11:16 +02:00
parent e698fd315e
commit 01c7ba6e2a
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
4 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/simplexpr/src/parser/lexer.rs
View file

@ -40,7 +40,10 @@ pub enum Token {
Ident(String),
#[regex(r"[+-]?(?:[0-9]+[.])?[0-9]+", |x| x.slice().to_string())]
NumLit(String),
#[regex(r#""(?:[^"\\]|\\.)*""#, |x| ESCAPE_REPLACE_REGEX.replace_all(x.slice(), "$1").to_string())]
#[regex(r#"`(?:[^`\\]|\\.)*`"#, |x| ESCAPE_REPLACE_REGEX.replace_all(x.slice(), "$1").to_string())]
#[regex(r#"'(?:[^'\\]|\\.)*'"#, |x| ESCAPE_REPLACE_REGEX.replace_all(x.slice(), "$1").to_string())]
StrLit(String),

17
crates/yuck/src/parser/lexer.rs
View file

@ -70,6 +70,8 @@ regex_rules! {
r"true" => |_| Token::True,
r"false" => |_| Token::False,
r#""(?:[^"\\]|\\.)*""# => |x| Token::StrLit(ESCAPE_REPLACE_REGEX.replace_all(&x, "$1").to_string()),
r#"`(?:[^`\\]|\\.)*`"# => |x| Token::StrLit(ESCAPE_REPLACE_REGEX.replace_all(&x, "$1").to_string()),
r#"'(?:[^'\\]|\\.)*'"# => |x| Token::StrLit(ESCAPE_REPLACE_REGEX.replace_all(&x, "$1").to_string()),
r#"[+-]?(?:[0-9]+[.])?[0-9]+"# => |x| Token::NumLit(x),
r#":[^\s\)\]}]+"# => |x| Token::Keyword(x),
r#"[a-zA-Z_!\?<>/\.\*-\+\-][^\s{}\(\)\[\](){}]*"# => |x| Token::Symbol(x),
@ -102,7 +104,7 @@ impl Iterator for Lexer {
if string.starts_with('{') {
let expr_start = self.pos;
let mut in_string = false;
let mut in_string = None;
loop {
if self.pos >= self.source.len() {
return None;
@ -112,13 +114,19 @@ impl Iterator for Lexer {
}
let string = &self.source[self.pos..];
if string.starts_with('}') && !in_string {
if string.starts_with('}') && in_string.is_none() {
self.pos += 1;
let tok_str = &self.source[expr_start..self.pos];
return Some(Ok((expr_start, Token::SimplExpr(tok_str.to_string()), self.pos - 1)));
} else if string.starts_with('"') {
} else if string.starts_with('"') || string.starts_with('\'') || string.starts_with('`') {
if let Some(quote) = in_string {
if string.starts_with(quote) {
in_string = None;
}
} else {
in_string = Some(string.chars().next().unwrap());
}
self.pos += 1;
in_string = !in_string;
} else if string.starts_with("\\\"") {
self.pos += 2;
} else {
@ -165,4 +173,5 @@ fn test_yuck_lexer() {
insta::assert_debug_snapshot!(Lexer::new(0, r#"{ bla "} \" }" " \" "}"#.to_string()).collect_vec());
insta::assert_debug_snapshot!(Lexer::new(0, r#""< \" >""#.to_string()).collect_vec());
insta::assert_debug_snapshot!(Lexer::new(0, r#"{ " " + music}"#.to_string()).collect_vec());
insta::assert_debug_snapshot!(Lexer::new(0, r#"{ " } ' }" }"#.to_string()).collect_vec());
}

16
crates/yuck/src/parser/snapshots/yuck__parser__lexer__yuck_lexer-5.snap Normal file
View file

@ -0,0 +1,16 @@
---
source: crates/yuck/src/parser/lexer.rs
expression: "Lexer::new(0, r#\"{ \" } ' }\" }\"#.to_string()).collect_vec()"
---
[
Ok(
(
0,
SimplExpr(
"{ \" } ' }\" }",
),
11,
),
),
]

2
examples/eww-bar/eww.yuck
View file

@ -24,7 +24,7 @@
(defwidget music []
(box :class "music" :orientation "h" :space-evenly false :halign "center"
{ " " + music}))
{ ' ' + music}))
(defwidget slider-vol []
(box :class "slider-vol" :orientation "h" :space-evenly "false"