changed #private to #package and #private_file to #local

diff --git a/data/test_console.onyx b/data/test_console.onyx
index b738107bbda6e89cc65d4118bcb989110cba883f..afde0520f47eb4acaa0cd9b29156e64d8796f1d7 100644 (file)
--- a/data/test_console.onyx
+++ b/data/test_console.onyx
@@ -3,7 +3,7 @@
 }
 
 use package core
 }
 
 use package core

-#private_file wasm :: package wasm_utils
+#local wasm :: package wasm_utils

 
 // Testing running on the console
 main :: (args: [] cstr) {
 
 // Testing running on the console
 main :: (args: [] cstr) {

diff --git a/src/app/app.onyx b/src/app/app.onyx
index a08216640058053d3f6c9505c20d1c1c90930bf0..ac4eead8f7cde9897f2079cdbd6ec515d1227268 100644 (file)
--- a/src/app/app.onyx
+++ b/src/app/app.onyx
@@ -1,6 +1,6 @@
 package app
 
 package app
 

-#private_file {
+#local {

     events  :: package js_events
     gl      :: package gl
     gfx     :: package immediate_mode
     events  :: package js_events
     gl      :: package gl
     gfx     :: package immediate_mode


@@ -48,7 +48,7 @@ Active_File :: struct {
     data := (#type [] u8).{ null, 0 };
 }
 
     data := (#type [] u8).{ null, 0 };
 }
 

-#private_file MAXIMUM_WINDOWS :: 128
+#local MAXIMUM_WINDOWS :: 128

 Application_Window :: struct {
     id: str;
 
 Application_Window :: struct {
     id: str;
 


@@ -412,7 +412,7 @@ open_tool_opener :: macro () {
 }
 
 @Relocate // This should be moved to somewhere else when the code base.
 }
 
 @Relocate // This should be moved to somewhere else when the code base.

-#private_file {
+#local {

     background_tile_texture : gfx.Texture;
 
     draw_background_lines :: (width, height: f32, line_color := gfx.Color4.{0.2, 0.2, 0.2}, line_spacing := 32.0f) {
     background_tile_texture : gfx.Texture;
 
     draw_background_lines :: (width, height: f32, line_color := gfx.Color4.{0.2, 0.2, 0.2}, line_spacing := 32.0f) {

diff --git a/src/app/colors.onyx b/src/app/colors.onyx
index 6a49d3504cbb264494ec22bbac090b4173759860..c051432ae2c5f23496f8497710a51b340f663501 100644 (file)
--- a/src/app/colors.onyx
+++ b/src/app/colors.onyx
@@ -2,7 +2,7 @@ package app
 
 use package core
 
 
 use package core
 

-#private_file {
+#local {

     events :: package js_events
     gl     :: package gl
     gfx    :: package immediate_mode
     events :: package js_events
     gl     :: package gl
     gfx    :: package immediate_mode

diff --git a/src/app/debug_log.onyx b/src/app/debug_log.onyx
index f703cef30ec5c3734a6706be8ab94a328690eb8d..35ba67ddd64d5579cce82c38a66533fb23e6f447 100644 (file)
--- a/src/app/debug_log.onyx
+++ b/src/app/debug_log.onyx
@@ -2,14 +2,14 @@ package debug
 
 use package core
 
 
 use package core
 

-#private_file {
+#local {

     app :: package app
     ui  :: package ui
     gfx :: package immediate_mode
     config :: package config
 }
 
     app :: package app
     ui  :: package ui
     gfx :: package immediate_mode
     config :: package config
 }
 

-#private {
+#package {

     scrollable_region := ui.Scrollable_Region_State.{};
 
     debug_log_y_offset := 0.0f;
     scrollable_region := ui.Scrollable_Region_State.{};
 
     debug_log_y_offset := 0.0f;


@@ -145,7 +145,7 @@ draw_debug_log :: (window_rectangle: ui.Rectangle, site := #callsite) {
     ui.draw_text(r, conv.str_format(buf, "H: {}\n", alloc.heap.get_watermark()));
 }
 
     ui.draw_text(r, conv.str_format(buf, "H: {}\n", alloc.heap.get_watermark()));
 }
 

-#private_file log_buffer : struct {
+#local log_buffer : struct {

     line_arena : alloc.arena.ArenaState;
     lines      : [..] str;
 }
     line_arena : alloc.arena.ArenaState;
     lines      : [..] str;
 }

diff --git a/src/app/editor.onyx b/src/app/editor.onyx
index 1d86b61858023059e5d0ddb8a4e9c4d83502335b..1e4b22e5231366ff4333385072f0d3f3761981be 100644 (file)
--- a/src/app/editor.onyx
+++ b/src/app/editor.onyx
@@ -1,6 +1,6 @@
 package editor
 
 package editor
 

-#private_file {
+#local {

     app :: package app
     ui :: package ui
     config :: package config
     app :: package app
     ui :: package ui
     config :: package config


@@ -46,7 +46,7 @@ editor_window_draw :: (obj: any, win: ^app.Application_Window, site := #callsite
 // The nitty-gritty of how everything is rendered.
 //
 
 // The nitty-gritty of how everything is rendered.
 //
 

-#private_file {
+#local {

     __counter : i32;
 
     msg_buffer : [512] u8;
     __counter : i32;
 
     msg_buffer : [512] u8;


@@ -186,7 +186,7 @@ editor_window_draw :: (obj: any, win: ^app.Application_Window, site := #callsite
     }
 }
 
     }
 }
 

-#private_file gfx :: package immediate_mode
+#local gfx :: package immediate_mode

 #tag gfx.Color4.r, Slider_Float.{ 0, 1 }
 #tag gfx.Color4.g, Slider_Float.{ 0, 1 }
 #tag gfx.Color4.b, Slider_Float.{ 0, 1 }
 #tag gfx.Color4.r, Slider_Float.{ 0, 1 }
 #tag gfx.Color4.g, Slider_Float.{ 0, 1 }
 #tag gfx.Color4.b, Slider_Float.{ 0, 1 }

diff --git a/src/app/settings.onyx b/src/app/settings.onyx
index f70efd1c5760d78a540aeee6d873e497a25fda5b..e6c6cfde98c221050411778e50a3976079e21611 100644 (file)
--- a/src/app/settings.onyx
+++ b/src/app/settings.onyx
@@ -1,6 +1,6 @@
 package app
 
 package app
 

-#private_file {
+#local {

     config :: package config
     editor :: package editor
 
     config :: package config
     editor :: package editor
 


@@ -58,7 +58,7 @@ settings_apply :: (settings: ^Application_Settings) {
 // Settings Window
 //
 
 // Settings Window
 //
 

-#private_file {
+#local {

     window_id   :: "settings"
     window_name :: "Settings"
 
     window_id   :: "settings"
     window_name :: "Settings"
 


@@ -71,7 +71,7 @@ settings_window_show :: () {
     move_window_to_top(window_id);
 }
 
     move_window_to_top(window_id);
 }
 

-#private_file
+#local

 settings_window_draw :: (_, win) => {
     editor.editor_window_draw(^state.settings, win);
 
 settings_window_draw :: (_, win) => {
     editor.editor_window_draw(^state.settings, win);
 

diff --git a/src/app/storage.onyx b/src/app/storage.onyx
index baa670c0bc5bfffa64cd88f689a6e5c635fd02ab..a8b060069513085dbe8074b4aa47e8e97cd3b73c 100644 (file)
--- a/src/app/storage.onyx
+++ b/src/app/storage.onyx
@@ -2,7 +2,7 @@
 
 package app.storage
 
 
 package app.storage
 

-#private_file {
+#local {

     memory :: package core.memory
 }
 
     memory :: package core.memory
 }
 


@@ -19,7 +19,7 @@ load :: (key: str, allocator := context.allocator) -> str {
     return buffer;
 }
 
     return buffer;
 }
 

-#private_file {
+#local {

     __local_storage_store        :: (key: str, value: str) -> void  #foreign "decompiler" "local_storage_store" ---
     __local_storage_value_length :: (key: str) -> i32               #foreign "decompiler" "local_storage_value_length" ---
     __local_storage_load         :: (key: str, buffer: str) -> void #foreign "decompiler" "local_storage_load" ---
     __local_storage_store        :: (key: str, value: str) -> void  #foreign "decompiler" "local_storage_store" ---
     __local_storage_value_length :: (key: str) -> i32               #foreign "decompiler" "local_storage_value_length" ---
     __local_storage_load         :: (key: str, buffer: str) -> void #foreign "decompiler" "local_storage_load" ---

diff --git a/src/app/window_management.onyx b/src/app/window_management.onyx
index 2168f6605234430c91616de1f6c221c830963e6c..8c9e660cbfc82350f2e952e65ec8dc15b65d9212 100644 (file)
--- a/src/app/window_management.onyx
+++ b/src/app/window_management.onyx
@@ -2,7 +2,7 @@ package app
 
 use package core
 
 
 use package core
 

-#private_file {
+#local {

     events :: package js_events
     gl     :: package gl
     gfx    :: package immediate_mode
     events :: package js_events
     gl     :: package gl
     gfx    :: package immediate_mode

diff --git a/src/app/window_switcher.onyx b/src/app/window_switcher.onyx
index 933f80f5db760e39f45a8cbb12cdbe1ea9c8c769..2e29e9e9b5bb4453cae4ab76df4cffe21f64cf67 100644 (file)
--- a/src/app/window_switcher.onyx
+++ b/src/app/window_switcher.onyx
@@ -1,6 +1,6 @@
 package app
 
 package app
 

-#private_file {
+#local {

     ui     :: package ui
     gfx    :: package immediate_mode
     config :: package config
     ui     :: package ui
     gfx    :: package immediate_mode
     config :: package config

diff --git a/src/app/work_units.onyx b/src/app/work_units.onyx
index 0f3c2c0b1f65627bb204f77272b0055629681b85..b8d15837ae5891236819924e6324a645373613e4 100644 (file)
--- a/src/app/work_units.onyx
+++ b/src/app/work_units.onyx
@@ -56,7 +56,7 @@ workers_being_used :: () -> [WORKER_COUNT] bool {
 }
 
 
 }
 
 

-#private_file {
+#local {

 
 WORKER_COUNT       :: 4
 MAXIMUM_WORK_UNITS :: 64
 
 WORKER_COUNT       :: 4
 MAXIMUM_WORK_UNITS :: 64

diff --git a/src/config.onyx b/src/config.onyx
index 7d9156b52bcc0a664354fede18761631fdca6acb..53cdb84020a3a270cb960295141ebb6150083dc7 100644 (file)
--- a/src/config.onyx
+++ b/src/config.onyx
@@ -30,7 +30,7 @@ Colors : struct {
 }
 
 
 }
 
 

-// This should be #private at some point, however right now it cannot be as this symbol is needed to query the fonts to load.
+// This should be #package at some point, however right now it cannot be as this symbol is needed to query the fonts to load.

 Fonts_Container :: struct {
     FontData :: struct (index: i32, fnt_file: str, tex_file: str) {}
 
 Fonts_Container :: struct {
     FontData :: struct (index: i32, fnt_file: str, tex_file: str) {}
 

diff --git a/src/features/hex_editor/hex_viewer.onyx b/src/features/hex_editor/hex_viewer.onyx
index 5b844f9de09b9c2bc164b2edf249f9f2bf47ce29..2a57ba31a78254ab1f9963c9b1ce6c88d123fada 100644 (file)
--- a/src/features/hex_editor/hex_viewer.onyx
+++ b/src/features/hex_editor/hex_viewer.onyx
@@ -1,6 +1,6 @@
 package feature.hex_viewer
 
 package feature.hex_viewer
 

-#private_file {
+#local {

     app    :: package app
     editor :: package editor
     ui     :: package ui
     app    :: package app
     editor :: package editor
     ui     :: package ui


@@ -24,7 +24,7 @@ Hex_Viewer_State :: struct {
 }
 
 // Should this be global? Or should each viewer window get their own?
 }
 
 // Should this be global? Or should each viewer window get their own?

-#private global_viewer_state := Hex_Viewer_State.{};
+#package global_viewer_state := Hex_Viewer_State.{};

 
 hex_window: ^app.Application_Window;
 
 
 hex_window: ^app.Application_Window;
 

diff --git a/src/features/text_editor/text_editor.onyx b/src/features/text_editor/text_editor.onyx
index 31e1ae68ccb8f23daf25d2a5c3cc11b76a23affa..5c55fcf563766d244387846e75c22ff7a20a1d4d 100644 (file)
--- a/src/features/text_editor/text_editor.onyx
+++ b/src/features/text_editor/text_editor.onyx
@@ -1,6 +1,6 @@
 package feature.text_editor
 
 package feature.text_editor
 

-#private_file {
+#local {

     app :: package app
     ui  :: package ui
     config :: package config
     app :: package app
     ui  :: package ui
     config :: package config

diff --git a/src/features/wasm/wasm.onyx b/src/features/wasm/wasm.onyx
index ade7ef663c4aaa9fadc4fb2119153614baa1dd95..46bf84eb55db3c205ce1092069b77f3af775fc47 100644 (file)
--- a/src/features/wasm/wasm.onyx
+++ b/src/features/wasm/wasm.onyx
@@ -1,6 +1,6 @@
 package feature.wasm
 
 package feature.wasm
 

-#private_file {
+#local {

     app        :: package app
     ui         :: package ui
     config     :: package config
     app        :: package app
     ui         :: package ui
     config     :: package config


@@ -13,7 +13,7 @@ package feature.wasm
     use package debug { debug_log }
 }
 
     use package debug { debug_log }
 }
 

-#private {
+#package {

     wasm_state    : WasmBinary;
     wasm_sections : WasmSections;
 
     wasm_state    : WasmBinary;
     wasm_sections : WasmSections;
 

diff --git a/src/main.onyx b/src/main.onyx
index 32b35e52984e67f1409816da2e5b05ffae50b2a4..93c5dd637c85fe8a750e12166201b230d427887c 100644 (file)
--- a/src/main.onyx
+++ b/src/main.onyx
@@ -1,5 +1,5 @@
 
 

-#private_file {
+#local {

     events :: package js_events
     config :: package config
     app    :: package app
     events :: package js_events
     config :: package config
     app    :: package app

diff --git a/src/ui/menubar.onyx b/src/ui/menubar.onyx
index 638c884b7095720c5645233a30d63a52aa3e09af..f78842edd3af2bf3f079877440c6e7978a30ca11 100644 (file)
--- a/src/ui/menubar.onyx
+++ b/src/ui/menubar.onyx
@@ -2,7 +2,7 @@
 
 package ui
 
 
 package ui
 

-#private_file {
+#local {

     iter   :: package core.iter
     config :: package config
 
     iter   :: package core.iter
     config :: package config
 

diff --git a/src/ui/window.onyx b/src/ui/window.onyx
index 2b99ea9cf34c6f81c50d77c03e42ed6dda13a515..ac4dab5fbd35715fd28b94d29e27d54cbad63776 100644 (file)
--- a/src/ui/window.onyx
+++ b/src/ui/window.onyx
@@ -1,6 +1,6 @@
 package ui
 
 package ui
 

-#private_file {
+#local {

     map :: package core.map
     editor :: package editor
 }
     map :: package core.map
     editor :: package editor
 }

diff --git a/src/wasm.onyx b/src/wasm.onyx
index a1db1f588682c1fdab8a19b37056b22211159398..73c6d74c52df398f71bc90362fa6f964a1ddd18e 100644 (file)
--- a/src/wasm.onyx
+++ b/src/wasm.onyx
@@ -2,7 +2,7 @@ package app
 
 use package core
 
 
 use package core
 

-#private_file {
+#local {

     ui     :: package ui
     gfx    :: package immediate_mode
     config :: package config
     ui     :: package ui
     gfx    :: package immediate_mode
     config :: package config