elkowar/eww
1
1
Fork 0
mirror of https://github.com/elkowar/eww.git synced 2024-09-11 11:56:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-point unicode glyphs in yuck lexer

Browse Source
This commit is contained in:
elkowar 2021-07-26 23:10:01 +02:00
parent de8c79bc7d
commit e698fd315e
No known key found for this signature in database
GPG Key ID: E321AD71B1D1F27F
5 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/simplexpr/src/parser/lexer.rs
View File

@ -97,4 +97,5 @@ impl<'input> Iterator for Lexer<'input> {
fn test_simplexpr_lexer() {
use itertools::Itertools;
insta::assert_debug_snapshot!(Lexer::new(0, 0, r#"(foo + - "()" "a\"b" true false [] 12.2)"#).collect_vec());
insta::assert_debug_snapshot!(Lexer::new(0, 0, r#"" " + music"#).collect_vec());
}

32
crates/simplexpr/src/parser/snapshots/simplexpr__parser__lexer__simplexpr_lexer-2.snap Normal file
View File

@ -0,0 +1,32 @@
---
source: crates/simplexpr/src/parser/lexer.rs
expression: "Lexer::new(0, 0, r#\"\" \" + music\"#).collect_vec()"
---
[
Ok(
(
0,
StrLit(
"\"\u{f001} \"",
),
8,
),
),
Ok(
(
9,
Plus,
10,
),
),
Ok(
(
11,
Ident(
"music",
),
16,
),
),
]

6
crates/yuck/src/parser/lexer.rs
View File

@ -101,13 +101,15 @@ impl Iterator for Lexer {
let string = &self.source[self.pos..];
if string.starts_with('{') {
// self.pos += 1;
let expr_start = self.pos;
let mut in_string = false;
loop {
if self.pos >= self.source.len() {
return None;
}
while !self.source.is_char_boundary(self.pos) {
self.pos += 1;
}
let string = &self.source[self.pos..];
if string.starts_with('}') && !in_string {
@ -137,7 +139,6 @@ impl Iterator for Lexer {
Some(x) => x,
None => {
self.failed = true;
dbg!(&string);
return Some(Err(parse_error::ParseError::LexicalError(Span(self.pos, self.pos, self.file_id))));
}
};
@ -163,4 +164,5 @@ fn test_yuck_lexer() {
insta::assert_debug_snapshot!(Lexer::new(0, r#"(foo + - "text" )"#.to_string()).collect_vec());
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());
}

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

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

3
examples/eww-bar/eww.yuck
View File

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