Generic lifetimes

parser/src/ast.rs

@@ -98,7 +98,13 @@ pub enum TopLevelKind {
 }
 
 #[derive(Debug, Clone, Serialize, Default)]
-pub struct Generics(pub Vec<(Identifier, Vec<Path>)>);
+pub struct Generics(pub Vec<Generic>);
+
+#[derive(Debug, Clone, Serialize)]
+pub enum Generic {
+    Lifetime(Identifier),
+    Type(Identifier, Vec<TypeExpr>),
+}
 
 #[derive(Debug, Clone, Serialize)]
 pub enum Pattern {

parser/src/grammar.pest

@@ -55,7 +55,7 @@ var     = { "var" }
 // ======================================================
 // GENERICS
 // ======================================================
-generic  = { identifier ~ (":" ~ static_path ~ ("+" ~ static_path)*)? }
+generic  = { lifetime | (identifier ~ (":" ~ type_expr_param ~ ("+" ~ type_expr_param)*)?) }
 generics = { "<" ~ (generic ~ ("," ~ generic)*)? ~ ">" }
 
 // ======================================================
@@ -67,7 +67,7 @@ tuple_type = {
 }
 
 path_type = {
-    static_path ~ ("<" ~ (type_expr ~ ("," ~ type_expr)*)? ~ ">")?
+    static_path ~ ("<" ~ (type_expr_param ~ ("," ~ type_expr_param)*)? ~ ">")?
 }
 
 ref_type = {
@@ -78,6 +78,15 @@ type_expr = {
     (path_type | tuple_type) ~ ref_type*
 }
 
+lifetime = {
+    "'" ~ identifier
+}
+
+type_expr_param = {
+    type_expr
+  | lifetime
+}
+
 // ======================================================
 // LITERALS
 // ======================================================

parser/src/lib.rs

@@ -238,10 +238,14 @@ impl From<pest::iterators::Pair<'_, Rule>> for Generics {
                 inner
                     .map(|pair| {
                         let mut inner = pair.into_inner();
-                        (
+                        if let Some(pair) = consume_rule(&mut inner, Rule::lifetime) {
-                            Identifier::from(inner.next().unwrap()),
+                            Generic::Lifetime(Identifier::from(pair.into_inner().next().unwrap()))
-                            inner.map(Path::from).collect(),
+                        } else {
-                        )
+                            Generic::Type(
+                                Identifier::from(inner.next().unwrap()),
+                                inner.map(TypeExpr::from).collect(),
+                            )
+                        }
                     })
                     .collect(),
             ),

src/codegen.rs

@@ -721,20 +721,24 @@ impl GetRust for Generics {
                 "<{}>",
                 self.0
                     .iter()
-                    .map(|generic| generic.0.get_rust()
+                    .map(|generic| match generic {
-                        + &(if generic.1.len() == 0 {
+                        parser::ast::Generic::Lifetime(name) => format!("'{}", name.get_rust()),
-                            String::new()
+                        parser::ast::Generic::Type(name, requirements) => {
-                        } else {
+                            name.get_rust()
-                            format!(
+                                + &(if requirements.len() == 0 {
-                                ": {}",
+                                    String::new()
-                                generic
+                                } else {
-                                    .1
+                                    format!(
-                                    .iter()
+                                        ": {}",
-                                    .map(Path::get_rust)
+                                        requirements
-                                    .collect::<Vec<_>>()
+                                            .iter()
-                                    .join("+")
+                                            .map(TypeExpr::get_rust)
-                            )
+                                            .collect::<Vec<_>>()
-                        }))
+                                            .join("+")
+                                    )
+                                })
+                        }
+                    })
                     .collect::<Vec<_>>()
                     .join(", ")
             )

test/src/main.mist

@@ -2,6 +2,8 @@ mod my_class;
 use <my_class::MyClass>;
 use <my_class::MyEnum>;
 
+struct Test<'a> {}
+
 void main() {
     var my_class = new MyClass("World");
     my_class.greet();