ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for default parameters that are non-constant entities, but not any non-constant expression

Browse Source
This commit is contained in:
gingerBill
2018-08-28 20:03:27 +01:00
parent adbb3bb75f
commit ae2af8315e
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_type.cpp
+16 -6
View File
@@ -1038,7 +1038,8 @@ ParameterValue handle_parameter_value(CheckerContext *ctx, Type *in_type, Type *
param_value.value = exact_value_procedure(expr); param_value.value = exact_value_procedure(expr);
} else { } else {
Entity *e = nullptr; Entity *e = nullptr;
if (o.mode == Addressing_Value && is_type_proc(o.type)) { // if (o.mode == Addressing_Value && is_type_proc(o.type)) {
if (o.mode == Addressing_Value || o.mode == Addressing_Variable) {
Operand x = {}; Operand x = {};
if (expr->kind == Ast_Ident) { if (expr->kind == Ast_Ident) {
e = check_ident(ctx, &x, expr, nullptr, nullptr, false); e = check_ident(ctx, &x, expr, nullptr, nullptr, false);
@@ -1047,12 +1048,21 @@ ParameterValue handle_parameter_value(CheckerContext *ctx, Type *in_type, Type *
} }
} }
if (e != nullptr && e->kind == Entity_Procedure) { if (e != nullptr) {
param_value.kind = ParameterValue_Constant; if (e->kind == Entity_Procedure) {
param_value.value = exact_value_procedure(e->identifier); param_value.kind = ParameterValue_Constant;
add_entity_use(ctx, e->identifier, e); param_value.value = exact_value_procedure(e->identifier);
add_entity_use(ctx, e->identifier, e);
} else {
param_value.kind = ParameterValue_Value;
param_value.ast_value = expr;
add_entity_use(ctx, e->identifier, e);
}
} else if (allow_caller_location && o.mode == Addressing_Context) {
param_value.kind = ParameterValue_Value;
param_value.ast_value = expr;
} else { } else {
error(expr, "Default parameter must be a constant %d", o.mode); error(expr, "Default parameter must be a constant");
} }
} }
} else { } else {
src/entity.cpp
+5 -1
View File
@@ -62,11 +62,15 @@ enum ParameterValueKind {
ParameterValue_Constant, ParameterValue_Constant,
ParameterValue_Nil, ParameterValue_Nil,
ParameterValue_Location, ParameterValue_Location,
ParameterValue_Value,
}; };
struct ParameterValue { struct ParameterValue {
ParameterValueKind kind; ParameterValueKind kind;
ExactValue value; union {
ExactValue value;
Ast *ast_value;
};
}; };
src/ir.cpp
+9
View File
@@ -5128,6 +5128,9 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
// args[i] = // args[i] =
GB_PANIC("TODO ParameterValue_Location"); GB_PANIC("TODO ParameterValue_Location");
break; break;
case ParameterValue_Value:
args[i] = ir_build_expr(proc, e->Variable.param_value.ast_value);
break;
} }
} else { } else {
args[i] = ir_emit_conv(proc, args[i], e->type); args[i] = ir_emit_conv(proc, args[i], e->type);
@@ -5221,6 +5224,9 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
case ParameterValue_Location: case ParameterValue_Location:
args[arg_index++] = ir_emit_source_code_location(proc, proc_name, pos); args[arg_index++] = ir_emit_source_code_location(proc, proc_name, pos);
break; break;
case ParameterValue_Value:
args[arg_index++] = ir_build_expr(proc, e->Variable.param_value.ast_value);
break;
} }
} }
} }
@@ -5312,6 +5318,9 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
case ParameterValue_Location: case ParameterValue_Location:
args[i] = ir_emit_source_code_location(proc, proc_name, pos); args[i] = ir_emit_source_code_location(proc, proc_name, pos);
break; break;
case ParameterValue_Value:
args[i] = ir_build_expr(proc, e->Variable.param_value.ast_value);
break;
} }
} }
} }