Possibly fix passing of arrays
This commit is contained in:
parent
b97aa3f212
commit
e76540182f
@ -158,17 +158,34 @@ namespace AST {
|
|||||||
}
|
}
|
||||||
|
|
||||||
codegen::StackValue CastExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
codegen::StackValue CastExpression::codegen(codegen::Builder& builder, codegen::Scope& scope) {
|
||||||
auto expr = this->m_expr->codegen(builder, scope);
|
auto expr_ty = this->m_expr->get_codegen_type(scope);
|
||||||
|
if (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);
|
auto cast = types::find_cast(scope.casts, expr.ty, this->m_ty);
|
||||||
if (cast) {
|
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{
|
return codegen::StackValue{
|
||||||
cast->codegen(builder, cast->target_ty, allocated),
|
cast->codegen(builder, cast->target_ty, expr.value),
|
||||||
cast->target_ty
|
cast->target_ty
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
return expr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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{
|
return codegen::StackValue{
|
||||||
cast->codegen(builder, cast->target_ty, expr.value),
|
cast->codegen(builder, cast->target_ty, expr.value),
|
||||||
cast->target_ty
|
cast->target_ty
|
||||||
@ -176,6 +193,7 @@ namespace AST {
|
|||||||
}
|
}
|
||||||
return expr;
|
return expr;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::shared_ptr<types::Type> RefExpression::get_codegen_type(codegen::Scope& scope) {
|
std::shared_ptr<types::Type> RefExpression::get_codegen_type(codegen::Scope& scope) {
|
||||||
return std::shared_ptr<types::Type> {
|
return std::shared_ptr<types::Type> {
|
||||||
@ -258,6 +276,8 @@ 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
|
// Must be an array otherwise
|
||||||
auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get());
|
auto arr_ty = dynamic_cast<types::ArrayType*>(ptr_ty->m_inner.get());
|
||||||
@ -277,6 +297,23 @@ namespace AST {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
throw CompileError("Tried indexing a non-pointer", this->m_meta);
|
throw CompileError("Tried indexing a non-pointer", this->m_meta);
|
||||||
}
|
}
|
||||||
@ -382,6 +419,18 @@ namespace AST {
|
|||||||
|
|
||||||
int counter = 0;
|
int counter = 0;
|
||||||
for (auto& param : this->m_params) {
|
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);
|
builder.builder->SetInsertPoint(BB);
|
||||||
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder));
|
auto arg_ptr = builder.builder->CreateAlloca(param_ty_ptrs[counter]->codegen(builder));
|
||||||
auto param_ty_ptr = std::shared_ptr<types::Type>{
|
auto param_ty_ptr = std::shared_ptr<types::Type>{
|
||||||
@ -397,6 +446,7 @@ namespace AST {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (auto& statement : *this->m_statements) {
|
for (auto& statement : *this->m_statements) {
|
||||||
statement->codegen(builder, inner_scope);
|
statement->codegen(builder, inner_scope);
|
||||||
|
|||||||
@ -398,7 +398,7 @@ namespace parsing {
|
|||||||
auto array_postfix = postfix.unwrap();
|
auto array_postfix = postfix.unwrap();
|
||||||
if (array_postfix) {
|
if (array_postfix) {
|
||||||
param_ty = std::shared_ptr<types::Type>{
|
param_ty = std::shared_ptr<types::Type>{
|
||||||
new types::ArrayType(param_ty, *array_postfix)
|
new types::PointerType(param_ty)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user