unyt-org · benStre · Nov 9, 2025 · Oct 31, 2025 · Nov 1, 2025 · Nov 1, 2025
diff --git a/benches/mod.rs b/benches/mod.rs
@@ -1,6 +1,10 @@
 #![feature(custom_test_frameworks)]
 #![feature(thread_local)]
 #![test_runner(criterion::runner)]
+#![allow(clippy::std_instead_of_alloc)]
+#![allow(clippy::alloc_instead_of_core)]
+#![allow(clippy::std_instead_of_core)]
+
 use core::hint::black_box;
 
 use crate::json::{

diff --git a/src/ast/grammar/binary_operation.rs b/src/ast/grammar/binary_operation.rs
@@ -44,7 +44,7 @@ fn binary_op(
             operator: op,
             left: lhs,
             right: rhs,
-            r#type: None,
+            ty: None,
         })
         .with_span(SimpleSpan::from(combined_span))
     }

diff --git a/src/ast/grammar/binding.rs b/src/ast/grammar/binding.rs
@@ -1,7 +1,7 @@
 use crate::ast::error::error::ParseError;
 use crate::ast::error::pattern::Pattern;
 use crate::ast::grammar::assignment_operation::assignment_operation;
-use crate::ast::grammar::r#type::{r#type, type_declaration};
+use crate::ast::grammar::r#type::{ty, type_declaration};
 use crate::ast::grammar::utils::whitespace;
 use crate::ast::lexer::Token;
 use crate::ast::spanned::Spanned;
@@ -91,7 +91,7 @@ pub fn variable_declaration<'a>(
 ) -> impl DatexParserTrait<'a> {
     let type_annotation = just(Token::Colon)
         .padded_by(whitespace())
-        .ignore_then(r#type())
+        .ignore_then(ty())
         .or_not();
 
     let assignment_op = assignment_operation();

diff --git a/src/ast/grammar/function.rs b/src/ast/grammar/function.rs
@@ -1,4 +1,4 @@
-use crate::ast::grammar::r#type::r#type;
+use crate::ast::grammar::r#type::ty;
 use crate::ast::grammar::utils::whitespace;
 use crate::ast::lexer::Token;
 use crate::ast::spanned::Spanned;
@@ -9,7 +9,7 @@ use chumsky::prelude::*;
 fn return_type<'a>() -> impl DatexParserTrait<'a, Option<TypeExpression>> {
     just(Token::Arrow)
         .padded_by(whitespace())
-        .ignore_then(r#type().padded_by(whitespace()))
+        .ignore_then(ty().padded_by(whitespace()))
         .or_not()
 }
 
@@ -26,7 +26,7 @@ fn parameter<'a>() -> impl DatexParserTrait<'a, (String, TypeExpression)> {
         .then(
             just(Token::Colon)
                 .padded_by(whitespace())
-                .ignore_then(r#type().padded_by(whitespace())),
+                .ignore_then(ty().padded_by(whitespace())),
         )
         .map(|(name, ty)| (name, ty))
 }

diff --git a/src/ast/grammar/type.rs b/src/ast/grammar/type.rs
@@ -1,7 +1,9 @@
 use crate::stdlib::{str::FromStr, vec};
 
 use crate::ast::spanned::Spanned;
-use crate::ast::structs::expression::DatexExpressionData;
+use crate::ast::structs::expression::{
+    DatexExpressionData, TypeDeclarationKind,
+};
 use crate::ast::structs::r#type::{
     FixedSizeList, FunctionType, GenericAccess, Intersection, SliceList,
     StructuralList, StructuralMap, TypeExpression, TypeExpressionData,
@@ -95,7 +97,7 @@
 	})
 }
 
-pub fn r#type<'a>() -> impl DatexParserTrait<'a, TypeExpression> {
+pub fn ty<'a>() -> impl DatexParserTrait<'a, TypeExpression> {
     recursive(|ty| {
         let paren_group = ty.clone().delimited_by(
             just(Token::LeftParen).padded_by(whitespace()),
@@ -179,7 +181,7 @@
                     && n > 0
                 {
                     Ok(TypeExpressionData::FixedSizeList(FixedSizeList {
-                        r#type: Box::new(t),
+                        ty: Box::new(t),
                         size: n,
                     })
                     .with_default_span())
@@ -393,7 +395,7 @@
                             Some(size) if size > 0 => {
                                 TypeExpressionData::FixedSizeList(
                                     FixedSizeList {
-                                        r#type: Box::new(t),
+                                        ty: Box::new(t),
                                         size,
                                     },
                                 )
@@ -478,14 +480,15 @@
         .ignore_then(name)
         .then(generic)
         .then_ignore(just(Token::Assign).padded_by(whitespace()))
-        .then(r#type())
+        .then(ty())
         .padded_by(whitespace())
         .map_with(|((name, generic), expr), e| {
             DatexExpressionData::TypeDeclaration(TypeDeclaration {
                 id: None,
                 name: name.to_string(),
                 value: expr,
                 hoisted: false,
+                kind: TypeDeclarationKind::Nominal,
             })
             .with_span(e.span())
         })
@@ -494,17 +497,18 @@
 }
 
 pub fn structural_type_definition<'a>() -> impl DatexParserTrait<'a> {
-    just(Token::Identifier("typedef".to_string()))
+    just(Token::Identifier("typealias".to_string()))
         .padded_by(whitespace())
         .ignore_then(select! { Token::Identifier(name) => name })
         .then_ignore(just(Token::Assign).padded_by(whitespace()))
-        .then(r#type())
+        .then(ty())
         .map_with(|(name, expr), e| {
             DatexExpressionData::TypeDeclaration(TypeDeclaration {
                 id: None,
                 name: name.to_string(),
                 value: expr,
                 hoisted: false,
+                kind: TypeDeclarationKind::Structural,
             })
             .with_span(e.span())
         })
@@ -521,7 +525,7 @@
     just(Token::Identifier("type".to_string()))
         .padded_by(whitespace())
         .then_ignore(just(Token::LeftParen).padded_by(whitespace()))
-        .ignore_then(r#type())
+        .ignore_then(ty())
         .padded_by(whitespace())
         .then_ignore(just(Token::RightParen).padded_by(whitespace()))
         .map_with(|expr, e| DatexExpressionData::Type(expr).with_span(e.span()))
@@ -536,7 +540,7 @@
        InvalidDatexParseResult, ValidDatexParseResult,
    };
    use crate::ast::structs::expression::{
        DatexExpression, DatexExpressionData, Statements,
    };
    use crate::stdlib::{io, str::FromStr};

@@ -906,7 +910,7 @@
         assert_eq!(
             val,
             TypeExpressionData::FixedSizeList(FixedSizeList {
-                r#type: Box::new(
+                ty: Box::new(
                     TypeExpressionData::Literal("integer".to_owned())
                         .with_default_span()
                 ),
@@ -919,7 +923,7 @@
         assert_eq!(
             val,
             TypeExpressionData::FixedSizeList(FixedSizeList {
-                r#type: Box::new(
+                ty: Box::new(
                     TypeExpressionData::Union(Union(vec![
                         TypeExpressionData::Literal("integer".to_owned())
                             .with_default_span(),
@@ -940,7 +944,7 @@
         assert_eq!(
             val,
             TypeExpressionData::FixedSizeList(FixedSizeList {
-                r#type: Box::new(
+                ty: Box::new(
                     TypeExpressionData::Literal("text".to_owned())
                         .with_default_span()
                 ),
@@ -953,7 +957,7 @@
         assert_eq!(
             val,
             TypeExpressionData::FixedSizeList(FixedSizeList {
-                r#type: Box::new(
+                ty: Box::new(
                     TypeExpressionData::Literal("text".to_owned())
                         .with_default_span()
                 ),
@@ -966,7 +970,7 @@
         assert_eq!(
             val,
             TypeExpressionData::FixedSizeList(FixedSizeList {
-                r#type: Box::new(
+                ty: Box::new(
                     TypeExpressionData::Literal("text".to_owned())
                         .with_default_span()
                 ),