aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-04-07 11:34:04 -0700
committerAndrew Kelley <superjoe30@gmail.com>2016-04-07 11:34:24 -0700
commitee22e872967947d2f6e64cba888bf7bf56e4d332 (patch)
tree02935f88bf83494ea3a4da056206e64ed9f2cfc3
parent1d4c66b56beb7b2da6bafbab6871691641c8da0b (diff)
downloadzig-ee22e872967947d2f6e64cba888bf7bf56e4d332.tar.gz
zig-ee22e872967947d2f6e64cba888bf7bf56e4d332.zip
generic functions use correct type for generic args
See #22
-rw-r--r--src/analyze.cpp4
-rw-r--r--test/self_hosted.zig5
2 files changed, 7 insertions, 2 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 6f272c2065..75002ebb66 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -4667,8 +4667,8 @@ static TypeTableEntry *analyze_generic_fn_call(CodeGen *g, ImportTableEntry *imp
AstNode **generic_param_type_node = &generic_param_decl_node->data.param_decl.type;
- TypeTableEntry *expected_param_type = analyze_expression(g, decl_node->owner,
- decl_node->owner->block_context, nullptr, *generic_param_type_node);
+ TypeTableEntry *expected_param_type = analyze_type_expr(g, decl_node->owner,
+ decl_node->owner->block_context, *generic_param_type_node);
if (expected_param_type->id == TypeTableEntryIdInvalid) {
return expected_param_type;
}
diff --git a/test/self_hosted.zig b/test/self_hosted.zig
index 3b1473c57a..f715fffe2c 100644
--- a/test/self_hosted.zig
+++ b/test/self_hosted.zig
@@ -516,12 +516,17 @@ three)";
fn simple_generic_fn() {
assert(max(i32)(3, -1) == 3);
assert(max(f32)(0.123, 0.456) == 0.456);
+ assert(add(2)(3) == 5);
}
fn max(T: type)(a: T, b: T) -> T {
return if (a > b) a else b;
}
+fn add(a: i32)(b: i32) -> i32 {
+ return a + b;
+}
+
#attribute("test")
fn constant_equal_function_pointers() {