Compare commits
No commits in common. "de881d73d2316254da3b9c8dc499bc51170e667d" and "45df4fdf5f8dfd11caeb421aae6b306141f1d6c2" have entirely different histories.
de881d73d2
...
45df4fdf5f
10
src/ast.h
10
src/ast.h
@ -25,7 +25,6 @@ namespace AST {
|
||||
public:
|
||||
Expression(token::Metadata meta) : Node{ meta } {}
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) = 0;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) = 0;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -56,7 +55,6 @@ namespace AST {
|
||||
virtual ~IntLiteralExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -73,7 +71,6 @@ namespace AST {
|
||||
virtual ~StringLiteralExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -90,7 +87,6 @@ namespace AST {
|
||||
virtual ~ValueReferenceExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -118,7 +114,6 @@ namespace AST {
|
||||
virtual ~BinaryOperationExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -143,7 +138,6 @@ namespace AST {
|
||||
virtual ~FunctionCallExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -168,7 +162,6 @@ namespace AST {
|
||||
virtual ~CastExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -190,7 +183,6 @@ namespace AST {
|
||||
virtual ~RefExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -212,7 +204,6 @@ namespace AST {
|
||||
virtual ~DerefExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
@ -237,7 +228,6 @@ namespace AST {
|
||||
virtual ~IndexAccessExpression() override = default;
|
||||
virtual std::string formatted() override;
|
||||
virtual codegen::StackValue codegen(codegen::Builder& builder, codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> get_codegen_type(codegen::Scope& scope) override;
|
||||
virtual std::shared_ptr<types::Type> typecheck(
|
||||
typecheck::State& state,
|
||||
typecheck::Scope& scope,
|
||||
|
||||
233
src/codegen.cpp
233
src/codegen.cpp
@ -16,10 +16,6 @@ namespace codegen {
|
||||
}
|
||||
|
||||
namespace AST {
|
||||
std::shared_ptr<types::Type> IntLiteralExpression::get_codegen_type(codegen::Scope&) {
|
||||
return this->m_ty;
|
||||
}
|
||||
|
||||
codegen::StackValue IntLiteralExpression::codegen(codegen::Builder& builder, codegen::Scope&) {
|
||||
auto ty = this->m_ty->codegen(builder);
|
||||
|
||||
@ -29,15 +25,7 @@ namespace AST {
|
||||
};
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> StringLiteralExpression::get_codegen_type(codegen::Scope&) {
|
||||
auto stack_type = new types::ArrayType{
|
||||
std::make_unique<types::FundamentalType>(types::FundamentalTypeKind::Char),
|
||||
static_cast<uint32_t>(this->m_value.size()) + 1
|
||||
};
|
||||
return std::shared_ptr<types::Type> {stack_type};
|
||||
}
|
||||
|
||||
codegen::StackValue StringLiteralExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
codegen::StackValue StringLiteralExpression::codegen(codegen::Builder& builder, codegen::Scope&) {
|
||||
auto stack_type = new types::ArrayType{
|
||||
std::make_unique<types::FundamentalType>(types::FundamentalTypeKind::Char),
|
||||
static_cast<uint32_t>(this->m_value.size()) + 1
|
||||
@ -46,28 +34,10 @@ namespace AST {
|
||||
auto str = llvm::StringRef{ this->m_value.c_str() };
|
||||
auto global_str = builder.builder->CreateGlobalString(str);
|
||||
|
||||
if (scope.is_lvalue) {
|
||||
return codegen::StackValue{
|
||||
global_str,
|
||||
std::unique_ptr<types::Type>{stack_type},
|
||||
};
|
||||
}
|
||||
else {
|
||||
return codegen::StackValue{
|
||||
builder.builder->CreateLoad(stack_type->codegen(builder), global_str, "literal"),
|
||||
std::unique_ptr<types::Type>{stack_type},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> ValueReferenceExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
auto value = scope.values.find(this->m_name);
|
||||
if (value != scope.values.end()) {
|
||||
return value->second.ty;
|
||||
}
|
||||
else {
|
||||
throw CompileError("Value " + this->m_name + " not found", this->m_meta);
|
||||
}
|
||||
return codegen::StackValue{
|
||||
builder.builder->CreateLoad(stack_type->codegen(builder), global_str, "literal"),
|
||||
std::unique_ptr<types::Type>{stack_type},
|
||||
};
|
||||
}
|
||||
|
||||
codegen::StackValue ValueReferenceExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
@ -89,30 +59,6 @@ namespace AST {
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> BinaryOperationExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
auto lhs = this->m_lhs->get_codegen_type(scope);
|
||||
auto rhs = this->m_rhs->get_codegen_type(scope);
|
||||
try {
|
||||
switch (this->m_binop) {
|
||||
case types::BinOp::Assignment:
|
||||
return rhs;
|
||||
default:
|
||||
auto binop = types::find_binop(
|
||||
scope.binops,
|
||||
lhs,
|
||||
this->m_binop,
|
||||
rhs);
|
||||
if (binop) {
|
||||
return binop->result(*binop, lhs, rhs);
|
||||
}
|
||||
throw CompileError("invalid binop", this->m_meta);
|
||||
}
|
||||
}
|
||||
catch (std::runtime_error& error) {
|
||||
throw CompileError(error.what(), this->m_meta);
|
||||
}
|
||||
}
|
||||
|
||||
codegen::StackValue BinaryOperationExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
auto lvalued = scope.with_lvalue();
|
||||
auto lhs = this->m_lhs->codegen(builder, this->m_binop == types::BinOp::Assignment ? lvalued : scope);
|
||||
@ -142,11 +88,6 @@ namespace AST {
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> FunctionCallExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
auto fn_ty = this->m_fn_expr->get_codegen_type(scope);
|
||||
return *fn_ty->return_type();
|
||||
}
|
||||
|
||||
codegen::StackValue FunctionCallExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
std::vector<llvm::Value*> args{};
|
||||
for (auto& arg : this->m_args) {
|
||||
@ -161,54 +102,24 @@ namespace AST {
|
||||
};
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> CastExpression::get_codegen_type(codegen::Scope&) {
|
||||
return this->m_ty;
|
||||
}
|
||||
|
||||
codegen::StackValue CastExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
auto expr_ty = this->m_expr->get_codegen_type(scope);
|
||||
if ((expr_ty->m_kind == types::TypeKind::Array
|
||||
|| expr_ty->m_kind == types::TypeKind::Pointer)
|
||||
&& this->m_ty->m_kind == types::TypeKind::Pointer) {
|
||||
std::cout << expr_ty->formatted() << std::endl;
|
||||
auto lvalued = scope.with_lvalue();
|
||||
auto expr = this->m_expr->codegen(builder, lvalued);
|
||||
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
|
||||
if (cast) {
|
||||
auto expr = this->m_expr->codegen(builder, scope);
|
||||
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
|
||||
if (cast) {
|
||||
if (cast->target_ty->m_kind == types::TypeKind::Pointer && cast->casted_ty->m_kind == types::TypeKind::Array) {
|
||||
auto allocated = builder.builder->CreateAlloca(cast->casted_ty->codegen(builder));
|
||||
builder.builder->CreateStore(expr.value, allocated);
|
||||
return codegen::StackValue{
|
||||
cast->codegen(builder, cast->target_ty, expr.value),
|
||||
cast->codegen(builder, cast->target_ty, allocated),
|
||||
cast->target_ty
|
||||
};
|
||||
}
|
||||
else {
|
||||
return expr;
|
||||
}
|
||||
return codegen::StackValue{
|
||||
cast->codegen(builder, cast->target_ty, expr.value),
|
||||
cast->target_ty
|
||||
};
|
||||
}
|
||||
else {
|
||||
auto expr = this->m_expr->codegen(builder, scope);
|
||||
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
|
||||
if (cast) {
|
||||
// if (cast->target_ty->m_kind == types::TypeKind::Pointer && cast->casted_ty->m_kind == types::TypeKind::Array) {
|
||||
// auto allocated = builder.builder->CreateAlloca(cast->casted_ty->codegen(builder));
|
||||
// builder.builder->CreateStore(expr.value, allocated);
|
||||
// return codegen::StackValue{
|
||||
// cast->codegen(builder, cast->target_ty, allocated),
|
||||
// cast->target_ty
|
||||
// };
|
||||
// }
|
||||
return codegen::StackValue{
|
||||
cast->codegen(builder, cast->target_ty, expr.value),
|
||||
cast->target_ty
|
||||
};
|
||||
}
|
||||
return expr;
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> RefExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
return std::shared_ptr<types::Type> {
|
||||
new types::PointerType{ this->m_expr->get_codegen_type(scope) }
|
||||
};
|
||||
return expr;
|
||||
}
|
||||
|
||||
codegen::StackValue RefExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
@ -216,17 +127,6 @@ namespace AST {
|
||||
return this->m_expr->codegen(builder, with_lvalue);
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> DerefExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
auto ty = this->m_expr->get_codegen_type(scope);
|
||||
if (ty->m_kind == types::TypeKind::Pointer) {
|
||||
auto ptr_ty = dynamic_cast<types::PointerType*>(ty.get());
|
||||
return ptr_ty->m_inner;
|
||||
}
|
||||
else {
|
||||
throw new CompileError("Tried to deref a non-pointer!", this->m_meta);
|
||||
}
|
||||
}
|
||||
|
||||
codegen::StackValue DerefExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
auto value = this->m_expr->codegen(builder, scope);
|
||||
if (value.ty->m_kind == types::TypeKind::Pointer) {
|
||||
@ -241,21 +141,6 @@ namespace AST {
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<types::Type> IndexAccessExpression::get_codegen_type(codegen::Scope& scope) {
|
||||
auto ty = this->m_expr->get_codegen_type(scope);
|
||||
if (ty->m_kind == types::TypeKind::Array) {
|
||||
auto ptr_ty = dynamic_cast<types::ArrayType*>(ty.get());
|
||||
return ptr_ty->m_inner;
|
||||
}
|
||||
else if (ty->m_kind == types::TypeKind::Pointer) {
|
||||
auto ptr_ty = dynamic_cast<types::PointerType*>(ty.get());
|
||||
return ptr_ty->m_inner;
|
||||
}
|
||||
else {
|
||||
throw CompileError("Tried indexing a non-pointer", this->m_meta);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
codegen::StackValue IndexAccessExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||
auto lvalue_scope = scope.with_lvalue();
|
||||
@ -286,42 +171,23 @@ namespace AST {
|
||||
};
|
||||
}
|
||||
}
|
||||
else if (ptr_ty->m_inner->m_kind == types::TypeKind::Array) {
|
||||
std::cout << ptr_ty->m_inner->formatted() << std::endl;
|
||||
|
||||
// Must be an array otherwise
|
||||
auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get());
|
||||
auto gep_value = builder.builder->CreateGEP(arr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP");
|
||||
if (scope.is_lvalue) {
|
||||
return codegen::StackValue{
|
||||
gep_value,
|
||||
value.ty,
|
||||
};
|
||||
}
|
||||
else {
|
||||
auto inner_ptr_ty = types::PointerType{ arr_ty->m_inner };
|
||||
auto loaded = inner_ptr_ty.load(builder, gep_value);
|
||||
return codegen::StackValue{
|
||||
loaded.first,
|
||||
loaded.second
|
||||
};
|
||||
}
|
||||
// Must be an array otherwise
|
||||
auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get());
|
||||
auto gep_value = builder.builder->CreateGEP(arr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP");
|
||||
if (scope.is_lvalue) {
|
||||
return codegen::StackValue{
|
||||
gep_value,
|
||||
value.ty,
|
||||
};
|
||||
}
|
||||
else {
|
||||
auto gep_value = builder.builder->CreateGEP(ptr_ty->m_inner->codegen(builder), value.value, idx_list, "GEP");
|
||||
if (scope.is_lvalue) {
|
||||
return codegen::StackValue{
|
||||
gep_value,
|
||||
value.ty,
|
||||
};
|
||||
}
|
||||
else {
|
||||
auto loaded = value.ty->load(builder, gep_value);
|
||||
return codegen::StackValue{
|
||||
loaded.first,
|
||||
loaded.second
|
||||
};
|
||||
}
|
||||
auto inner_ptr_ty = types::PointerType{ arr_ty->m_inner };
|
||||
auto loaded = inner_ptr_ty.load(builder, gep_value);
|
||||
return codegen::StackValue{
|
||||
loaded.first,
|
||||
loaded.second
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -429,32 +295,19 @@ namespace AST {
|
||||
|
||||
int counter = 0;
|
||||
for (auto& param : this->m_params) {
|
||||
if (param.second->m_kind == types::TypeKind::Pointer) {
|
||||
auto ty = param_ty_ptrs[counter];
|
||||
auto arg = function->getArg(counter++);
|
||||
if (param.first) {
|
||||
arg->setName(*param.first);
|
||||
inner_scope.values[*param.first] = codegen::StackValue{
|
||||
arg,
|
||||
ty,
|
||||
};
|
||||
}
|
||||
}
|
||||
else {
|
||||
builder.builder->SetInsertPoint(BB);
|
||||
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder));
|
||||
auto param_ty_ptr = std::shared_ptr<types::Type>{
|
||||
new types::PointerType { param_ty_ptrs[counter]}
|
||||
builder.builder->SetInsertPoint(BB);
|
||||
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder));
|
||||
auto param_ty_ptr = std::shared_ptr<types::Type>{
|
||||
new types::PointerType { param_ty_ptrs[counter]}
|
||||
};
|
||||
auto arg = function->getArg(counter++);
|
||||
builder.builder->CreateStore(arg, arg_ptr);
|
||||
if (param.first) {
|
||||
arg->setName(*param.first);
|
||||
inner_scope.values[*param.first] = codegen::StackValue{
|
||||
arg_ptr,
|
||||
param_ty_ptr,
|
||||
};
|
||||
auto arg = function->getArg(counter++);
|
||||
builder.builder->CreateStore(arg, arg_ptr);
|
||||
if (param.first) {
|
||||
arg->setName(*param.first);
|
||||
inner_scope.values[*param.first] = codegen::StackValue{
|
||||
arg_ptr,
|
||||
param_ty_ptr,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -391,25 +391,7 @@ namespace parsing {
|
||||
std::optional<std::string> param_name{};
|
||||
if (inner.peek().type == token::Type::Ident) {
|
||||
param_name = inner.expect(token::Type::Ident).content;
|
||||
|
||||
std::cout << inner.peek().formatted() << std::endl;
|
||||
auto postfix = parse_array_postfix(inner, true);
|
||||
while (postfix.ok()) {
|
||||
auto array_postfix = postfix.unwrap();
|
||||
if (array_postfix) {
|
||||
param_ty = std::shared_ptr<types::Type>{
|
||||
new types::PointerType(param_ty)
|
||||
};
|
||||
}
|
||||
else {
|
||||
param_ty = std::shared_ptr<types::Type>{
|
||||
new types::PointerType(param_ty)
|
||||
};
|
||||
}
|
||||
postfix = parse_array_postfix(inner, true);
|
||||
}
|
||||
}
|
||||
|
||||
params.push_back(std::pair(param_name, std::move(param_ty)));
|
||||
}
|
||||
|
||||
|
||||
7
test.c
7
test.c
@ -6,8 +6,8 @@ int fibonacci(int n) {
|
||||
return fibonacci(n - 1) + fibonacci(n - 2);
|
||||
}
|
||||
|
||||
void change_first(char otus[5]) {
|
||||
otus[0] = 115;
|
||||
void modify_value(char* otus) {
|
||||
*otus = 20;
|
||||
}
|
||||
|
||||
int main() {
|
||||
@ -17,7 +17,8 @@ int main() {
|
||||
char somelist[5];
|
||||
|
||||
somelist[0] = 15;
|
||||
change_first(somelist);
|
||||
somelist[1] = 20;
|
||||
somelist[2] = 25;
|
||||
|
||||
return somelist[0];
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user