From 1b8c3ca22a28b8ca36175d3e20a3993cba315dae Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Tue, 8 Oct 2019 20:28:45 +0100
Subject: [PATCH] Fix typos and make demo work with -vet

---
 core/fmt/fmt.odin         | 4 ++--
 core/strings/strings.odin | 6 +++---
 examples/demo/demo.odin   | 1 -
 src/check_type.cpp        | 6 ++++--
 src/parser.cpp            | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/fmt/fmt.odin b/core/fmt/fmt.odin
index 6903b9bdb..e6830e734 100644
--- a/core/fmt/fmt.odin
+++ b/core/fmt/fmt.odin
@@ -69,8 +69,8 @@ eprintf  :: proc(fmt: string, args: ..any) -> int { return fprintf(context.stder
 
 
 @(deprecated="prefer eprint")   print_err   :: proc(args: ..any)              -> int { return eprint(..args); }
-@(deprecated="prefer eprintf")  println_err :: proc(args: ..any)              -> int { return eprintln(..args); }
-@(deprecated="prefer eprintln") printf_err  :: proc(fmt: string, args: ..any) -> int { return eprintf(fmt, ..args); }
+@(deprecated="prefer eprintf")  printf_err  :: proc(fmt: string, args: ..any) -> int { return eprintf(fmt, ..args); }
+@(deprecated="prefer eprintln") println_err :: proc(args: ..any)              -> int { return eprintln(..args); }
 
 
 // aprint* procedures return a string that was allocated with the current context
diff --git a/core/strings/strings.odin b/core/strings/strings.odin
index 0c9ffa7d3..921e4f009 100644
--- a/core/strings/strings.odin
+++ b/core/strings/strings.odin
@@ -169,9 +169,9 @@ _split :: proc(s_, sep: string, sep_save, n_: int, allocator := context.allocato
 			n = l;
 		}
 
-		res := make([dynamic]string, n);
+		res := make([dynamic]string, n, allocator);
 		for i := 0; i < n-1; i += 1 {
-			r, w := utf8.decode_rune_in_string(s);
+			_, w := utf8.decode_rune_in_string(s);
 			res[i] = s[:w];
 			s = s[w:];
 		}
@@ -185,7 +185,7 @@ _split :: proc(s_, sep: string, sep_save, n_: int, allocator := context.allocato
 		n = count(s, sep) + 1;
 	}
 
-	res := make([dynamic]string, n);
+	res := make([dynamic]string, n, allocator);
 
 	n -= 1;
 
diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin
index a5f3500f1..ff861b1de 100644
--- a/examples/demo/demo.odin
+++ b/examples/demo/demo.odin
@@ -4,7 +4,6 @@ import "core:fmt"
 import "core:mem"
 import "core:os"
 import "core:reflect"
-import "core:strings"
 import "intrinsics"
 
 when os.OS == "windows" {
diff --git a/src/check_type.cpp b/src/check_type.cpp
index 9f5ed0ed3..65e0bc880 100644
--- a/src/check_type.cpp
+++ b/src/check_type.cpp
@@ -2016,8 +2016,10 @@ Type *type_to_abi_compat_result_type(gbAllocator a, Type *original_type, ProcCal
 			break;
 		}
 		}
-	} else if (build_context.ODIN_OS == "linux") {
-
+	} else if (build_context.ODIN_OS == "linux" || build_context.ODIN_OS == "darwin") {
+		if (build_context.ODIN_ARCH == "amd64") {
+			
+		}
 	} else {
 		// IMPORTANT TODO(bill): figure out the ABI settings for Linux, OSX etc. for
 		// their architectures
diff --git a/src/parser.cpp b/src/parser.cpp
index e17d19787..025a181ba 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1345,7 +1345,7 @@ bool is_semicolon_optional_for_node(AstFile *f, Ast *s) {
 	case Ast_EnumType:
 	case Ast_BitFieldType:
 		// Require semicolon within a procedure body
-		return f->curr_proc == false;
+		return f->curr_proc == nullptr;
 	case Ast_ProcLit:
 		return true;