From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Sat, 21 May 2022 03:54:17 +0000 (-0500)
Subject: removed uses of 'package' keyword
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=042ea46f4d271a921e489ff4d806d731f0ae06ad;p=bar-game.git

removed uses of 'package' keyword
---

diff --git a/src/build.onyx b/src/build.onyx
index b5fc9a5..a03806a 100644
--- a/src/build.onyx
+++ b/src/build.onyx
@@ -7,8 +7,8 @@ MINOR_VERSION :: 1
 // DEBUG :: true
 
 
-#if (package runtime).arch == .X86_64  { #library_path "./lib" }
-#if (package runtime).arch == .AARCH64 { #library_path "./lib/aarch64" }
+#if runtime.arch == .X86_64  { #library_path "./lib" }
+#if runtime.arch == .AARCH64 { #library_path "./lib/aarch64" }
 
 #load "core/std"
 
diff --git a/src/entity/components/background.onyx b/src/entity/components/background.onyx
index 2336e17..3bce989 100644
--- a/src/entity/components/background.onyx
+++ b/src/entity/components/background.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 BackgroundComponent :: struct {
     use component: Component;
diff --git a/src/entity/components/collision_mask.onyx b/src/entity/components/collision_mask.onyx
index 9039347..ba1afff 100644
--- a/src/entity/components/collision_mask.onyx
+++ b/src/entity/components/collision_mask.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 CollisionMaskComponent :: struct {
     use component: Component;
diff --git a/src/entity/components/dispenser.onyx b/src/entity/components/dispenser.onyx
index e3d2635..61835b2 100644
--- a/src/entity/components/dispenser.onyx
+++ b/src/entity/components/dispenser.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 //
 // Currently, DispenserComponents only dispense Item_Entity's, and no
diff --git a/src/entity/components/entryway.onyx b/src/entity/components/entryway.onyx
index 2b1c651..c180189 100644
--- a/src/entity/components/entryway.onyx
+++ b/src/entity/components/entryway.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 EntrywayComponent :: struct {
     use component: Component;
diff --git a/src/entity/components/furniture.onyx b/src/entity/components/furniture.onyx
index 0ddd688..d538d80 100644
--- a/src/entity/components/furniture.onyx
+++ b/src/entity/components/furniture.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #local Furniture_Type :: enum {
     Seat;
diff --git a/src/entity/components/money.onyx b/src/entity/components/money.onyx
index d4e0c81..a4e1689 100644
--- a/src/entity/components/money.onyx
+++ b/src/entity/components/money.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #local Transaction :: struct {
     amount: i32;
diff --git a/src/entity/components/movement.onyx b/src/entity/components/movement.onyx
index 4928bbc..ae7f97f 100644
--- a/src/entity/components/movement.onyx
+++ b/src/entity/components/movement.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package glfw3
+use core
+use glfw3
 
 
 Facing :: enum {
diff --git a/src/entity/components/patron.onyx b/src/entity/components/patron.onyx
index 6c06a15..273ca47 100644
--- a/src/entity/components/patron.onyx
+++ b/src/entity/components/patron.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #local Patron_State :: enum {
     Walking_To_Seat;
diff --git a/src/entity/components/player.onyx b/src/entity/components/player.onyx
index e5ac921..450972b 100644
--- a/src/entity/components/player.onyx
+++ b/src/entity/components/player.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package glfw3
+use core
+use glfw3
 
 PlayerComponent :: struct {
     use base: Component;
diff --git a/src/entity/editor.onyx b/src/entity/editor.onyx
index 54c49c2..16a4501 100644
--- a/src/entity/editor.onyx
+++ b/src/entity/editor.onyx
@@ -7,10 +7,10 @@
 // - [x] Serialize / Deserialize a scene
 //
 
-use package core
-use package opengles
-use package glfw3
-#local type_info :: package runtime.info
+use core
+use opengles
+use glfw3
+#local type_info :: runtime.info
 
 Editor_Range        :: struct {min, max: f32;}
 Editor_Disabled     :: struct {}
diff --git a/src/entity/entities.onyx b/src/entity/entities.onyx
index e8cd663..a9cae56 100644
--- a/src/entity/entities.onyx
+++ b/src/entity/entities.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package glfw3
+use core
+use glfw3
 
 #tag Entity_Schematic.{
     (scene) => wall_create(scene, .{0,0}, .{0,0})
diff --git a/src/entity/items.onyx b/src/entity/items.onyx
index 3e35743..5f727c7 100644
--- a/src/entity/items.onyx
+++ b/src/entity/items.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 
 Item :: struct {
diff --git a/src/entity/scene.onyx b/src/entity/scene.onyx
index c9c7acc..cee5a5f 100644
--- a/src/entity/scene.onyx
+++ b/src/entity/scene.onyx
@@ -1,10 +1,10 @@
 
-use package core
-use package glfw3
+use core
+use glfw3
 
 Entity_Nothing :: cast(Entity_ID) 0
 Entity_ID :: #distinct u32
-#match    hash.to_u32 macro (e: Entity_ID) => (package core.hash).to_u32(cast(u32) e);
+#match    hash.to_u32 macro (e: Entity_ID) => core.hash.to_u32(cast(u32) e);
 #operator == (a, b: Entity_ID) => cast(u32) a == cast(u32) b;
 #operator != (a, b: Entity_ID) => cast(u32) a != cast(u32) b;
 
@@ -202,7 +202,7 @@ scene_create :: (width, height: f32) -> Scene {
 }
 
 #local scene_load_schematics :: (use this: ^Scene) {
-    use package runtime.info;
+    use runtime.info;
 
     index := 0;
     for type_table {
@@ -232,7 +232,7 @@ scene_create :: (width, height: f32) -> Scene {
             comp_type := cast(type_expr) index;
             if !component_vtables->has(comp_type) {
                 vtable := new(Component_Vtable, allocator=entity_allocator);
-                (package runtime.info).populate_struct_vtable(vtable, comp_type, safe=false);
+                runtime.info.populate_struct_vtable(vtable, comp_type, safe=false);
                 component_vtables[comp_type] = vtable;
             }
         }
@@ -270,7 +270,7 @@ scene_create_from_schematic :: (use this: ^Scene, schematic_name: str) -> ^Entit
 }
 
 scene_duplicate :: (use this: ^Scene, entity: ^Entity) -> ^Entity {
-    type_info :: package runtime.info
+    type_info :: runtime.info
 
     new_entity := this->make();
     new_entity.flags = entity.flags;
@@ -289,7 +289,7 @@ scene_duplicate :: (use this: ^Scene, entity: ^Entity) -> ^Entity {
 }
 
 scene_create_component :: (use this: ^Scene, component_type: type_expr) -> ^Component {
-    type_info :: package runtime.info
+    type_info :: runtime.info
 
     comp := cast(^Component) new(component_type, allocator=entity_allocator);
     comp.type = component_type;
@@ -309,7 +309,7 @@ scene_create_component :: (use this: ^Scene, component_type: type_expr) -> ^Comp
 }
 
 scene_modify_component :: macro (this: ^Scene, entity: ^Entity, $component_type: type_expr, init_block: Code) where IsComponent(^component_type) {
-    use package core.intrinsics.onyx {__initialize}
+    use core.intrinsics.onyx {__initialize}
 
     comp: ^component_type;
     if !entity->has(component_type) {
diff --git a/src/entity/schematics/background.onyx b/src/entity/schematics/background.onyx
index 5c6014e..8e87669 100644
--- a/src/entity/schematics/background.onyx
+++ b/src/entity/schematics/background.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 // #local background_texture: Texture;
 
diff --git a/src/entity/schematics/entryway.onyx b/src/entity/schematics/entryway.onyx
index 8ceac16..7329eab 100644
--- a/src/entity/schematics/entryway.onyx
+++ b/src/entity/schematics/entryway.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #tag Entity_Schematic.{ Entryway.create }
 Entryway :: struct {
diff --git a/src/entity/schematics/furniture.onyx b/src/entity/schematics/furniture.onyx
index 5ff56ab..5362952 100644
--- a/src/entity/schematics/furniture.onyx
+++ b/src/entity/schematics/furniture.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #tag Entity_Schematic.{
     (scene) => Furniture.create(scene, .{0, 0})
diff --git a/src/entity/schematics/patron.onyx b/src/entity/schematics/patron.onyx
index 197d1e7..17d60bd 100644
--- a/src/entity/schematics/patron.onyx
+++ b/src/entity/schematics/patron.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 #tag Entity_Schematic.{
     (scene) => Patron.create(scene, .{0,0})
diff --git a/src/entity/schematics/player.onyx b/src/entity/schematics/player.onyx
index 200a760..b13432b 100644
--- a/src/entity/schematics/player.onyx
+++ b/src/entity/schematics/player.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package glfw3
+use core
+use glfw3
 
 Player_Controls :: struct {
     up       : i32;
diff --git a/src/entity/store.onyx b/src/entity/store.onyx
index b216ea4..de00f7d 100644
--- a/src/entity/store.onyx
+++ b/src/entity/store.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 // Flags to control how a field of a structure is being stored
 // in the level file.
@@ -15,7 +15,7 @@ scene_save_to_file :: (use this: ^Scene, filename: str) {
 
     // writer := ^stdio.print_writer;
 
-    use package runtime.info;
+    use runtime.info;
 
     for entities {
         info := cast(^Type_Info_Struct) get_type_info(it.schematic);
@@ -38,7 +38,7 @@ scene_save_to_file :: (use this: ^Scene, filename: str) {
     }
 
     emit_struct_fields :: (v: any, dest: ^io.Writer, parent_name: str) {
-        use package runtime.info;
+        use runtime.info;
 
         info := cast(^Type_Info_Struct) get_type_info(v.type);
         assert(info.kind == .Struct, "Expected type to be a structure.");
@@ -101,7 +101,7 @@ scene_load_from_file :: (use this: ^Scene, filename: str, reset_scene := true) {
         next_entity_id = 0;
     }
 
-    use package runtime.info;
+    use runtime.info;
 
     current_entity: ^Entity;
     current_component: ^Component;
diff --git a/src/game.onyx b/src/game.onyx
index e453980..b76760e 100644
--- a/src/game.onyx
+++ b/src/game.onyx
@@ -1,7 +1,7 @@
 
-use package core
-use package glfw3
-use package opengles
+use core
+use glfw3
+use opengles
 
 //
 // Game Global Variables
diff --git a/src/gfx/canvas.onyx b/src/gfx/canvas.onyx
index eb2af3f..c8743d3 100644
--- a/src/gfx/canvas.onyx
+++ b/src/gfx/canvas.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package opengles
+use core
+use opengles
 
 
 Canvas :: struct {
diff --git a/src/gfx/font.onyx b/src/gfx/font.onyx
index 0cfcafb..136f12f 100644
--- a/src/gfx/font.onyx
+++ b/src/gfx/font.onyx
@@ -1,8 +1,8 @@
 
-use package core
-use package core.intrinsics.onyx {__zero_value}
-use package stb_truetype
-use package opengles
+use core
+use core.intrinsics.onyx {__zero_value}
+use stb_truetype
+use opengles
 
 #local {
     font_registry: Map(FontDescriptor, Font);
diff --git a/src/gfx/immediate.onyx b/src/gfx/immediate.onyx
index e9855d9..8a88eca 100644
--- a/src/gfx/immediate.onyx
+++ b/src/gfx/immediate.onyx
@@ -1,7 +1,7 @@
 
-use package core
-use package opengles
-use package glfw3
+use core
+use opengles
+use glfw3
 
 immediate_init :: () {
     memory.alloc_slice(^vertex_data, Maximum_Vertex_Count);
diff --git a/src/gfx/mesh.onyx b/src/gfx/mesh.onyx
index a269a7b..8264dff 100644
--- a/src/gfx/mesh.onyx
+++ b/src/gfx/mesh.onyx
@@ -1,5 +1,5 @@
-use package core
-use package opengles
+use core
+use opengles
 
 Mesh :: struct (Vertex_Type: type_expr) {
     handle: GLint;
@@ -23,7 +23,7 @@ mesh_make :: (verticies: [] $T, indicies: [] u32, gl_hint := GL_STATIC_DRAW) ->
     glBindBuffer(GL_ARRAY_BUFFER, mesh.vertex_handle);
     glBufferData(GL_ARRAY_BUFFER, sizeof T * verticies.count, verticies.data, gl_hint);
 
-    type_info :: package runtime.info
+    type_info :: runtime.info
     vertex_info := cast(^type_info.Type_Info_Struct) type_info.get_type_info(T);
     vertex_attr := 0;
     for attr: vertex_info.members {
diff --git a/src/gfx/shader.onyx b/src/gfx/shader.onyx
index 751c31f..711c6a0 100644
--- a/src/gfx/shader.onyx
+++ b/src/gfx/shader.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package opengles
+use core
+use opengles
 
 Shader :: struct {
     vs, fs: GLuint;
diff --git a/src/gfx/texture.onyx b/src/gfx/texture.onyx
index 289eb57..da353b9 100644
--- a/src/gfx/texture.onyx
+++ b/src/gfx/texture.onyx
@@ -1,8 +1,8 @@
 
-use package core
-use package core.intrinsics.onyx { __zero_value as Zero }
-use package opengles
-use package stb_image
+use core
+use core.intrinsics.onyx { __zero_value as Zero }
+use opengles
+use stb_image
 
 #local texture_cache: Map(str, Texture);
 
diff --git a/src/gfx/ui.onyx b/src/gfx/ui.onyx
index 82bc13f..11644bf 100644
--- a/src/gfx/ui.onyx
+++ b/src/gfx/ui.onyx
@@ -2,9 +2,9 @@
 // Very simple immediate mode UI
 //
 
-use package core
-use package opengles
-use package glfw3
+use core
+use opengles
+use glfw3
 
 UI_Id :: u32
 
@@ -712,10 +712,9 @@ scrolling_region_stop :: () {
     scroll_states : Map(UI_Id, Scroll_State);
 
     get_site_hash :: macro (site: CallSite, increment := 0) -> UI_Id {
-        hash :: package core.hash
-        file_hash   := hash.to_u32(site.file);
-        line_hash   := hash.to_u32(site.line);
-        column_hash := hash.to_u32(site.column);
+        file_hash   := core.hash.to_u32(site.file);
+        line_hash   := core.hash.to_u32(site.line);
+        column_hash := core.hash.to_u32(site.column);
 
         return ~~ (file_hash * 0x472839 + line_hash * 0x6849210 + column_hash * 0x1248382 + increment);
     }
diff --git a/src/main.onyx b/src/main.onyx
index a8ac1df..4155973 100644
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -1,8 +1,7 @@
 
-use package core
-use package opengles
-use package glfw3
-#local runtime :: package runtime
+use core
+use opengles
+use glfw3
 
 DEBUG :: #defined(runtime.vars.DEBUG)
 
diff --git a/src/sfx/audio_manager.onyx b/src/sfx/audio_manager.onyx
index 99708d2..159c25d 100644
--- a/src/sfx/audio_manager.onyx
+++ b/src/sfx/audio_manager.onyx
@@ -1,6 +1,6 @@
 
-use package core
-use package openal
+use core
+use openal
 
 Sound :: struct {
     buffer: u32;
diff --git a/src/sfx/wav_file.onyx b/src/sfx/wav_file.onyx
index ec8ed40..c5c9ee7 100644
--- a/src/sfx/wav_file.onyx
+++ b/src/sfx/wav_file.onyx
@@ -1,5 +1,5 @@
 
-use package core
+use core
 
 WAV_File :: struct {
     Format :: enum {