#import search rule: relative then core/

3 files changed, 72 insertions, 24 deletions

diff --git a/src/checker/checker.cpp b/src/checker/checker.cpp
index 99d04799f..27c6d04b5 100644
--- a/src/checker/checker.cpp
+++ b/src/checker/checker.cpp
@@ -840,7 +840,11 @@ void init_type_info_types(Checker *c) {
 	if (t_type_info == NULL) {
 		String type_info_str = make_string("Type_Info");
 		Entity *e = current_scope_lookup_entity(c->global_scope, type_info_str);
-		GB_ASSERT_MSG(e != NULL, "Internal Compiler Error: Could not find type declaration for `Type_Info`");
+		if (e == NULL) {
+			gb_printf_err("Internal Compiler Error: Could not find type declaration for `Type_Info`\n");
+			gb_printf_err("Is `runtime.odin` missing from the `core` directory?\n");
+			gb_exit(1);
+		}
 		t_type_info = e->type;
 		t_type_info_ptr = make_type_pointer(c->allocator, t_type_info);
 
@@ -849,7 +853,10 @@ void init_type_info_types(Checker *c) {
 		t_type_info_member = record->other_fields[0]->type;
 		t_type_info_member_ptr = make_type_pointer(c->allocator, t_type_info_member);
 
-		GB_ASSERT_MSG(record->field_count == 16, "Internal Compiler Error: Invalid `Type_Info` layout");
+		if (record->field_count != 16) {
+			gb_printf_err("Internal Compiler Error: Invalid `Type_Info` layout\n");
+			gb_exit(1);
+		}
 		t_type_info_named     = record->fields[ 1]->type;
 		t_type_info_integer   = record->fields[ 2]->type;
 		t_type_info_float     = record->fields[ 3]->type;
diff --git a/src/parser.cpp b/src/parser.cpp
index ec6aea9dc..08383fa94 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2741,6 +2741,45 @@ b32 try_add_import_path(Parser *p, String path, String rel_path, TokenPos pos) {
 	return true;
 }
 
+String get_fullpath_relative(gbAllocator a, String base_dir, String path) {
+	isize str_len = base_dir.len+path.len;
+	u8 *str = gb_alloc_array(gb_heap_allocator(), u8, str_len+1);
+	defer (gb_free(gb_heap_allocator(), str));
+
+	gb_memcopy(str, base_dir.text, base_dir.len);
+	gb_memcopy(str+base_dir.len, path.text, path.len);
+	str[str_len] = '\0';
+	// HACK(bill): memory leak
+	char *path_str = gb_path_get_full_name(a, cast(char *)str);
+	return make_string(path_str);
+}
+
+String get_fullpath_core(gbAllocator a, String path) {
+	char buf[300] = {};
+	u32 buf_len = GetModuleFileNameA(GetModuleHandleA(NULL), buf, gb_size_of(buf));
+	for (isize i = buf_len-1; i >= 0; i--) {
+		if (buf[i] == '\\' ||
+		    buf[i] == '/') {
+			break;
+		}
+		buf_len--;
+	}
+
+	char core[] = "core/";
+	isize core_len = gb_size_of(core)-1;
+
+	isize str_len = buf_len + core_len + path.len;
+	u8 *str = gb_alloc_array(gb_heap_allocator(), u8, str_len+1);
+	defer (gb_free(gb_heap_allocator(), str));
+
+	gb_memcopy(str, buf, buf_len);
+	gb_memcopy(str+buf_len, core, core_len);
+	gb_memcopy(str+buf_len+core_len, path.text, path.len);
+	str[str_len] = '\0';
+	// HACK(bill): memory leak
+	char *path_str = gb_path_get_full_name(a, cast(char *)str);
+	return make_string(path_str);}
+
 // NOTE(bill): Returns true if it's added
 b32 try_add_foreign_system_library_path(Parser *p, String import_file) {
 	gb_for_array(i, p->system_libraries) {
@@ -2803,6 +2842,7 @@ void parse_file(Parser *p, AstFile *f) {
 		}
 		base_dir.len--;
 	}
+	gbAllocator allocator = gb_heap_allocator(); // TODO(bill): Change this allocator
 
 	f->decls = parse_stmt_list(f);
 
@@ -2819,25 +2859,27 @@ void parse_file(Parser *p, AstFile *f) {
 				String file_str = id->relpath.string;
 
 				if (!is_import_path_valid(file_str)) {
-					syntax_error(ast_node_token(node), "Invalid `load` path");
+					if (id->is_load) {
+						syntax_error(ast_node_token(node), "Invalid #load path");
+					} else {
+						syntax_error(ast_node_token(node), "Invalid #import path");
+					}
 					continue;
 				}
 
-				isize str_len = base_dir.len+file_str.len;
-				u8 *str = gb_alloc_array(gb_heap_allocator(), u8, str_len+1);
-				defer (gb_free(gb_heap_allocator(), str));
-
-				gb_memcopy(str, base_dir.text, base_dir.len);
-				gb_memcopy(str+base_dir.len, file_str.text, file_str.len);
-				str[str_len] = '\0';
-				// HACK(bill): memory leak
-				char *path_str = gb_path_get_full_name(gb_heap_allocator(), cast(char *)str);
-				String import_file = make_string(path_str);
+				String import_file = {};
+				String rel_path = get_fullpath_relative(allocator, base_dir, file_str);
+				import_file = rel_path;
+				if (!gb_file_exists(cast(char *)rel_path.text)) { // NOTE(bill): This should be null terminated
+					String abs_path = get_fullpath_core(allocator, file_str);
+					if (gb_file_exists(cast(char *)abs_path.text)) {
+						import_file = abs_path;
+					}
+				}
 
 				id->fullpath = import_file;
-				if (!try_add_import_path(p, import_file, file_str, ast_node_token(node).pos)) {
-					// gb_free(gb_heap_allocator(), import_file.text);
-				}
+				try_add_import_path(p, import_file, file_str, ast_node_token(node).pos);
+
 			} else if (node->kind == AstNode_ForeignSystemLibrary) {
 				auto *id = &node->ForeignSystemLibrary;
 				String file_str = id->filepath.string;
@@ -2862,13 +2904,11 @@ ParseFileError parse_files(Parser *p, char *init_filename) {
 	gb_array_append(p->imports, init_imported_file);
 	p->init_fullpath = init_fullpath;
 
-	// {
-	// 	// IMPORTANT TODO(bill): Don't embed this, do it relative to the .exe
-	// 	char *path = gb_path_get_full_name(gb_heap_allocator(), "W:/Odin/core/__runtime.odin");
-	// 	String s = make_string(path);
-	// 	ImportedFile runtime_file = {s, s, init_pos};
-	// 	gb_array_append(p->imports, runtime_file);
-	// }
+	{
+		String s = get_fullpath_core(gb_heap_allocator(), make_string("runtime.odin"));
+		ImportedFile runtime_file = {s, s, init_pos};
+		gb_array_append(p->imports, runtime_file);
+	}
 
 	gb_for_array(i, p->imports) {
 		String import_path = p->imports[i].path;
diff --git a/src/string.cpp b/src/string.cpp
index 0e243f66e..496c81d26 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -13,8 +13,9 @@ typedef struct String {
 gb_inline String make_string(u8 *text, isize len) {
 	String s;
 	s.text = text;
-	if (len < 0)
+	if (len < 0) {
 		len = gb_strlen(cast(char *)text);
+	}
 	s.len = len;
 	return s;
 }