jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-12-04 02:48:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix evaluating generic function instance in wrong context

Browse Source 
See #22
This commit is contained in:
Andrew Kelley 2016-04-07 14:23:06 -07:00
parent ee22e87296
commit 3b535d2c3a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/analyze.cpp
View File

@ -4674,7 +4674,7 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp
} }
AstNode **param_node = &node->data.fn_call_expr.params.at(i); AstNode **param_node = &node->data.fn_call_expr.params.at(i);
TypeTableEntry *param_type = analyze_expression(g, import, child_context, expected_param_type, TypeTableEntry *param_type = analyze_expression(g, import, parent_context, expected_param_type,
*param_node); *param_node);
if (param_type->id == TypeTableEntryIdInvalid) { if (param_type->id == TypeTableEntryIdInvalid) {
return param_type; return param_type;

7
test/run_tests.cpp
View File

@ -1781,6 +1781,13 @@ b";
fn foo() {} fn foo() {}
const invalid = foo > foo; const invalid = foo > foo;
)SOURCE", 1, ".tmp_source.zig:3:21: error: operator not allowed for type 'fn()'"); )SOURCE", 1, ".tmp_source.zig:3:21: error: operator not allowed for type 'fn()'");
add_compile_fail_case("generic function instance with non-constant expression", R"SOURCE(
fn foo(x: i32)(y: i32) -> i32 { return x + y; }
fn test1(a: i32, b: i32) -> i32 {
return foo(a)(b);
}
)SOURCE", 1, ".tmp_source.zig:4:16: error: unable to resolve constant expression");
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////