989e18b760
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.
43 lines
1.4 KiB
Plaintext
43 lines
1.4 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/math";
|
|
#import "modules/build.sx";
|
|
#import "modules/std/test.sx";
|
|
pkg :: #import "tests/fixtures/testpkg";
|
|
|
|
main :: () {
|
|
|
|
// --- UFCS Aliases & Pipe ---
|
|
{
|
|
print("=== UFCS Aliases ===\n");
|
|
|
|
num_sum :: (a: i64, b: i64) -> i64 { a + b }
|
|
sum :: ufcs num_sum;
|
|
|
|
print("{}\n", num_sum(40, 2)); // 42 — direct call
|
|
print("{}\n", sum(40, 2)); // 42 — alias direct call
|
|
print("{}\n", 40 |> sum(2)); // 42 — pipe UFCS via alias
|
|
|
|
print("{}\n", num_sum(40, 2)); // 42 — direct (was tuple full-splat)
|
|
print("{}\n", 40 |> sum(2)); // 42 — pipe (was tuple partial-splat)
|
|
|
|
compute :: (a: i64, b: i64, c: i64, d: i64) -> i64 { a + b * c - d }
|
|
calc :: ufcs compute;
|
|
|
|
print("{}\n", compute(1, 2, 3, 4)); // 1+2*3-4 = 3 (was tuple full-splat)
|
|
print("{}\n", compute(1, 2, 3, 4)); // same = 3 (was tuple partial-splat)
|
|
print("{}\n", 1 |> calc(2, 3, 4)); // same = 3 — pipe UFCS
|
|
|
|
// Tuple return type
|
|
swap :: (a: i64, b: i64) -> Tuple(i64, i64) { .(b, a) }
|
|
s := swap(1, 2);
|
|
a := s.0;
|
|
b := s.1;
|
|
print("{}\n", a); // 2
|
|
print("{}\n", b); // 1
|
|
|
|
wrap :: (x: i64) -> Tuple(i64) { .(x) } // 1-tuple needs trailing comma; (i64) groups
|
|
t := wrap(99);
|
|
print("{}\n", t.0); // 99
|
|
}
|
|
}
|