diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-26 17:50:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 17:50:53 +0100 |
| commit | 21b70835bfbc6b8a9c1099bb4a618f1cd457aac0 (patch) | |
| tree | 58d3a61762c85e4165af1dbd2dbafa6efdec6e9c /src/tokenizer.rs | |
| parent | 701c38433454d5afd833bb94723ab2e1f4bbe9bd (diff) | |
| parent | cab32da3a8f4b4e25e1d1f287315fe75256ecc89 (diff) | |
| download | sylt-21b70835bfbc6b8a9c1099bb4a618f1cd457aac0.tar.gz | |
Merge branch 'compiler-rewrite' into breaking-into-sections
Diffstat (limited to 'src/tokenizer.rs')
| -rw-r--r-- | src/tokenizer.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tokenizer.rs b/src/tokenizer.rs index b54e194..2c8e5e8 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -127,6 +127,11 @@ pub enum Token { #[token("\n")] Newline, + #[token("<<<<<<<")] + GitConflictBegin, + #[token(">>>>>>>")] + GitConflictEnd, + #[regex(r"//[^\n]*", logos::skip)] Comment, |