From e0cde67ed427a46be3adfd0938a4020d494d692f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Mon, 8 Mar 2021 19:02:29 +0100 Subject: add questionmark token --- src/tokenizer.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/tokenizer.rs') diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 3b61e5f..6e142e3 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -117,6 +117,8 @@ pub enum Token { Or, #[token("!")] Bang, + #[token("?")] + Questionmark, #[token(",")] Comma, -- cgit v1.2.1 From 4e6ef21576d9ec6a8861246464b1905819b68efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Mon, 8 Mar 2021 21:57:52 +0100 Subject: fix some nice tests for the nullable_types --- src/tokenizer.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/tokenizer.rs') diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 6e142e3..664532a 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -15,6 +15,9 @@ pub enum Token { #[regex(r"[\d]+", |lex| lex.slice().parse())] Int(i64), + #[regex(r"nil")] + Nil, + #[regex(r"true|false", |lex| lex.slice().parse(), priority=2)] Bool(bool), -- cgit v1.2.1 From 8a5202b02d909265fc16ddaf4f74112f32dc0b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Mon, 8 Mar 2021 23:05:00 +0100 Subject: syntax for union types --- src/tokenizer.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/tokenizer.rs') diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 664532a..4d1280d 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -122,6 +122,8 @@ pub enum Token { Bang, #[token("?")] Questionmark, + #[token("|")] + Pipe, #[token(",")] Comma, -- cgit v1.2.1 From 8d4493d0ac314318498155556467d46b6036d863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Tue, 9 Mar 2021 17:48:17 +0100 Subject: Questionmark -> QuestionMark --- src/tokenizer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tokenizer.rs') diff --git a/src/tokenizer.rs b/src/tokenizer.rs index 4d1280d..8b06324 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -121,7 +121,7 @@ pub enum Token { #[token("!")] Bang, #[token("?")] - Questionmark, + QuestionMark, #[token("|")] Pipe, -- cgit v1.2.1