From 05ad38ae2d8808ba09f9c8d41480e780b20ada85 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sun, 3 Dec 2017 23:19:25 +0000
Subject: [PATCH] Fix procedure grouping

---
 core/_preload.odin | 37 +++++++++++++++++--------------------
 src/check_expr.cpp |  5 +++++
 src/checker.cpp    |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/core/_preload.odin b/core/_preload.odin
index e51de8029..42b02e0ef 100644
--- a/core/_preload.odin
+++ b/core/_preload.odin
@@ -362,10 +362,10 @@ pop :: proc "contextless" (array: ^$T/[dynamic]$E) -> E {
 	return res;
 }
 
-clear :: inline proc "contextless" (array: ^$T/[dynamic]$E) {
+clear_dynamic_array :: inline proc "contextless" (array: ^$T/[dynamic]$E) {
 	if array != nil do (cast(^raw.Dynamic_Array)array).len = 0;
 }
-clear :: inline proc "contextless" (m: ^$T/map[$K]$V) {
+clear_map :: inline proc "contextless" (m: ^$T/map[$K]$V) {
 	if m == nil do return;
 	raw_map := cast(^raw.Map)m;
 	hashes  := cast(^raw.Dynamic_Array)&raw_map.hashes;
@@ -374,6 +374,8 @@ clear :: inline proc "contextless" (m: ^$T/map[$K]$V) {
 	entries.len = 0;
 }
 
+clear :: proc[clear_dynamic_array, clear_map];
+
 reserve :: proc(array: ^$T/[dynamic]$E, capacity: int, loc := #caller_location) -> bool {
 	if array == nil do return false;
 	a := cast(^raw.Dynamic_Array)array;
@@ -472,24 +474,26 @@ new_clone :: inline proc(data: $T, loc := #caller_location) -> ^T {
 	return ptr;
 }
 
-free :: proc(ptr: rawptr, loc := #caller_location) {
-	free_ptr(ptr, loc);
-}
-free :: proc(str: $T/string, loc := #caller_location) {
+free_string :: proc(str: string, loc := #caller_location) {
 	free_ptr((^raw.String)(&str).data, loc);
 }
-free :: proc(array: $T/[dynamic]$E, loc := #caller_location) {
+free_dynamic_array :: proc(array: $T/[dynamic]$E, loc := #caller_location) {
 	free_ptr((^raw.Dynamic_Array)(&array).data, loc);
 }
-free :: proc(slice: $T/[]$E, loc := #caller_location) {
-	free_ptr((^raw.Slice)(&slice).data, loc);
+free_slice :: proc(array: $T/[]$E, loc := #caller_location) {
+	free_ptr((^raw.Slice)(&array).data, loc);
 }
-free :: proc(m: $T/map[$K]$V, loc := #caller_location) {
+free_map :: proc(m: $T/map[$K]$V, loc := #caller_location) {
 	raw := cast(^raw.Map)&m;
-	free(raw.hashes, loc);
-	free(raw.entries.data, loc);
+	free_dynamic_array(raw.hashes, loc);
+	free_ptr(raw.entries.data, loc);
 }
 
+free :: proc[
+	free_ptr, free_string, free_dynamic_array, free_slice, free_map,
+];
+
+
 // NOTE(bill): This code works but I will prefer having `make` a built-in procedure
 // to have better error messages
 /*
@@ -498,14 +502,7 @@ make :: proc(T: type/[]$E, len: int, using loc := #caller_location) -> T {
 	__slice_expr_error(file_path, int(line), int(column), 0, len, cap);
 	data := cast(^E)alloc(len * size_of(E), align_of(E));
 	for i in 0..len do (data+i)^ = E{};
-	s := raw.Slice{data = data, len = len, cap = len};
-	return (cast(^T)&s)^;
-}
-make :: proc(T: type/[]$E, len, cap: int, using loc := #caller_location) -> T {
-	__slice_expr_error(file_path, int(line), int(column), 0, len, cap);
-	data := cast(^E)alloc(len * size_of(E), align_of(E));
-	for i in 0..len do (data+i)^ = E{};
-	s := raw.Slice{data = data, len = len, cap = len};
+	s := raw.Slice{data = data, len = len};
 	return (cast(^T)&s)^;
 }
 make :: proc(T: type/[dynamic]$E, len: int = 8, using loc := #caller_location) -> T {
diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index 36419d172..21a4f7cfe 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -999,6 +999,11 @@ Entity *check_ident(Checker *c, Operand *o, AstNode *n, Type *named_type, Type *
 
 	if (e->kind == Entity_ProcedureGrouping) {
 		auto *pge = &e->ProcedureGrouping;
+
+		DeclInfo *d = decl_info_of_entity(&c->info, e);
+		check_entity_decl(c, e, d, nullptr);
+
+
 		Entity **procs = pge->entities.data;
 		isize overload_count = pge->entities.count;
 		bool skip = false;
diff --git a/src/checker.cpp b/src/checker.cpp
index 41faba7c0..78afab4ad 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1472,7 +1472,7 @@ PtrSet<Entity *> generate_minimum_dependency_set(CheckerInfo *info, Entity *star
 		Entity *e = info->definitions.entries[i].value;
 		// if (e->scope->is_global && !is_type_poly_proc(e->type)) { // TODO(bill): is the check enough?
 		if (e->scope->is_global) { // TODO(bill): is the check enough?
-			if (!is_type_poly_proc(e->type))  {
+			if (e->type == nullptr || !is_type_poly_proc(e->type))  {
 				// NOTE(bill): Require runtime stuff
 				add_dependency_to_map(&map, info, e);
 			}