From e46662a546788324f3648e7f9bfa051c86184db4 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sun, 3 Jun 2018 16:40:58 +0100
Subject: [PATCH] Rename os.default_allocator to os.heap_allocator

---
 core/os/os.odin        | 6 +++---
 core/runtime/core.odin | 2 +-
 src/checker.cpp        | 2 +-
 src/ir.cpp             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/os/os.odin b/core/os/os.odin
index c7a4dc733..0f6e51b46 100644
--- a/core/os/os.odin
+++ b/core/os/os.odin
@@ -66,7 +66,7 @@ read_ptr :: proc(fd: Handle, data: rawptr, len: int) -> (int, Errno) {
 }
 
 
-default_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
+heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
                                size, alignment: int,
                                old_memory: rawptr, old_size: int, flags: u64 = 0, loc := #caller_location) -> rawptr {
 	using mem.Allocator_Mode;
@@ -91,9 +91,9 @@ default_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
 	return nil;
 }
 
-default_allocator :: proc() -> mem.Allocator {
+heap_allocator :: proc() -> mem.Allocator {
 	return mem.Allocator{
-		procedure = default_allocator_proc,
+		procedure = heap_allocator_proc,
 		data = nil,
 	};
 }
diff --git a/core/runtime/core.odin b/core/runtime/core.odin
index da5bdaef9..aca8699b1 100644
--- a/core/runtime/core.odin
+++ b/core/runtime/core.odin
@@ -276,7 +276,7 @@ __init_context_from_ptr :: proc "contextless" (c: ^Context, other: ^Context) {
 __init_context :: proc "contextless" (c: ^Context) {
 	if c == nil do return;
 
-	c.allocator = os.default_allocator();
+	c.allocator = os.heap_allocator();
 	c.thread_id = os.current_thread_id();
 }
 
diff --git a/src/checker.cpp b/src/checker.cpp
index e44697880..224454c11 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1334,7 +1334,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
 
 	AstPackage *os = get_core_package(&c->info, str_lit("os"));
 	String required_os_entities[] = {
-		str_lit("default_allocator"),
+		str_lit("heap_allocator"),
 	};
 	for (isize i = 0; i < gb_count_of(required_os_entities); i++) {
 		add_dependency_to_set(c, scope_lookup_entity(os->scope, required_mem_entities[i]));
diff --git a/src/ir.cpp b/src/ir.cpp
index a353c6f02..b62c39888 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -1637,7 +1637,7 @@ irValue *ir_find_or_generate_context_ptr(irProcedure *proc) {
 
 	irValue *ep = ir_emit_struct_ep(proc, c, 0);
 	Array<irValue *> args = {};
-	irValue *v = ir_emit_package_call(proc, "os", "default_allocator", args);
+	irValue *v = ir_emit_package_call(proc, "os", "heap_allocator", args);
 	ir_emit_store(proc, ep, v);
 
 	return c;