diff options
| author | Edvard Thörnros <edvard.thornros@gmail.com> | 2021-01-11 15:40:32 +0100 |
|---|---|---|
| committer | Edvard Thörnros <edvard.thornros@gmail.com> | 2021-01-11 15:40:32 +0100 |
| commit | 8435fd15cd1330d91cef2ed5ed862215c0f9942b (patch) | |
| tree | 9f3434c95fb7810066fdf5e1ac63726de959aea8 | |
| parent | 0400311b2387b16b0fbd53a086634937cfc33ebc (diff) | |
| download | sylt-8435fd15cd1330d91cef2ed5ed862215c0f9942b.tar.gz | |
Correct string tokens
| -rw-r--r-- | src/tokenizer.rs | 2 | ||||
| -rw-r--r-- | tests/simple.tdy | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 8778430..1da9835 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -7,7 +7,7 @@ pub enum Token { #[regex(r"[A-Za-z_][A-Za-z0-9_]*", |lex| lex.slice().to_string())] Identifier(String), - #[regex(r#""[^"]*""#, |lex| lex.slice().to_string())] + #[regex(r#""[^"]*""#, |lex| { let mut s = lex.slice().to_string(); s.remove(0); s.pop(); s })] String(String), #[regex(r"[\d]+\.[\d]*|[\d]*\.[\d]+", |lex| lex.slice().parse(), priority=2)] diff --git a/tests/simple.tdy b/tests/simple.tdy index 59355d2..3fe05a4 100644 --- a/tests/simple.tdy +++ b/tests/simple.tdy @@ -15,10 +15,10 @@ a int := 2 if a == 0 { - print 0 + print "123" } else if a == 1 { - print 1 + print "BCD" } else { - print 2 + print "ABC" } // 1, 2, 3, 4 |