parser: Accept derives after positional fields
446b6f4b196a23831b720d1cd13b5cc16c39dc2630a234a45703fafb2c45e3b1
Allow positional records to place their derive list after the fields. Keep declarations with derives before the fields valid so the checked-in seed can build the compiler that supports both forms. Assisted-by: Codex:gpt-6-astra
1 parent
026ca4cb
lib/std/lang/parser.rad
+4 -1
| 1693 | 1693 | throws (ParseError) |
|
| 1694 | 1694 | { |
|
| 1695 | 1695 | try expect(p, scanner::TokenKind::Record, "expected `record`"); |
|
| 1696 | 1696 | ||
| 1697 | 1697 | let name = try parseIdent(p, "expected record name"); |
|
| 1698 | - | let derives = try parseDerives(p); |
|
| 1698 | + | let mut derives = try parseDerives(p); |
|
| 1699 | 1699 | ||
| 1700 | 1700 | if consume(p, scanner::TokenKind::LParen) { |
|
| 1701 | 1701 | let fields = try parseRecordFields(p, RecordFieldMode::Unlabeled); |
|
| 1702 | + | if derives.len == 0 { |
|
| 1703 | + | set derives = try parseDerives(p); |
|
| 1704 | + | } |
|
| 1702 | 1705 | try expect(p, scanner::TokenKind::Semicolon, "expected `;` after record"); |
|
| 1703 | 1706 | return node(p, ast::NodeValue::RecordDecl( |
|
| 1704 | 1707 | ast::RecordDecl { name, fields, attrs, derives, labeled: false } |
|
| 1705 | 1708 | )); |
|
| 1706 | 1709 | } else { |
lib/std/lang/parser/tests.rad
+15 -0
| 930 | 930 | try testing::expect(decl.derives.len == 2); |
|
| 931 | 931 | try expectIdent(decl.derives[0], "Eq"); |
|
| 932 | 932 | try expectIdent(decl.derives[1], "Debug"); |
|
| 933 | 933 | } |
|
| 934 | 934 | ||
| 935 | + | /// Positional record derives can follow the name or the fields. |
|
| 936 | + | @test unsafe fn testParseTupleRecordDerives() throws (testing::TestError) { |
|
| 937 | + | for source in ["record Pair: Eq + Debug(u32);", |
|
| 938 | + | "record Pair(u32): Eq + Debug;"] { |
|
| 939 | + | let node = try! parseStmtStr(source); |
|
| 940 | + | let case ast::NodeValue::RecordDecl(decl) = node.value |
|
| 941 | + | else throw testing::TestError::Failed; |
|
| 942 | + | assert not decl.labeled; |
|
| 943 | + | assert decl.fields.len == 1; |
|
| 944 | + | assert decl.derives.len == 2; |
|
| 945 | + | try expectIdent(decl.derives[0], "Eq"); |
|
| 946 | + | try expectIdent(decl.derives[1], "Debug"); |
|
| 947 | + | } |
|
| 948 | + | } |
|
| 949 | + | ||
| 935 | 950 | /// Test parsing a record declaration with field initializers. |
|
| 936 | 951 | @test unsafe fn testParseRecordDeclFieldDefaults() throws (testing::TestError) { |
|
| 937 | 952 | let node = try! parseStmtStr("record Config { size: opaque = 42, flag: bool = true }"); |
|
| 938 | 953 | let case ast::NodeValue::RecordDecl(decl) = node.value |
|
| 939 | 954 | else throw testing::TestError::Failed; |