Hemera/nomo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also emit TokenKind in debug

Browse source 
Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2026-03-08 20:05:54 +01:00
parent 13eb4ca1d0
commit 08b480705b
14 changed files with 205 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ast/mod.rs
View file

@ -456,7 +456,7 @@ mod tests {
TemplateAst { TemplateAst {
root: [ root: [
StaticContent( StaticContent(
"Hello World" (0..11), [Content]"Hello World" (0..11),
), ),
], ],
} }
@ -475,14 +475,14 @@ mod tests {
TemplateAst { TemplateAst {
root: [ root: [
StaticContent( StaticContent(
"Hello" (0..5), [Content]"Hello" (0..5),
), ),
Interpolation { Interpolation {
prev_whitespace_content: Some( prev_whitespace_content: Some(
" " (5..6), [Whitespace]" " (5..6),
), ),
expression: VariableAccess( expression: VariableAccess(
"world" (10..15), [Ident]"world" (10..15),
), ),
post_whitespace_content: None, post_whitespace_content: None,
}, },
@ -508,20 +508,20 @@ mod tests {
if_block: Block { if_block: Block {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"foo" (6..9), [Ident]"foo" (6..9),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
" " (12..13), [Whitespace]" " (12..13),
), ),
}, },
content: [ content: [
StaticContent( StaticContent(
"Hiii" (13..17), [Content]"Hiii" (13..17),
), ),
], ],
end_block: Block { end_block: Block {
prev_whitespace_content: Some( prev_whitespace_content: Some(
" " (17..18), [Whitespace]" " (17..18),
), ),
expression: EndBlock, expression: EndBlock,
post_whitespace_content: None, post_whitespace_content: None,
@ -604,11 +604,11 @@ mod tests {
insta::assert_debug_snapshot!(result, @r#" insta::assert_debug_snapshot!(result, @r#"
( (
[ [
"{{" (0..2), [LeftDelim]"{{" (0..2),
" " (2..3), [Whitespace]" " (2..3),
"foo" (3..6), [Ident]"foo" (3..6),
" " (6..7), [Whitespace]" " (6..7),
"}}" (7..9), [RightDelim]"}}" (7..9),
], ],
None, None,
[ [

20
src/ast/snapshots/nomo__ast__tests__simple_if_ast.snap
View file

@ -10,10 +10,10 @@ TemplateAst {
if_block: Block { if_block: Block {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"foo" (6..9), [Ident]"foo" (6..9),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n " (12..25), [Whitespace]"\n " (12..25),
), ),
}, },
content: [ content: [
@ -23,24 +23,24 @@ TemplateAst {
if_block: Block { if_block: Block {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"bar" (31..34), [Ident]"bar" (31..34),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n " (37..54), [Whitespace]"\n " (37..54),
), ),
}, },
content: [ content: [
StaticContent( StaticContent(
"Hiii" (54..58), [Content]"Hiii" (54..58),
), ),
], ],
end_block: Block { end_block: Block {
prev_whitespace_content: Some( prev_whitespace_content: Some(
"\n " (58..71), [Whitespace]"\n " (58..71),
), ),
expression: EndBlock, expression: EndBlock,
post_whitespace_content: Some( post_whitespace_content: Some(
"\n " (80..89), [Whitespace]"\n " (80..89),
), ),
}, },
}, },
@ -51,7 +51,7 @@ TemplateAst {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: EndBlock, expression: EndBlock,
post_whitespace_content: Some( post_whitespace_content: Some(
"\n\n " (98..108), [Whitespace]"\n\n " (98..108),
), ),
}, },
}, },
@ -60,10 +60,10 @@ TemplateAst {
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"value" (112..117), [Ident]"value" (112..117),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n " (120..129), [Whitespace]"\n " (120..129),
), ),
}, },
], ],

74
src/ast/snapshots/nomo__ast__tests__simple_if_tokens.snap
View file

@ -4,42 +4,42 @@ expression: parsed
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"{{" (0..2), [LeftDelim]"{{" (0..2),
" " (2..3), [Whitespace]" " (2..3),
"if" (3..5), [ConditionalIf]"if" (3..5),
" " (5..6), [Whitespace]" " (5..6),
"foo" (6..9), [Ident]"foo" (6..9),
" " (9..10), [Whitespace]" " (9..10),
"}}" (10..12), [RightDelim]"}}" (10..12),
"\n " (12..25), [Whitespace]"\n " (12..25),
"{{" (25..27), [LeftDelim]"{{" (25..27),
" " (27..28), [Whitespace]" " (27..28),
"if" (28..30), [ConditionalIf]"if" (28..30),
" " (30..31), [Whitespace]" " (30..31),
"bar" (31..34), [Ident]"bar" (31..34),
" " (34..35), [Whitespace]" " (34..35),
"}}" (35..37), [RightDelim]"}}" (35..37),
"\n " (37..54), [Whitespace]"\n " (37..54),
"Hiii" (54..58), [Content]"Hiii" (54..58),
"\n " (58..71), [Whitespace]"\n " (58..71),
"{{" (71..73), [LeftDelim]"{{" (71..73),
" " (73..74), [Whitespace]" " (73..74),
"end" (74..77), [End]"end" (74..77),
" " (77..78), [Whitespace]" " (77..78),
"}}" (78..80), [RightDelim]"}}" (78..80),
"\n " (80..89), [Whitespace]"\n " (80..89),
"{{" (89..91), [LeftDelim]"{{" (89..91),
" " (91..92), [Whitespace]" " (91..92),
"end" (92..95), [End]"end" (92..95),
" " (95..96), [Whitespace]" " (95..96),
"}}" (96..98), [RightDelim]"}}" (96..98),
"\n\n " (98..108), [Whitespace]"\n\n " (98..108),
"{{" (108..110), [LeftDelim]"{{" (108..110),
"=" (110..111), [WantsOutput]"=" (110..111),
" " (111..112), [Whitespace]" " (111..112),
"value" (112..117), [Ident]"value" (112..117),
" " (117..118), [Whitespace]" " (117..118),
"}}" (118..120), [RightDelim]"}}" (118..120),
"\n " (120..129), [Whitespace]"\n " (120..129),
], ],
} }

64
src/parser/mod.rs
View file

@ -254,7 +254,7 @@ pub struct TemplateToken {
impl std::fmt::Debug for TemplateToken { impl std::fmt::Debug for TemplateToken {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:?}", self.source()) write!(f, "[{:?}]{:?}", self.kind(), self.source())
} }
} }
@ -495,7 +495,7 @@ mod tests {
Ok( Ok(
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"Hello There" (0..11), [Content]"Hello There" (0..11),
], ],
}, },
) )
@ -511,13 +511,13 @@ mod tests {
Ok( Ok(
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"Hello" (0..5), [Content]"Hello" (0..5),
" " (5..6), [Whitespace]" " (5..6),
"{{" (6..8), [LeftDelim]"{{" (6..8),
" " (8..9), [Whitespace]" " (8..9),
"there" (9..14), [Ident]"there" (9..14),
" " (14..15), [Whitespace]" " (14..15),
"}}" (15..17), [RightDelim]"}}" (15..17),
], ],
}, },
) )
@ -567,29 +567,29 @@ mod tests {
Ok( Ok(
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"{{" (0..2), [LeftDelim]"{{" (0..2),
" " (2..3), [Whitespace]" " (2..3),
"if" (3..5), [ConditionalIf]"if" (3..5),
" " (5..6), [Whitespace]" " (5..6),
"true" (6..10), [Literal(Bool(true))]"true" (6..10),
" " (10..11), [Whitespace]" " (10..11),
"}}" (11..13), [RightDelim]"}}" (11..13),
" " (13..14), [Whitespace]" " (13..14),
"Hello!" (14..20), [Content]"Hello!" (14..20),
" " (20..21), [Whitespace]" " (20..21),
"{{" (21..23), [LeftDelim]"{{" (21..23),
" " (23..24), [Whitespace]" " (23..24),
"else" (24..28), [ConditionalElse]"else" (24..28),
" " (28..29), [Whitespace]" " (28..29),
"}}" (29..31), [RightDelim]"}}" (29..31),
" " (31..32), [Whitespace]" " (31..32),
"Bye" (32..35), [Content]"Bye" (32..35),
" " (35..36), [Whitespace]" " (35..36),
"{{" (36..38), [LeftDelim]"{{" (36..38),
" " (38..39), [Whitespace]" " (38..39),
"end" (39..42), [End]"end" (39..42),
" " (42..43), [Whitespace]" " (42..43),
"}}" (43..45), [RightDelim]"}}" (43..45),
], ],
}, },
) )

44
tests/cases/1-parsed@condition.snap
View file

@ -5,27 +5,27 @@ input_file: tests/cases/condition.nomo
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"{{" (0..2), [LeftDelim]"{{" (0..2),
" " (2..3), [Whitespace]" " (2..3),
"if" (3..5), [ConditionalIf]"if" (3..5),
" " (5..6), [Whitespace]" " (5..6),
"test" (6..10), [Ident]"test" (6..10),
" " (10..11), [Whitespace]" " (10..11),
"}}" (11..13), [RightDelim]"}}" (11..13),
"\n " (13..18), [Whitespace]"\n " (13..18),
"Hello World!" (18..30), [Content]"Hello World!" (18..30),
"\n" (30..31), [Whitespace]"\n" (30..31),
"{{" (31..33), [LeftDelim]"{{" (31..33),
" " (33..34), [Whitespace]" " (33..34),
"end" (34..37), [End]"end" (34..37),
" " (37..38), [Whitespace]" " (37..38),
"}}" (38..40), [RightDelim]"}}" (38..40),
"\n\n" (40..42), [Whitespace]"\n\n" (40..42),
"{{" (42..44), [LeftDelim]"{{" (42..44),
"=" (44..45), [WantsOutput]"=" (44..45),
" " (45..46), [Whitespace]" " (45..46),
"stuff" (46..51), [Ident]"stuff" (46..51),
" " (51..52), [Whitespace]" " (51..52),
"}}" (52..54), [RightDelim]"}}" (52..54),
], ],
} }

82
tests/cases/1-parsed@identifiers.snap
View file

@ -5,46 +5,46 @@ input_file: tests/cases/identifiers.nomo
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"{{" (0..2), [LeftDelim]"{{" (0..2),
"=" (2..3), [WantsOutput]"=" (2..3),
" " (3..4), [Whitespace]" " (3..4),
"_name" (4..9), [Ident]"_name" (4..9),
" " (9..10), [Whitespace]" " (9..10),
"}}" (10..12), [RightDelim]"}}" (10..12),
"\n" (12..13), [Whitespace]"\n" (12..13),
"{{" (13..15), [LeftDelim]"{{" (13..15),
"=" (15..16), [WantsOutput]"=" (15..16),
" " (16..17), [Whitespace]" " (16..17),
"a_name" (17..23), [Ident]"a_name" (17..23),
" " (23..24), [Whitespace]" " (23..24),
"}}" (24..26), [RightDelim]"}}" (24..26),
"\n" (26..27), [Whitespace]"\n" (26..27),
"{{" (27..29), [LeftDelim]"{{" (27..29),
"=" (29..30), [WantsOutput]"=" (29..30),
" " (30..31), [Whitespace]" " (30..31),
"1name" (31..36), [Ident]"1name" (31..36),
" " (36..37), [Whitespace]" " (36..37),
"}}" (37..39), [RightDelim]"}}" (37..39),
"\n" (39..40), [Whitespace]"\n" (39..40),
"{{" (40..42), [LeftDelim]"{{" (40..42),
"=" (42..43), [WantsOutput]"=" (42..43),
" " (43..44), [Whitespace]" " (43..44),
"_name1" (44..50), [Ident]"_name1" (44..50),
" " (50..51), [Whitespace]" " (50..51),
"}}" (51..53), [RightDelim]"}}" (51..53),
"\n" (53..54), [Whitespace]"\n" (53..54),
"{{" (54..56), [LeftDelim]"{{" (54..56),
"=" (56..57), [WantsOutput]"=" (56..57),
" " (57..58), [Whitespace]" " (57..58),
"_namE" (58..63), [Ident]"_namE" (58..63),
" " (63..64), [Whitespace]" " (63..64),
"}}" (64..66), [RightDelim]"}}" (64..66),
"\n" (66..67), [Whitespace]"\n" (66..67),
"{{" (67..69), [LeftDelim]"{{" (67..69),
"=" (69..70), [WantsOutput]"=" (69..70),
" " (70..71), [Whitespace]" " (70..71),
"name1" (71..76), [Ident]"name1" (71..76),
" " (76..77), [Whitespace]" " (76..77),
"}}" (77..79), [RightDelim]"}}" (77..79),
], ],
} }

16
tests/cases/1-parsed@interpolation.snap
View file

@ -5,13 +5,13 @@ input_file: tests/cases/interpolation.nomo
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"Hello! I'm" (0..10), [Content]"Hello! I'm" (0..10),
" " (10..11), [Whitespace]" " (10..11),
"{{" (11..13), [LeftDelim]"{{" (11..13),
"=" (13..14), [WantsOutput]"=" (13..14),
" " (14..15), [Whitespace]" " (14..15),
"name" (15..19), [Ident]"name" (15..19),
" " (19..20), [Whitespace]" " (19..20),
"}}" (20..22), [RightDelim]"}}" (20..22),
], ],
} }

30
tests/cases/1-parsed@multiple.snap
View file

@ -5,20 +5,20 @@ input_file: tests/cases/multiple.nomo
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"Hi there! My name is" (0..20), [Content]"Hi there! My name is" (0..20),
" " (20..21), [Whitespace]" " (20..21),
"{{" (21..23), [LeftDelim]"{{" (21..23),
"=" (23..24), [WantsOutput]"=" (23..24),
" " (24..25), [Whitespace]" " (24..25),
"name" (25..29), [Ident]"name" (25..29),
" " (29..30), [Whitespace]" " (29..30),
"}}" (30..32), [RightDelim]"}}" (30..32),
" " (32..33), [Whitespace]" " (32..33),
"{{" (33..35), [LeftDelim]"{{" (33..35),
"=" (35..36), [WantsOutput]"=" (35..36),
" " (36..37), [Whitespace]" " (36..37),
"lastname" (37..45), [Ident]"lastname" (37..45),
" " (45..46), [Whitespace]" " (45..46),
"}}" (46..48), [RightDelim]"}}" (46..48),
], ],
} }

2
tests/cases/1-parsed@simple.snap
View file

@ -5,6 +5,6 @@ input_file: tests/cases/simple.nomo
--- ---
ParsedTemplate { ParsedTemplate {
tokens: [ tokens: [
"Hello World!" (0..12), [Content]"Hello World!" (0..12),
], ],
} }

12
tests/cases/2-ast@condition.snap
View file

@ -11,24 +11,24 @@ TemplateAst {
if_block: Block { if_block: Block {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"test" (6..10), [Ident]"test" (6..10),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n " (13..18), [Whitespace]"\n " (13..18),
), ),
}, },
content: [ content: [
StaticContent( StaticContent(
"Hello World!" (18..30), [Content]"Hello World!" (18..30),
), ),
], ],
end_block: Block { end_block: Block {
prev_whitespace_content: Some( prev_whitespace_content: Some(
"\n" (30..31), [Whitespace]"\n" (30..31),
), ),
expression: EndBlock, expression: EndBlock,
post_whitespace_content: Some( post_whitespace_content: Some(
"\n\n" (40..42), [Whitespace]"\n\n" (40..42),
), ),
}, },
}, },
@ -37,7 +37,7 @@ TemplateAst {
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"stuff" (46..51), [Ident]"stuff" (46..51),
), ),
post_whitespace_content: None, post_whitespace_content: None,
}, },

22
tests/cases/2-ast@identifiers.snap
View file

@ -8,52 +8,52 @@ TemplateAst {
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"_name" (4..9), [Ident]"_name" (4..9),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n" (12..13), [Whitespace]"\n" (12..13),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"a_name" (17..23), [Ident]"a_name" (17..23),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n" (26..27), [Whitespace]"\n" (26..27),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"1name" (31..36), [Ident]"1name" (31..36),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n" (39..40), [Whitespace]"\n" (39..40),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"_name1" (44..50), [Ident]"_name1" (44..50),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n" (53..54), [Whitespace]"\n" (53..54),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"_namE" (58..63), [Ident]"_namE" (58..63),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
"\n" (66..67), [Whitespace]"\n" (66..67),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"name1" (71..76), [Ident]"name1" (71..76),
), ),
post_whitespace_content: None, post_whitespace_content: None,
}, },

6
tests/cases/2-ast@interpolation.snap
View file

@ -6,14 +6,14 @@ input_file: tests/cases/interpolation.nomo
TemplateAst { TemplateAst {
root: [ root: [
StaticContent( StaticContent(
"Hello! I'm" (0..10), [Content]"Hello! I'm" (0..10),
), ),
Interpolation { Interpolation {
prev_whitespace_content: Some( prev_whitespace_content: Some(
" " (10..11), [Whitespace]" " (10..11),
), ),
expression: VariableAccess( expression: VariableAccess(
"name" (15..19), [Ident]"name" (15..19),
), ),
post_whitespace_content: None, post_whitespace_content: None,
}, },

10
tests/cases/2-ast@multiple.snap
View file

@ -6,23 +6,23 @@ input_file: tests/cases/multiple.nomo
TemplateAst { TemplateAst {
root: [ root: [
StaticContent( StaticContent(
"Hi there! My name is" (0..20), [Content]"Hi there! My name is" (0..20),
), ),
Interpolation { Interpolation {
prev_whitespace_content: Some( prev_whitespace_content: Some(
" " (20..21), [Whitespace]" " (20..21),
), ),
expression: VariableAccess( expression: VariableAccess(
"name" (25..29), [Ident]"name" (25..29),
), ),
post_whitespace_content: Some( post_whitespace_content: Some(
" " (32..33), [Whitespace]" " (32..33),
), ),
}, },
Interpolation { Interpolation {
prev_whitespace_content: None, prev_whitespace_content: None,
expression: VariableAccess( expression: VariableAccess(
"lastname" (37..45), [Ident]"lastname" (37..45),
), ),
post_whitespace_content: None, post_whitespace_content: None,
}, },

2
tests/cases/2-ast@simple.snap
View file

@ -6,7 +6,7 @@ input_file: tests/cases/simple.nomo
TemplateAst { TemplateAst {
root: [ root: [
StaticContent( StaticContent(
"Hello World!" (0..12), [Content]"Hello World!" (0..12),
), ),
], ],
} }