nomen-lang 0.8.0 → 0.9.0

package/core/System/ClassBuffer.nm

@@ -65,7 +65,7 @@ pub struct ClassBuffer<T> {
 	// handles, so the slot's CONTENT is the instance pointer: return the
 	// stored word, not the slot's address. Library-internal: bounds are the
 	// caller's obligation (the List wrapper constrains them).
-	pub func slot_ptr = (ref self, int i, out ptr T) {
+	internal func slot_ptr = (ref self, int i, out ptr T) {
 		```
 		#arch: c
 		// The slot's address: through the alias, reads and writes hit the
@@ -118,6 +118,15 @@ pub struct ClassBuffer<T> {
 		```
 	}
 
+	// Labeled delegation point for raw-body callers in other containers
+	// (StableList's chunked storage calls this): `load` is `inline` — spliced
+	// at Nomen call sites, so no label exists for a raw C call or `bl` to
+	// target. Mirror of Buffer.load_from (class slots are pointer words —
+	// the pointer load IS the borrow form).
+	internal func load_from = (self, int i: i >= 0 && i < self.cap, out T) {
+		return self.load(i)
+	}
+
 	// Store the owned class pointer `val` into slot `i`, which MUST be fresh
 	// (calloc'd, or zeroed by mv/move_int). Takes OWNERSHIP of `val`
 	// (`mv`): the slot's #destroy reclaims the instance, so the caller must
@@ -141,6 +150,42 @@ pub struct ClassBuffer<T> {
 		```
 	}
 
+	// Initialize this buffer as a VIEW over a foreign slab (INTERNAL — the
+	// chunked-container primitive): `data` becomes `slab` and `cap` becomes
+	// `fill`, and the buffer owns NOTHING — the slab keeps its real owner
+	// (never grown, never freed by the view). Mirror of Buffer.init_view;
+	// class slots are pointer words.
+	internal func init_view = (ref self, uint64 slab, int fill: fill >= 0) {
+		self.data = slab
+		self.cap = fill
+	}
+
+	// Clear a view initialized by init_view (see Buffer.clear_view): the
+	// holder's own field destroy then reclaims nothing.
+	internal func clear_view = (ref self) {
+		self.data = 0
+		self.cap = 0
+	}
+
+	// Store the owned class pointer `val` into slot `slot` of a foreign slab
+	// at `slab` (fill `fill`) through this buffer as a transient view —
+	// INTERNAL (StableList's directory chunks, class elements): init the
+	// view, run the typed `store` (the ownership-transferring slot store),
+	// then clear the view so the holder's teardown reclaims nothing. The
+	// holder passes a ClassBuffer FIELD, never a local (a local owning buffer
+	// is auto-destroyed at scope exit and would free the borrowed slab).
+	internal func store_in_slab = (
+		ref self,
+		uint64 slab,
+		int fill: fill >= 0,
+		int slot: slot >= 0,
+		mv T val
+	) {
+		self.init_view(slab, fill)
+		self.store(slot, val)
+		self.clear_view()
+	}
+
 	// Move a class pointer out of a slot: return it and zero the slot so the
 	// buffer no longer references it. Declared `mv out T` so the borrow
 	// checker treats the result as OWNED — the slot is relinquished, so the
@@ -278,6 +323,40 @@ pub struct ClassBuffer<T> {
 		```
 	}
 
+	// Reclaim slot i's owned class pointer (destroy + free) WITHOUT writing
+	// the slot — the destroy half of replace_int, without the store, zeroing
+	// the handle so a re-destroy is a no-op. The caller (Map.set_slot_ptr's
+	// replace path — the value-side sibling of `values.replace`) overwrites
+	// the slot immediately afterwards. Contract: the slot must be
+	// overwritten before it is read or destroyed again.
+	internal func destroy_at = (ref self, int i: i >= 0 && i < self.cap) {
+		```
+		#arch: c
+		long *slots = (long*)(unsigned long long)self->data;
+		if (slots[i]) {
+			T_destroy((void*)slots[i]);
+			free((void*)slots[i]);
+			slots[i] = 0;
+		}
+		```
+		```
+		#arch: aarch64
+		stp x20, x21, [sp, #-16]!
+		ldr x20, [x19, #8]
+		lsl x3, x1, #3
+		add x20, x20, x3
+		ldr x0, [x20]
+		cbz x0, .Lcb_destroy_at_done
+		mov x21, x0
+		bl T_destroy
+		mov x0, x21
+		bl _free
+		str xzr, [x20]
+		.Lcb_destroy_at_done:
+		ldp x20, x21, [sp], #16
+		```
+	}
+
 	// T-typed alias of replace_int: free the outgoing class pointer (destroy +
 	// free) then store the new one. Used by List.set so the uniform API
 	// preserves ownership for class elements.
@@ -363,6 +442,59 @@ pub struct ClassBuffer<T> {
 		```
 	}
 
+	// Bulk transfer for backward-shift deletion — the ClassBuffer
+	// counterpart of Buffer.move_range (same contract: every slot in
+	// [dst, dst + count) must be DEAD — zeroed by a move-out or otherwise
+	// unowned — because the block move overwrites without reclaiming; the
+	// deletion algorithms zero and relocate in lockstep). Slots are 8-byte
+	// instance pointers, so the block is one memmove + one memset of the
+	// source slots the destination never covers — List.remove_at_or_panic's
+	// whole-tail shift instead of per-element `shift` calls.
+	internal inline func move_range = (
+		ref self,
+		int dst: dst >= 0,
+		int src: src >= dst,
+		int count: count >= 0 && src + count <= self.cap
+	) {
+		```
+		#arch: c
+		if (count > 0) {
+			long *slots = (long*)(unsigned long long)self->data;
+			memmove((void*)&slots[dst], (void*)&slots[src],
+				(unsigned long long)count * sizeof(long));
+			memset((void*)&slots[dst + count], 0,
+				(unsigned long long)(src - dst) * sizeof(long));
+		}
+		```
+		```
+		#arch: aarch64
+		// x19 = self, x1 = dst, x2 = src, x3 = count. x0-x18 die across the
+		// bl calls, so the block math parks on the stack around _memmove.
+		cbz x3, .Lcb_move_range_T_end
+		ldr x4, [x19, #8]
+		lsl x5, x1, #3
+		add x6, x4, x5
+		lsl x5, x2, #3
+		add x7, x4, x5
+		lsl x9, x3, #3
+		sub x10, x2, x1
+		lsl x10, x10, #3
+		stp x6, x9, [sp, #-16]!
+		str x10, [sp, #-16]!
+		mov x0, x6
+		mov x1, x7
+		mov x2, x9
+		bl _memmove
+		ldr x10, [sp], #16
+		ldp x6, x9, [sp], #16
+		add x0, x6, x9
+		mov x1, #0
+		mov x2, x10
+		bl _memset
+		.Lcb_move_range_T_end:
+		```
+	}
+
 	// A non-mv (ptr, len) slice [start, end) over this buffer's class
 	// pointers, returned as a `view T` (T is a class, so each element is an
 	// 8-byte pointer). Borrows from self — invalidated on reassignment. Mirrors

package/core/System/Controls/Alert.nm

@@ -12,13 +12,13 @@
  * UIAlertController needs a presenting view controller (TODO stubs; see
  * GUI_PLAN Tier 1 #19).
  **/
-pub mv struct Alert : Control {
+pub mv struct Alert: Control {
 	var uint64 handle = 0
 
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self) {
 		```

package/core/System/Controls/App.nm

@@ -102,7 +102,7 @@ pub trait App {
 pub mv struct FrameEvents {
 	// 0 = no mouse-down this frame, 1 = left, 2 = right (edge-triggered:
 	// only the frame that pumped the event reports it).
-	pub var int click = 0
+	pub var click = 0
 	pub var int click_x = -1
 	pub var int click_y = -1
 	// The full mouse record for this frame (0 = no mouse-down): the 1-based
@@ -112,14 +112,14 @@ pub mv struct FrameEvents {
 	// 0x40000, Shift = 0x20000). The same values the `win.mouse_button()` /
 	// `mouse_click_count()` / `mouse_modifiers()` getters report to
 	// `on_mouse_down` handlers. `click` remains the left/right compat view.
-	pub var int mouse_button = 0
-	pub var int mouse_click_count = 0
-	pub var int mouse_modifiers = 0
+	pub var mouse_button = 0
+	pub var mouse_click_count = 0
+	pub var mouse_modifiers = 0
 	// This frame's accumulated scroll-wheel deltas (dy positive scrolling
 	// up/away, dx positive right; trackpad frames sum every small event).
 	// `Scrollable.on_scroll` is the registered-handler form.
-	pub var int scroll_dx = 0
-	pub var int scroll_dy = 0
+	pub var scroll_dx = 0
+	pub var scroll_dy = 0
 	// The keyboard record for this frame (-1 = no key this frame): the
 	// hardware keycode of the last key-down (Space = 49, Return = 36,
 	// arrows = 123–126, letters a…z = 0–25), the modifiers at key-down,
@@ -127,8 +127,8 @@ pub mv struct FrameEvents {
 	// `on_key_down` / `on_key_up` are the registered-handler forms; text
 	// ENTRY flows through `on_input` (the field editor), not here.
 	pub var int key_code = -1
-	pub var int key_modifiers = 0
-	pub var bool key_repeat = false
+	pub var key_modifiers = 0
+	pub var key_repeat = false
 	pub var int key_up_code = -1
 	// The pointer-MOVE record for this frame (-1 = no movement): the
 	// current pointer position. `on_mouse_move` is the registered-handler
@@ -137,11 +137,11 @@ pub mv struct FrameEvents {
 	pub var int mouse_y = -1
 	// Milliseconds since the previous frame (0 on the first) — the
 	// animation clock. `win.dt()` reports the same value.
-	pub var int dt = 0
+	pub var dt = 0
 	// True when the window's content rect changed since the last frame —
 	// the framework has already re-laid-out the registered roots; re-layout
 	// App-owned panes (tab pages, split panes) here.
-	pub var bool resized = false
-	pub var int width = 0
-	pub var int height = 0
+	pub var resized = false
+	pub var width = 0
+	pub var height = 0
 }

package/core/System/Controls/Button.nm

@@ -12,7 +12,7 @@ pub mv struct Button: Control {
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window, string title) {
 		```

package/core/System/Controls/CheckBox.nm

@@ -6,13 +6,13 @@
  * `#destroy` releases what the handle names. The constructor's `self` is
  * the inline instance (the `.` accessor); methods keep the pointer form.
  **/
-pub mv struct CheckBox : Control {
+pub mv struct CheckBox: Control {
 	var uint64 handle = 0
 
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window) {
 		```

package/core/System/Controls/ColorPicker.nm

@@ -18,7 +18,7 @@ pub struct Rgb {
  * Components travel as 0-255 ints; the platform stores 0-1 doubles, so the
  * round trip is exact to ±1 (the getters round).
  **/
-pub mv struct ColorPicker : Control {
+pub mv struct ColorPicker: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/ComboBox.nm

@@ -12,7 +12,7 @@
  * macOS-only (NSComboBox has no iOS counterpart — see GUI_PLAN Tier 2; the
  * iOS blocks are TODO stubs).
  **/
-pub mv struct ComboBox : Control {
+pub mv struct ComboBox: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Container.nm

@@ -2394,7 +2394,13 @@ pub func nomen_scroll_measure = (ref Container grid, int max_w, out [int, int])
 // aarch64_use_c function routes to the C companion using only its raw
 // blocks, so any Nomen statement here would be silently dropped
 // (FOLLOWUP.md) — the measure goes through nomen_scroll_measure instead.
-pub func nomen_scroll_thunk = (ref Container grid, uint64 sv, uint64 doc, ref Window win, int first) {
+pub func nomen_scroll_thunk = (
+	ref Container grid,
+	uint64 sv,
+	uint64 doc,
+	ref Window win,
+	int first
+) {
 	```
 	#arch: c
 	#platform: macos

package/core/System/Controls/GroupBox.nm

@@ -9,7 +9,7 @@
  * NSBox in its primary style with a title. macOS-only — iOS has no boxed
  * group view (TODO stubs; see GUI_PLAN Tier 1 #17).
  **/
-pub mv struct GroupBox : Control {
+pub mv struct GroupBox: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window, string title) {

package/core/System/Controls/ImageView.nm

@@ -10,7 +10,7 @@
  * symbol/SF Symbol set. A failed load leaves the view empty (`has_image`
  * reads false) — there is no error channel for images.
  **/
-pub mv struct ImageView : Control {
+pub mv struct ImageView: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/LevelIndicator.nm

@@ -10,7 +10,7 @@
  * Tier 1 #16 — the iOS blocks are TODO stubs). Styles: 0 relevancy,
  * 1 discrete capacity, 2 continuous capacity, 3 rating (stars).
  **/
-pub mv struct LevelIndicator : Control {
+pub mv struct LevelIndicator: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/ListView.nm

@@ -22,7 +22,7 @@
  * any document view. iOS defers to UITableView (TODO stubs; see GUI_PLAN
  * Tier 2).
  **/
-pub mv struct ListView : Control {
+pub mv struct ListView: Control {
 	var uint64 handle = 0
 	var uint64 table = 0
 

package/core/System/Controls/Menu.nm

@@ -17,7 +17,7 @@
  * Interaction needs a scene-attached view — see GUI_PLAN Tier 2; the iOS
  * blocks are TODO stubs).
  **/
-pub mv struct Menu : Control {
+pub mv struct Menu: Control {
 	var uint64 handle = 0
 
 	// File-scope helper: the shared item target. The action records the

package/core/System/Controls/OutlineView.nm

@@ -18,7 +18,7 @@
  * lesson). macOS-only (no iOS counterpart; see GUI_PLAN Tier 2 — the iOS
  * blocks are TODO stubs).
  **/
-pub mv struct OutlineView : Control {
+pub mv struct OutlineView: Control {
 	var uint64 handle = 0
 	var uint64 tree = 0
 

package/core/System/Controls/Pagination.nm

@@ -28,7 +28,7 @@ pub mv struct Pagination {
 	// The up-call plumbing: the dispatch id the app enrolled (—1 = none)
 	// and whether a page change is waiting for the next tick.
 	var int page_change_id = -1
-	var bool page_change_pending = false
+	var page_change_pending = false
 
 	pub func #init = (self, Window window, int pages: pages > 0 && pages <= 5) {
 		self.prev = Button(window, "<")
@@ -56,13 +56,13 @@ pub mv struct Pagination {
 		// spares can never be clicked). The closures hoist to hidden methods
 		// on Pagination and run with `ref self` — the app's dispatch
 		// forwards into the field that hosts the row. No polls to starve.
-		self.prev.on_click(func () { self.prev() })
-		self.next.on_click(func () { self.next() })
-		self.b0.on_click(func () { self.select(0) })
-		self.b1.on_click(func () { self.select(1) })
-		self.b2.on_click(func () { self.select(2) })
-		self.b3.on_click(func () { self.select(3) })
-		self.b4.on_click(func () { self.select(4) })
+		self.prev.on_click(func() { self.prev() })
+		self.next.on_click(func() { self.next() })
+		self.b0.on_click(func() { self.select(0) })
+		self.b1.on_click(func() { self.select(1) })
+		self.b2.on_click(func() { self.select(2) })
+		self.b3.on_click(func() { self.select(3) })
+		self.b4.on_click(func() { self.select(4) })
 	}
 
 	// Wire the row into the caller's grid under `parent`.

package/core/System/Controls/Popover.nm

@@ -22,7 +22,7 @@ pub struct PopSize {
 	pub var height = 0
 }
 
-pub mv struct Popover : Control {
+pub mv struct Popover: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Progress.nm

@@ -10,7 +10,7 @@
  * For the spinning variant (macOS styles the SAME control differently, iOS
  * uses a distinct class) see `Spinner`.
  **/
-pub mv struct Progress : Control {
+pub mv struct Progress: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Radio.nm

@@ -12,13 +12,13 @@
  * the rest. The control itself is a CheckBox sibling (button type 4,
  * NSRadioButton). iOS defers to Segmented or a checkmark list.
  **/
-pub mv struct Radio : Control {
+pub mv struct Radio: Control {
 	var uint64 handle = 0
 
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window, string title) {
 		```

package/core/System/Controls/SearchField.nm

@@ -9,7 +9,7 @@
  * NSSearchField gives the magnifier icon, placeholder, and Cancel button for
  * free; UISearchTextField is the iOS 13+ equivalent.
  **/
-pub mv struct SearchField : Control {
+pub mv struct SearchField: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/SecureField.nm

@@ -9,7 +9,7 @@
  * A distinct native class on both platforms (NSSecureTextField is NOT
  * NSTextField), so it lands as its own control rather than a TextBox mode.
  **/
-pub mv struct SecureField : Control {
+pub mv struct SecureField: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Segmented.nm

@@ -9,7 +9,7 @@
  * The segment count is fixed at construction; labels and the selection are
  * set/poll per frame like every other control.
  **/
-pub mv struct Segmented : Control {
+pub mv struct Segmented: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window, int count) {

package/core/System/Controls/Select.nm

@@ -10,7 +10,7 @@
  * polled after each event batch. iOS needs a picker or action sheet and
  * defers (TODO stubs below; see GUI_PLAN Tier 1 #9).
  **/
-pub mv struct Select : Control {
+pub mv struct Select: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Separator.nm

@@ -10,7 +10,7 @@
  * the frame's aspect (wide = horizontal, tall = vertical). macOS-only —
  * iOS has no separator view (TODO stubs; see GUI_PLAN Tier 1 #17).
  **/
-pub mv struct Separator : Control {
+pub mv struct Separator: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Sheet.nm

@@ -15,7 +15,7 @@
  * defers to UISheetPresentationController (TODO stubs; see GUI_PLAN
  * Tier 1 #20).
  **/
-pub mv struct Sheet : Control {
+pub mv struct Sheet: Control {
 	var uint64 handle = 0
 	var uint64 host = 0
 

package/core/System/Controls/Slider.nm

@@ -8,7 +8,7 @@
  *
  * Continuous control: read `value` each frame in the manual event loop.
  **/
-pub mv struct Slider : Control {
+pub mv struct Slider: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window, float min, float max) {

package/core/System/Controls/Spinner.nm

@@ -11,9 +11,9 @@
  * tracked at the Nomen level (NSProgressIndicator has no isSpinning getter),
  * so `is_spinning` reads true exactly between start() and stop().
  **/
-pub mv struct Spinner : Control {
+pub mv struct Spinner: Control {
 	var uint64 handle = 0
-	var bool spinning = false
+	var spinning = false
 
 	pub func #init = (self, Window window) {
 		```

package/core/System/Controls/SplitView.nm

@@ -21,7 +21,7 @@
  * UISplitViewController (a view-controller-level type — see GUI_PLAN
  * Tier 2; the iOS blocks are TODO stubs).
  **/
-pub mv struct SplitView : Control {
+pub mv struct SplitView: Control {
 	var uint64 handle = 0
 
 	// File-scope helper: the pane view class (answers `-contentView` with

package/core/System/Controls/Stepper.nm

@@ -9,7 +9,7 @@
  * Pair with a TextBox for the "number input" composition (gpui-kit's
  * number-input is exactly that pairing).
  **/
-pub mv struct Stepper : Control {
+pub mv struct Stepper: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Switch.nm

@@ -8,7 +8,7 @@
  *
  * Pairs with CheckBox: check = task state, switch = preference.
  **/
-pub mv struct Switch : Control {
+pub mv struct Switch: Control {
 	var uint64 handle = 0
 
 	pub func #init = (self, Window window) {

package/core/System/Controls/Table.nm

@@ -19,7 +19,7 @@
  * `List<T>` lesson). macOS-only (no iOS counterpart for a plain embeddable
  * grid; see GUI_PLAN Tier 2 — the iOS blocks are TODO stubs).
  **/
-pub mv struct Table : Control {
+pub mv struct Table: Control {
 	var uint64 handle = 0
 	var uint64 table = 0
 

package/core/System/Controls/Tabs.nm

@@ -17,7 +17,7 @@
  * NSTabView counterpart (UITabBarController is app-level chrome — see
  * GUI_PLAN Tier 2; defer with TODO stubs).
  **/
-pub mv struct Tabs : Control {
+pub mv struct Tabs: Control {
 	var uint64 handle = 0
 
 	// File-scope helper: the page view class. It answers `-contentView` with

package/core/System/Controls/Text.nm

@@ -18,7 +18,7 @@ pub mv struct Text: Control {
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window) {
 		```

package/core/System/Controls/TextBox.nm

@@ -6,13 +6,13 @@
  * `#destroy` releases what the handle names. The constructor's `self` is
  * the inline instance (the `.` accessor); methods keep the pointer form.
  **/
-pub mv struct TextBox : Control {
+pub mv struct TextBox: Control {
 	var uint64 handle = 0
 
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window) {
 		```

package/core/System/Controls/TextView.nm

@@ -17,7 +17,7 @@ pub mv struct TextView: Control {
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window) {
 		```

package/core/System/Controls/Toggle.nm

@@ -10,13 +10,13 @@
  * selected state. Where `Button` is momentary, `Toggle` stays depressed
  * until clicked again (toolbar-style).
  **/
-pub mv struct Toggle : Control {
+pub mv struct Toggle: Control {
 	var uint64 handle = 0
 
 	// The `#handle` hook synthesizes `NameHandle` — a copyable, non-owning
 	// twin (same public bare-self methods, no destroy) so closures can
 	// capture this control without moving it. See GUI.md, "Handles".
-	#handle = () {}
+	#handle = () { }
 
 	pub func #init = (self, Window window, string title) {
 		```

package/core/System/Controls/Toolbar.nm

@@ -17,7 +17,7 @@
  * already make). macOS-only (NSToolbar has no iOS counterpart; see GUI_PLAN
  * Tier 2 — the iOS blocks are TODO stubs).
  **/
-pub mv struct Toolbar : Control {
+pub mv struct Toolbar: Control {
 	var uint64 handle = 0
 
 	// File-scope helper: the shared delegate + action recorder (shared — one

package/core/System/Controls/Window.nm

@@ -1354,7 +1354,7 @@ pub mv struct Window: Control {
 		self.relayout(1)
 		var int prev_w = self.content_width()
 		var int prev_h = self.content_height()
-		var FrameEvents ev = FrameEvents()
+		var ev = FrameEvents()
 		while self.is_visible() {
 			// Close interception: the delegate refused the native close and
 			// set the pending flag; consult the app. Accept → forced close
@@ -1853,7 +1853,6 @@ pub func nomen_control_take_input = (uint64 handle, out bool) {
 	```
 }
 
-
 pub func nomen_window_clicks_init = (uint64 handle) {
 	```
 	#arch: c