Noratrieb/dilaria
1
0
Fork 0
mirror of https://github.com/Noratrieb/dilaria.git synced 2026-01-14 17:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use ref instead of box for ast

Browse source
This commit is contained in:
nora 2021-12-30 16:55:50 +01:00
parent 62e4ffac6c
commit 5e66841577
2 changed files with 31 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ast.rs
View file

@ -3,7 +3,6 @@
use crate::errors::Span;
use crate::value::Symbol;
use bumpalo::boxed::Box;
use bumpalo::collections::Vec;
#[derive(Debug, PartialEq, Eq, Hash)]
@ -63,7 +62,7 @@ pub struct IfStmt<'ast> {
pub span: Span,
pub cond: Expr<'ast>,
pub body: Block<'ast>,
pub else_part: Option<Box<'ast, ElsePart<'ast>>>,
pub else_part: Option<&'ast ElsePart<'ast>>,
}
#[derive(Debug, PartialEq)]
@ -92,9 +91,9 @@ pub struct WhileStmt<'ast> {
pub enum Expr<'ast> {
Ident(Ident),
Literal(Literal<'ast>),
UnaryOp(Box<'ast, UnaryOp<'ast>>),
BinaryOp(Box<'ast, BinaryOp<'ast>>),
Call(Box<'ast, Call<'ast>>),
UnaryOp(&'ast UnaryOp<'ast>),
BinaryOp(&'ast BinaryOp<'ast>),
Call(&'ast Call<'ast>),
}
impl Expr<'_> {

70
src/parse.rs
View file

@ -4,7 +4,6 @@ mod test;
use crate::ast::*;
use crate::errors::{CompilerError, Span};
use crate::lex::{Token, TokenKind};
use bumpalo::boxed::Box;
use bumpalo::collections::Vec;
use bumpalo::Bump;
use std::iter::Peekable;
@ -43,15 +42,12 @@ macro_rules! parse_bin_op {
($self: ident, $lhs: ident, $kind: expr, $function: ident) => {{
let _ = $self.next();
let rhs = $self.$function()?;
Ok(Expr::BinaryOp(Box::new_in(
BinaryOp {
span: $lhs.span().extend(rhs.span()),
lhs: $lhs,
rhs,
kind: $kind,
},
$self.bump,
)))
Ok(Expr::BinaryOp($self.bump.alloc(BinaryOp {
span: $lhs.span().extend(rhs.span()),
lhs: $lhs,
rhs,
kind: $kind,
})))
}};
}
@ -221,7 +217,7 @@ where
.option_extend(else_part.as_ref().map(|part| part.span())),
cond,
body,
else_part: else_part.map(|part| Box::new_in(part, self.bump)),
else_part: else_part.map(|part| &*self.bump.alloc(part)),
})
}
@ -463,26 +459,20 @@ where
Some(TokenKind::Not) => {
let unary_op_span = self.next().unwrap().span;
let expr = self.call()?;
Ok(Expr::UnaryOp(Box::new_in(
UnaryOp {
span: unary_op_span.extend(expr.span()),
expr,
kind: UnaryOpKind::Not,
},
self.bump,
)))
Ok(Expr::UnaryOp(self.bump.alloc(UnaryOp {
span: unary_op_span.extend(expr.span()),
expr,
kind: UnaryOpKind::Not,
})))
}
Some(TokenKind::Minus) => {
let unary_op_span = self.next().unwrap().span;
let expr = self.call()?;
Ok(Expr::UnaryOp(Box::new_in(
UnaryOp {
span: unary_op_span.extend(expr.span()),
expr,
kind: UnaryOpKind::Neg,
},
self.bump,
)))
Ok(Expr::UnaryOp(self.bump.alloc(UnaryOp {
span: unary_op_span.extend(expr.span()),
expr,
kind: UnaryOpKind::Neg,
})))
}
_ => self.call(),
};
@ -502,27 +492,21 @@ where
let args = self.parse_list(TokenKind::ParenC, Self::expression)?;
let close_span = self.expect(TokenKind::ParenC)?.span;
Expr::Call(Box::new_in(
Call {
callee: expr,
span: open_span.extend(close_span),
kind: CallKind::Fn(args),
},
self.bump,
))
Expr::Call(self.bump.alloc(Call {
callee: expr,
span: open_span.extend(close_span),
kind: CallKind::Fn(args),
}))
}
Some(TokenKind::Dot) => {
let dot_span = self.expect(TokenKind::Dot)?.span;
let field = self.ident()?;
Expr::Call(Box::new_in(
Call {
callee: expr,
span: dot_span.extend(field.span),
kind: CallKind::Field(field),
},
self.bump,
))
Expr::Call(self.bump.alloc(Call {
callee: expr,
span: dot_span.extend(field.span),
kind: CallKind::Field(field),
}))
}
_ => break,
}