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.
35 lines
1.2 KiB
Plaintext
35 lines
1.2 KiB
Plaintext
// Compound type literals in expression position — `size_of` /
|
|
// `align_of` accept pointer (`*T`), optional (`?T`), array (`[N]T`),
|
|
// function (`(A) -> B`), and tuple (`(A, B)`) types directly. Also
|
|
// const-decl RHS aliases through the same forms (`Ptr :: *u8;` etc).
|
|
// Same shape as the existing `size_of(i32)` baseline path.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
// Unambiguous type-form const-decl aliases.
|
|
Ptr :: *u8;
|
|
Maybe :: ?u8;
|
|
Arr :: [3]u8;
|
|
Cb :: (i32) -> i32;
|
|
|
|
main :: () -> i32 {
|
|
// Direct: parser fix for *T, ?T + existing [N]T path.
|
|
print("size_of(*u8) = {}\n", size_of(*u8));
|
|
print("align_of(*u8) = {}\n", align_of(*u8));
|
|
print("size_of(?u8) = {}\n", size_of(?u8));
|
|
print("size_of([3]u8) = {}\n", size_of([3]u8));
|
|
|
|
// Function-type literal in expression position.
|
|
print("size_of((i32)->i32) = {}\n", size_of((i32) -> i32));
|
|
|
|
// Tuple literal reinterpreted as tuple type at the type-demanding site.
|
|
print("size_of((i32, i32)) = {}\n", size_of(Tuple(i32, i32)));
|
|
|
|
// Aliases.
|
|
print("size_of(Ptr) = {}\n", size_of(Ptr));
|
|
print("size_of(Maybe) = {}\n", size_of(Maybe));
|
|
print("size_of(Arr) = {}\n", size_of(Arr));
|
|
print("size_of(Cb) = {}\n", size_of(Cb));
|
|
0
|
|
}
|