Replace the bare-paren tuple grammar with explicit, position-unambiguous
forms, mirroring how structs work:
type `(A, B)` -> `Tuple(A, B)` (named keeps `:`)
value `(a, b)` -> `.(a, b)` (named uses `=`)
typed (new) -> `Tuple(A, B).(a, b)` (like `Point.{...}`)
failable `-> (T, !)` -> `-> T !`
`-> (T1, T2, !)`-> `-> Tuple(T1, T2) !` (channel outside Tuple)
Bare `(...)` is now grouping only, everywhere; a comma in bare parens is a
hard error with a migration hint. Grouping, function types `(A, B) -> R`,
param lists, lambdas, and match bindings are unaffected.
`Tuple(...)` is strictly a TYPE in every position (including `size_of` /
`type_info` args); a tuple VALUE comes only from `.(...)` (anonymous) or
`Tuple(...).(...)` (explicitly typed). A bare `Tuple(1, 2)` is a tuple
type with non-type elements -> rejected.
The ~110 tuple-bearing corpus files were migrated with a one-shot
AST-aware migrator (the `sx migrate` tool from the prior commit, removed
here). New examples: 0130 (new syntax), 0131 (typed construction), 1060
(named-tuple failable return). 1116 golden updated for the new hint text.
21 lines
588 B
Plaintext
21 lines
588 B
Plaintext
#import "modules/std.sx";
|
|
#import "modules/ui/types.sx";
|
|
#import "modules/ui/glyph_cache.sx";
|
|
|
|
// Global glyph cache pointer for views (Label, Button) to access
|
|
g_font : *GlyphCache = null;
|
|
|
|
set_global_font :: (font: *GlyphCache) {
|
|
g_font = font;
|
|
}
|
|
|
|
// Convenience measurement function for views
|
|
measure_text :: (text: string, font_size: f32) -> Size {
|
|
if g_font == null {
|
|
// Fallback approximate measurement
|
|
scale := font_size / 16.0;
|
|
return Size.{ width = xx text.len * 8.0 * scale, height = font_size };
|
|
}
|
|
g_font.measure_text(text, font_size)
|
|
}
|