Skip to content

pipec-ast : add generics #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EvoPot merged 1 commit into from
Jan 29, 2026
Merged

pipec-ast : add generics #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 156 additions & 3 deletions compiler/pipec-ast/src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,29 @@ impl<'this> ASTGenerator<'this> {
self.advance_stream();
self.consume_whitespace();
let name = self.must_ident();
let generics = self.consume_generics();
self.consume_whitespace();
match self.peek_stream() {
Some(Token::EqualSign) => {
self.advance_stream();
let subtype = self.consume_subtype();
self.consume_a_semicolon();
ASTNode::TypeDeclaration { name, subtype }
ASTNode::TypeDeclaration {
name,
subtype,
generics,
}
}
Some(Token::Semicolon) => {
let subtype = SubType::Empty;
self.consume_a_semicolon();
ASTNode::TypeDeclaration { name, subtype }
ASTNode::TypeDeclaration {
name,
subtype,
generics,
}
}
_ => todo!(),
v => todo!("{v:#?}"),
}
}

Expand Down Expand Up @@ -230,11 +239,124 @@ impl<'this> ASTGenerator<'this> {
ASTNode::Public(Box::new(val))
}

#[inline]
pub(crate) fn consume_generics(&mut self) -> Generics {
self.consume_whitespace();
if !self.next_is(Token::LeftSquare) {
return Generics(vec![]);
}
self.must(Token::LeftSquare);
let mut out = Vec::new();
loop {
self.consume_whitespace();
match self.advance_stream() {
Some(Token::Hash) => {
let name = self.must_ident();
self.consume_whitespace();
match self.peek_stream() {
Some(Token::Colon) => {
self.advance_stream();
let traits = self.consume_traits();
out.push(Generic {
name,
generictype: GenericType::Lifetime,
traits,
});
self.consume_whitespace();
if self.next_is(Token::Comma) {
self.advance_stream();
continue;
}
}
Some(Token::Comma) => {
self.advance_stream();
out.push(Generic {
name,
generictype: GenericType::Lifetime,
traits: Traits::default(),
});
continue;
}
Some(Token::RightSquare) => {
self.advance_stream();
break;
}
_ => todo!(),
}
}
Some(Token::Ident(name)) => {
self.consume_whitespace();
match self.peek_stream() {
Some(Token::Colon) => {
self.advance_stream();
let traits = self.consume_traits();
out.push(Generic {
name,
generictype: GenericType::Generic,
traits,
});
self.consume_whitespace();
if self.next_is(Token::Comma) {
self.advance_stream();
continue;
}
}
Some(Token::Comma) => {
self.advance_stream();
out.push(Generic {
name,
generictype: GenericType::Generic,
traits: Traits::default(),
});
continue;
}
Some(Token::RightSquare) => {
self.advance_stream();
break;
}
v => todo!("{v:#?}"),
}
}
Some(Token::RightSquare) => {
break;
}
_ => todo!(),
}
}
Generics(out)
}

#[inline]
pub(crate) fn consume_traits(&mut self) -> Traits {
let mut out = Vec::new();
loop {
self.consume_whitespace();
match self.peek_stream() {
Some(Token::Ident(_)) => {
let name = self.must_ident();
let generics = self.consume_generics();
out.push(Trait { name, generics });
self.consume_whitespace();
if self.next_is(Token::Plus) {
self.advance_stream();
continue;
}
}
Some(Token::Comma) | Some(Token::RightSquare) => {
break;
}
v => todo!("{v:#?}"),
}
}
Traits(out)
}

#[inline]
pub(crate) fn consume_function_keyword(&mut self) -> ASTNode {
self.advance_stream();
self.consume_whitespace();
let name = self.must_ident();
let generics = self.consume_generics();
self.consume_whitespace();
let params = self.consume_function_parameters();
self.consume_whitespace();
Expand All @@ -252,6 +374,7 @@ impl<'this> ASTGenerator<'this> {
params,
block,
out_type,
generics,
}
}

Expand Down Expand Up @@ -1137,6 +1260,7 @@ pub enum ASTNode {
},
FunctionDeclaration {
name: Span,
generics: Generics,
params: FunctionDeclarationParameters,
block: Block,
out_type: Option<Path>,
Expand All @@ -1161,6 +1285,7 @@ pub enum ASTNode {
},
TypeDeclaration {
name: Span,
generics: Generics,
subtype: SubType,
},
Public(Box<Self>),
Expand Down Expand Up @@ -1336,3 +1461,31 @@ pub struct FunctionDeclarationParameter {
pub name: Span,
pub arg_type: Path,
}

#[derive(Debug, Clone)]
pub struct Generics(pub Vec<Generic>);

#[derive(Debug, Clone)]
#[allow(unused)]
pub struct Generic {
name: Span,
generictype: GenericType,
traits: Traits,
}

#[derive(Debug, Clone, Default)]
#[allow(unused)]
pub struct Traits(Vec<Trait>);

#[derive(Debug, Clone)]
#[allow(unused)]
pub struct Trait {
name: Span,
generics: Generics,
}

#[derive(Debug, Clone)]
pub enum GenericType {
Lifetime,
Generic,
}
1 change: 1 addition & 0 deletions compiler/pipec-gst/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ impl<'this> GlobalSymbolTree<'this> {
name,
params,
block: _,
generics: _,
out_type,
} => self.parse_function_declaration(name, params, out_type, scope),
ASTNode::ViewportDeclaration {
Expand Down
15 changes: 15 additions & 0 deletions compiler/pipec-tests/src/ast/generics/functiongenerics.pipec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
function basic[T](input : T) {}

function multiple[T,U](input1 : T , input2 : U) {}

function with_traits[T : Trait](input : T) {}

function multiple_traits[T : Trait1 + Trait2 + Trait3](input : T) => T {}

function multiple_with_multiple_traits[T : Trait1 + Trait2 + Trait3 , U : Trait1 + Trait2 + Trait3](input1 : T , input2 : U) {}

function generic_trait[T: Trait1[T]](input : T) {}

function multiple_generic_trait[T : Trait1[T] + Trait2[T] + Trait3[T]](input : T) => T {}

function multiple_generic_with_generic_trait[T : Trait1[T] + Trait2[T] + Trait3[T] , U : Trait1[T] + Trait2[T] + Trait3[T]](input1 : T, input3 : T) => T {}
9 changes: 9 additions & 0 deletions compiler/pipec-tests/src/ast/generics/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#[test]
fn test_generics() {
{
crate::test_file_generation!("typegenerics.pipec");
}
{
crate::test_file_generation!("functiongenerics.pipec");
}
}
8 changes: 8 additions & 0 deletions compiler/pipec-tests/src/ast/generics/typegenerics.pipec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
type Basic[T] = T;
type Multiple[T,U] = (T | U);
type WithTraits[T : Trait] = T;
type MultipleTraits[T : Trait1 + Trait2 + Trait3] = T;
type MultipleWithMultipleTraits[T : Trait1 + Trait2 + Trait3, U : Trait1 + Trait2 + Trait3] = (T | U);
type GenericTrait[T : Trait1[T]] = T;
type MultipleGenericTrait[T : Trait1[T] + Trait2[T] + Trait3[T]] = T;
type MultipleGenericWithGenericTrait[T : Trait1[T] + Trait2[T] + Trait3[T], U : Trait1[T] + Trait2[T] + Trait3[T]] = (T | U);
1 change: 1 addition & 0 deletions compiler/pipec-tests/src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
mod functiondeclaration;
mod generics;
mod variablemutability;
mod viewportdeclaration;