teascade/reid-llvm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split codegen properly

Browse Source
This commit is contained in:
Sofia 2023-08-02 18:37:31 +03:00
parent 817b7c2096
commit 9019e1e5a7
2 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/codegen.rs
View File

@ -25,8 +25,8 @@ impl<'a> Scope<'a> {
self.named_vars.get(name)
}
pub fn set(&mut self, name: String, val: Value) -> Result<(), ()> {
if let hash_map::Entry::Vacant(e) = self.named_vars.entry(name) {
pub fn set(&mut self, name: &String, val: Value) -> Result<(), ()> {
if let hash_map::Entry::Vacant(e) = self.named_vars.entry(name.clone()) {
e.insert(val);
Ok(())
} else {
@ -35,28 +35,19 @@ impl<'a> Scope<'a> {
}
}
pub fn codegen(statements: Vec<TopLevelStatement>) {
let mut c = IRModule::new();
for statement in statements {
match statement {
impl TopLevelStatement {
pub fn codegen(&self, module: &mut IRModule) {
match self {
TopLevelStatement::FunctionDefinition(FunctionDefinition(sig, block)) => {
let func = c.create_func(sig.name, ValueType::I32);
let mut scope = Scope::from(c.create_block());
let func = module.create_func(&sig.name, ValueType::I32);
let mut scope = Scope::from(module.create_block());
for stmt in block.0 {
match stmt {
BlockLevelStatement::Let(let_statement) => {
let value = codegen_exp(&mut scope, let_statement.1);
scope.set(let_statement.0, value).unwrap();
}
BlockLevelStatement::Return(_) => panic!("Should never exist!"),
BlockLevelStatement::Import(_) => {}
BlockLevelStatement::Expression(_) => {}
}
for statement in &block.0 {
statement.codegen(&mut scope);
}
let value = if let Some(exp) = block.1 {
codegen_exp(&mut scope, exp)
let value = if let Some(exp) = &block.1 {
exp.codegen(&mut scope)
} else {
scope.block.get_const(&Literal::I32(0))
};
@ -67,13 +58,28 @@ pub fn codegen(statements: Vec<TopLevelStatement>) {
}
}
fn codegen_exp(scope: &mut Scope, expression: Expression) -> Value {
impl BlockLevelStatement {
pub fn codegen(&self, scope: &mut Scope) {
match self {
BlockLevelStatement::Let(let_statement) => {
let val = let_statement.1.codegen(scope);
scope.set(&let_statement.0, val).unwrap();
}
BlockLevelStatement::Return(_) => panic!("Should never exist!"),
BlockLevelStatement::Import(_) => {}
BlockLevelStatement::Expression(_) => {}
}
}
}
impl Expression {
pub fn codegen(&self, scope: &mut Scope) -> Value {
use Expression::*;
match expression {
match self {
Binop(op, lhs, rhs) => match op {
BinaryOperator::Add => {
let lhs = codegen_exp(scope, *lhs);
let rhs = codegen_exp(scope, *rhs);
let lhs = lhs.codegen(scope);
let rhs = rhs.codegen(scope);
scope.block.add(lhs, rhs).unwrap()
}
BinaryOperator::Mult => panic!("Not implemented!"),
@ -83,4 +89,5 @@ fn codegen_exp(scope: &mut Scope, expression: Expression) -> Value {
VariableName(name) => scope.get(&name).cloned().unwrap(),
Literal(lit) => scope.block.get_const(&lit),
}
}
}

9
src/main.rs
View File

@ -1,4 +1,6 @@
use crate::{lexer::Token, parser::TopLevelStatement, token_stream::TokenStream};
use crate::{
lexer::Token, llvm_ir::IRModule, parser::TopLevelStatement, token_stream::TokenStream,
};
pub static EASIEST: &str = include_str!("../reid/easiest.reid");
pub static EASY: &str = include_str!("../reid/easy.reid");
@ -32,5 +34,8 @@ fn main() {
statements.push(statement);
}
codegen::codegen(statements);
let mut module = IRModule::new();
for statement in statements {
statement.codegen(&mut module);
}
}