diff options
| author | Julius Ikkala <julius.ikkala@gmail.com> | 2025-06-28 05:39:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-28 02:39:24 +0000 |
| commit | 7349dc5cff49cf22c82eb912813e47f30cd7a757 (patch) | |
| tree | 4d7b3e14f119e7bb48623e52c890b461fd3d9701 /source/slang/slang-parser.cpp | |
| parent | a13dda4f214274a10d39f37c79622fc3e62da310 (diff) | |
Minimal optional constraints (#7422)
* Parse optional witness syntax
* Allow failing optional constraint
* Make `is` work with optional constraint
* Allow using optional constraint in checked if statements
* Fix tests
* Make it work with structs
* Fix MSVC build error
* Disallow using `as` with optional constraints
* Update test to match split is/as errors
* Add tests
* Fix uninitialized variables in tests
* Add tests of incorrect uses & fix related bugs
* Mention optional constraints in docs
* format code
* Fix type unification with NoneWitness
* Fix formatting
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Co-authored-by: Nathan V. Morrical <natemorrical@gmail.com>
Diffstat (limited to 'source/slang/slang-parser.cpp')
| -rw-r--r-- | source/slang/slang-parser.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp index a019f97c4..a2fd944eb 100644 --- a/source/slang/slang-parser.cpp +++ b/source/slang/slang-parser.cpp @@ -1692,6 +1692,8 @@ static void maybeParseGenericConstraints(Parser* parser, ContainerDecl* genericP Token whereToken; while (AdvanceIf(parser, "where", &whereToken)) { + bool optional = AdvanceIf(parser, "optional", &whereToken); + auto subType = parser->ParseTypeExp(); if (AdvanceIf(parser, TokenType::Colon)) { @@ -1702,6 +1704,12 @@ static void maybeParseGenericConstraints(Parser* parser, ContainerDecl* genericP parser->FillPosition(constraint); constraint->sub = subType; constraint->sup = parser->ParseTypeExp(); + if (optional) + { + addModifier( + constraint, + parser->astBuilder->create<OptionalConstraintModifier>()); + } AddMember(genericParent, constraint); if (!AdvanceIf(parser, TokenType::Comma)) break; @@ -1715,6 +1723,10 @@ static void maybeParseGenericConstraints(Parser* parser, ContainerDecl* genericP parser->FillPosition(constraint); constraint->sub = subType; constraint->sup = parser->ParseTypeExp(); + if (optional) + { + addModifier(constraint, parser->astBuilder->create<OptionalConstraintModifier>()); + } AddMember(genericParent, constraint); } else if (AdvanceIf(parser, TokenType::LParent)) |