From c22d7b8d8b51b41e5fd5b2a164cf407c803c03c9 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 15 Nov 2026 12:35:30 +0100 Subject: [PATCH] It's actually just an Ident. --- src/ast.rs | 10 ++-------- src/parser.rs | 10 ++++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/ast.rs b/src/ast.rs index f2b17b1..14fd8d2 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -42,7 +42,7 @@ impl From for Stmt { #[derive(Debug, PartialEq)] pub struct Let { pub name: Ident, - pub ty: Option, + pub ty: Option, pub value: Expr, pub span: Span, } @@ -71,7 +71,7 @@ pub struct Block { #[derive(Debug, PartialEq)] pub struct FnParam { pub name: Ident, - pub ty: Type, + pub ty: Ident, pub span: Span, } @@ -124,9 +124,3 @@ pub struct Ident { pub name: String, pub span: Span, } - -#[derive(Debug, PartialEq)] -pub struct Type { - pub name: String, - pub span: Span, -} diff --git a/src/parser.rs b/src/parser.rs index f364c91..303b549 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,9 +1,7 @@ use std::iter::Peekable; use crate::{ - ast::{ - Assign, Block, Expr, FnCall, FnDef, FnParam, Ident, Let, LitNumber, LitString, Stmt, Type, - }, + ast::{Assign, Block, Expr, FnCall, FnDef, FnParam, Ident, Let, LitNumber, LitString, Stmt}, lexer::Token, span::{Span, Spanned}, }; @@ -134,7 +132,7 @@ where }; self.next_expected(Token::Colon)?; let param_type_token = self.next_expected(Token::Ident)?; - let param_type = Type { + let param_type = Ident { name: self.slice(*param_type_token.span())?.to_string(), span: *param_type_token.span(), }; @@ -526,7 +524,7 @@ mod tests { name: "p1".to_string(), span: Span::new(7, 9), }, - ty: Type { + ty: Ident { name: "Number".to_string(), span: Span::new(11, 17), }, @@ -537,7 +535,7 @@ mod tests { name: "p2".to_string(), span: Span::new(19, 21), }, - ty: Type { + ty: Ident { name: "String".to_string(), span: Span::new(23, 29), },