From 370aac43951873468393ce08bd98948b2096921a Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Tue, 19 Dec 2023 17:27:13 +0100
Subject: [PATCH] feat(trixy-lang_parser): Add support for Type

This includes rust like generic types like:
```
Option<T>
Result<T, E>
```
---
 trixy/trixy-lang_parser/docs/grammar.ebnf     |   3 +-
 trixy/trixy-lang_parser/docs/grammar.pdf      | Bin 45979 -> 49162 bytes
 trixy/trixy-lang_parser/example/full.tri      |   2 +-
 .../trixy-lang_parser/src/command_spec/mod.rs |   2 +-
 .../src/command_spec/unchecked.rs             |  10 +++++--
 trixy/trixy-lang_parser/src/error.rs          |   2 +-
 trixy/trixy-lang_parser/src/lexing/mod.rs     |   8 ++++++
 .../trixy-lang_parser/src/lexing/tokenizer.rs |   8 +++++-
 .../src/parsing/unchecked.rs                  |  26 ++++++++++++++++--
 9 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/trixy/trixy-lang_parser/docs/grammar.ebnf b/trixy/trixy-lang_parser/docs/grammar.ebnf
index 05ffca8..abe1be8 100644
--- a/trixy/trixy-lang_parser/docs/grammar.ebnf
+++ b/trixy/trixy-lang_parser/docs/grammar.ebnf
@@ -11,8 +11,9 @@ Function = "fn" Identifier "(" [NamedType {"," NamedType }] ")" [ "->" Type ] ";
 Namespace = "nasp" Identifier "{" {Function | Namespace | Enumeration | Structure} "}" ;
 Structure = "struct" Identifier "{"  [NamedType {"," NamedType } [","]] "}" ";";
 Enumeration = "enum" Identifier "{"  [Identifier {"," Identifier} [","]] "}" ";";
-Identifier = CHARACTER { NUMBER | CHARACTER } ;
+Identifier = (CHARACTER | "_") { NUMBER | CHARACTER | "_" } ;
 NamedType = Identifier ":" Type;
+Type = Identifier ["<" Type {"," Type} ">"];
 
 # (*
 #  vim: ft=ebnf
diff --git a/trixy/trixy-lang_parser/docs/grammar.pdf b/trixy/trixy-lang_parser/docs/grammar.pdf
index bf84bb08e785d71833d7fc4ccb2b30ba7b287bfd..97ec4e93d5743ec1bc11a37659b8ab94bc120a87 100644
GIT binary patch
delta 8022
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
Z=58K7Zq_!KykG%t9!v%X88unV{{nG?R?`3g

delta 5090
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

diff --git a/trixy/trixy-lang_parser/example/full.tri b/trixy/trixy-lang_parser/example/full.tri
index d0ca0b1..9dbebfb 100644
--- a/trixy/trixy-lang_parser/example/full.tri
+++ b/trixy/trixy-lang_parser/example/full.tri
@@ -92,7 +92,7 @@ nasp trinitrix {
             /// Remove a keymapping
             ///
             /// Does nothing, if the keymapping doesn't exists
-            fn remove((/* mode: */ String, /* key: */ String));
+            fn remove(mode: String, key: String);
 
             /// List declared keymappings
             fn get(mode: String);
diff --git a/trixy/trixy-lang_parser/src/command_spec/mod.rs b/trixy/trixy-lang_parser/src/command_spec/mod.rs
index 1bf868c..4b35be6 100644
--- a/trixy/trixy-lang_parser/src/command_spec/mod.rs
+++ b/trixy/trixy-lang_parser/src/command_spec/mod.rs
@@ -1,2 +1,2 @@
-pub mod checked;
+// pub mod checked;
 pub mod unchecked;
diff --git a/trixy/trixy-lang_parser/src/command_spec/unchecked.rs b/trixy/trixy-lang_parser/src/command_spec/unchecked.rs
index c7d2dc5..8c73d50 100644
--- a/trixy/trixy-lang_parser/src/command_spec/unchecked.rs
+++ b/trixy/trixy-lang_parser/src/command_spec/unchecked.rs
@@ -55,7 +55,7 @@ pub enum Genus {
 pub struct Function {
     pub identifier: Token, // Will later become an Identifier
     pub inputs: Vec<NamedType>,
-    pub output: Option<Token>, // Will later become an Type
+    pub output: Option<Type>,
 }
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -73,5 +73,11 @@ pub struct Enumeration {
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct NamedType {
     pub name: Token,   // Will later become an Identifier
-    pub r#type: Token, // Will later become an Type
+    pub r#type: Type,
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Type {
+    pub identifier: Token, // Will later become an Identifier
+    pub generic_args: Vec<Type>,
 }
diff --git a/trixy/trixy-lang_parser/src/error.rs b/trixy/trixy-lang_parser/src/error.rs
index fcf441d..3211a78 100644
--- a/trixy/trixy-lang_parser/src/error.rs
+++ b/trixy/trixy-lang_parser/src/error.rs
@@ -89,7 +89,7 @@ impl ErrorContext {
     pub fn from_index(start: usize, orginal_file: &str) -> Self {
         let span = TokenSpan {
             start,
-            end: start,
+            end: start + 1,
         };
         Self::from_span(span, orginal_file)
     }
diff --git a/trixy/trixy-lang_parser/src/lexing/mod.rs b/trixy/trixy-lang_parser/src/lexing/mod.rs
index a8ecd6c..d77962a 100644
--- a/trixy/trixy-lang_parser/src/lexing/mod.rs
+++ b/trixy/trixy-lang_parser/src/lexing/mod.rs
@@ -121,6 +121,8 @@ pub enum TokenKind {
     BraceClose,
     ParenOpen,
     ParenClose,
+    SquareOpen,
+    SquareClose,
     /// This is not a real TokenKind, but only used for error handling
     Dummy,
 }
@@ -156,6 +158,8 @@ impl Display for TokenKind {
             TokenKind::ParenOpen => f.write_str("PARENOPEN"),
             TokenKind::ParenClose => f.write_str("PARENCLOSE"),
             TokenKind::Dummy => f.write_str("DUMMY"),
+            TokenKind::SquareOpen => f.write_str("SQUAREOPEN"),
+            TokenKind::SquareClose => f.write_str("SQUARECLOSE"),
         }
     }
 }
@@ -211,6 +215,10 @@ macro_rules! token {
     [,]    => { $crate::lexing::TokenKind::Comma };
     [Arrow]    => { $crate::lexing::TokenKind::Arrow };
     [->] => { $crate::lexing::TokenKind::Arrow };
+    [SquareOpen]    => { $crate::lexing::TokenKind::SquareOpen };
+    [<] => { $crate::lexing::TokenKind::SquareOpen };
+    [SquareClose]    => { $crate::lexing::TokenKind::SquareClose };
+    [>] => { $crate::lexing::TokenKind::SquareClose};
     [BraceOpen]    => { $crate::lexing::TokenKind::BraceOpen };
     // [{]    => { $crate::lexing::TokenKind::BraceOpen };
     [BraceClose]    => { $crate::lexing::TokenKind::BraceClose };
diff --git a/trixy/trixy-lang_parser/src/lexing/tokenizer.rs b/trixy/trixy-lang_parser/src/lexing/tokenizer.rs
index 3e78ed7..a4eb885 100644
--- a/trixy/trixy-lang_parser/src/lexing/tokenizer.rs
+++ b/trixy/trixy-lang_parser/src/lexing/tokenizer.rs
@@ -60,8 +60,14 @@ impl<'a> Tokenizer<'a> {
             ':' => (TokenKind::Colon, 1),
             ';' => (TokenKind::Semicolon, 1),
             ',' => (TokenKind::Comma, 1),
+            '<' => (TokenKind::SquareOpen, 1),
+            '>' => (TokenKind::SquareClose, 1),
             '-' => tokenize_arrow(self.remaining_text)?,
-            c @ '_' | c if c.is_alphanumeric() => tokenize_ident(self.remaining_text)?,
+
+            // can't use a OR (`|`) here, as the guard takes precedence
+            c if c.is_alphabetic() => tokenize_ident(self.remaining_text)?,
+            '_' => tokenize_ident(self.remaining_text)?,
+
             other => return Err(LexingError::UnknownCharacter(other)),
         };
 
diff --git a/trixy/trixy-lang_parser/src/parsing/unchecked.rs b/trixy/trixy-lang_parser/src/parsing/unchecked.rs
index 07f9423..a477696 100644
--- a/trixy/trixy-lang_parser/src/parsing/unchecked.rs
+++ b/trixy/trixy-lang_parser/src/parsing/unchecked.rs
@@ -1,6 +1,6 @@
 use crate::{
     command_spec::unchecked::{
-        CommandSpec, Declaration, Enumeration, Function, NamedType, Structure,
+        CommandSpec, Declaration, Enumeration, Function, NamedType, Structure, Type,
     },
     error::ErrorContext,
     lexing::{Token, TokenKind, TokenStream},
@@ -73,6 +73,26 @@ impl Parser {
         }
     }
 
+    fn parse_type(&mut self) -> Result<Type, ParsingError> {
+        let identifier = self.expect(token![Ident])?;
+
+        let mut generic_args = vec![];
+        if self.expect_peek(token![<]) {
+            self.expect(token![<])?;
+            if self.expect_peek(token![Ident]) {
+                generic_args.push(self.parse_type()?);
+            }
+            while self.expect_peek(token![Comma]) {
+                generic_args.push(self.parse_type()?);
+            }
+            self.expect(token![>])?;
+        }
+        Ok(Type {
+            identifier,
+            generic_args,
+        })
+    }
+
     fn parse_namespace(&mut self) -> Result<Vec<Declaration>, ParsingError> {
         self.expect(token![nasp])?;
         let namespace_name = self.expect(token![Ident])?;
@@ -140,7 +160,7 @@ impl Parser {
     fn parse_named_type(&mut self) -> Result<NamedType, ParsingError> {
         let name = self.expect(token![Ident])?;
         self.expect(token![Colon])?;
-        let r#type = self.expect(token![Ident])?;
+        let r#type = self.parse_type()?;
         Ok(NamedType { name, r#type })
     }
 
@@ -162,7 +182,7 @@ impl Parser {
         let mut output_type = None;
         if self.expect_peek(token![->]) {
             self.expect(token![->])?;
-            output_type = Some(self.expect(token![Ident])?);
+            output_type = Some(self.parse_type()?);
         }
         self.expect(token![;])?;
         Ok(Function {