import and import_load as keywords; Fix procedure literal call trick

core/_preload.odin

@@ -1,9 +1,9 @@
 #shared_global_scope;
 
-#import "os.odin";
-#import "fmt.odin";
-#import "utf8.odin";
-#import "raw.odin";
+import "os.odin";
+import "fmt.odin";
+import "utf8.odin";
+import "raw.odin";
 
 // Naming Conventions:
 // In general, PascalCase for types and snake_case for values

core/atomics.odin

@@ -1,7 +1,7 @@
 // TODO(bill): Use assembly instead here to implement atomics
 // Inline vs external file?
 
-#import win32 "sys/windows.odin" when ODIN_OS == "windows";
+import win32 "sys/windows.odin" when ODIN_OS == "windows";
 var _ = compile_assert(ODIN_ARCH == "amd64"); // TODO(bill): x86 version
 
 

core/fmt.odin

@@ -1,9 +1,9 @@
-#import "os.odin";
-#import "mem.odin";
-#import "utf8.odin";
-#import "types.odin";
-#import "strconv.odin";
-#import "raw.odin";
+import "os.odin";
+import "mem.odin";
+import "utf8.odin";
+import "types.odin";
+import "strconv.odin";
+import "raw.odin";
 
 
 const _BUFFER_SIZE = 1<<12;

core/mem.odin

@@ -1,5 +1,5 @@
-#import "fmt.odin";
-#import "os.odin";
+import "fmt.odin";
+import "os.odin";
 
 proc swap(b: u16) -> u16 #foreign __llvm_core "llvm.bswap.i16";
 proc swap(b: u32) -> u32 #foreign __llvm_core "llvm.bswap.i32";

core/opengl.odin

@@ -1,8 +1,8 @@
 #foreign_system_library lib "opengl32.lib" when ODIN_OS == "windows";
 #foreign_system_library lib "gl" when ODIN_OS == "linux";
-#import win32 "sys/windows.odin" when ODIN_OS == "windows";
-#import "sys/wgl.odin" when ODIN_OS == "windows";
-#load "opengl_constants.odin";
+import win32 "sys/windows.odin" when ODIN_OS == "windows";
+import "sys/wgl.odin" when ODIN_OS == "windows";
+import_load "opengl_constants.odin";
 
 proc Clear         (mask: u32)                                #foreign lib "glClear";
 proc ClearColor    (r, g, b, a: f32)                          #foreign lib "glClearColor";

core/os.odin

@@ -1,6 +1,6 @@
-#load "os_windows.odin" when ODIN_OS == "windows";
-#load "os_x.odin"       when ODIN_OS == "osx";
-#load "os_linux.odin"   when ODIN_OS == "linux";
+import_load "os_windows.odin" when ODIN_OS == "windows";
+import_load "os_x.odin"       when ODIN_OS == "osx";
+import_load "os_linux.odin"   when ODIN_OS == "linux";
 
 proc write_string(fd: Handle, str: string) -> (int, Errno) {
 	return write(fd, []u8(str));

core/os_linux.odin

@@ -1,5 +1,4 @@
-// #import "fmt.odin";
-#import "strings.odin";
+import "strings.odin";
 
 type Handle   i32;
 type FileTime u64;

core/os_windows.odin

@@ -1,4 +1,4 @@
-#import win32 "sys/windows.odin";
+import win32 "sys/windows.odin";
 
 type Handle   int;
 type FileTime u64;

core/os_x.odin

@@ -1,5 +1,5 @@
-#import "fmt.odin";
-#import "strings.odin";
+import "fmt.odin";
+import "strings.odin";
 
 type Handle    i32;
 type FileTime  u64;

core/strconv.odin

@@ -1,4 +1,4 @@
-#import . "decimal.odin";
+import . "decimal.odin";
 
 type IntFlag enum {
 	Prefix = 1<<0,

core/sync.odin

@@ -1,2 +1,2 @@
-#load "sync_windows.odin" when ODIN_OS == "windows";
-#load "sync_linux.odin" when ODIN_OS == "linux";
+import_load "sync_windows.odin" when ODIN_OS == "windows";
+import_load "sync_linux.odin"   when ODIN_OS == "linux";

core/sync_linux.odin

@@ -1,5 +1,5 @@
-#import "atomics.odin";
-#import "os.odin";
+import "atomics.odin";
+import "os.odin";
 
 type Semaphore struct {
 	// _handle: win32.Handle,

core/sync_windows.odin

@@ -1,5 +1,5 @@
-#import win32 "sys/windows.odin" when ODIN_OS == "windows";
-#import "atomics.odin";
+import win32 "sys/windows.odin" when ODIN_OS == "windows";
+import "atomics.odin";
 
 type Semaphore struct {
 	_handle: win32.Handle,

core/sys/wgl.odin

@@ -1,5 +1,5 @@
 #foreign_system_library "opengl32.lib" when ODIN_OS == "windows";
-#import . "windows.odin";
+import . "windows.odin";
 
 const CONTEXT_MAJOR_VERSION_ARB          = 0x2091;
 const CONTEXT_MINOR_VERSION_ARB          = 0x2092;