From 19867ffca6dca7995c799354081219c9e76f13d1 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 20 Feb 2025 14:48:51 -0800 Subject: Simplify implicit cast ctors for vector & matrix. (#6408) * Simplify implicit cast ctors for vector & matrix. * Fix formatting. * Fix tests. * Fix Falcor test. * Mark __builtin_cast as internal. --- source/slang/slang-parser.cpp | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'source/slang/slang-parser.cpp') diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp index 82cb8caf3..aec3b4e90 100644 --- a/source/slang/slang-parser.cpp +++ b/source/slang/slang-parser.cpp @@ -1721,6 +1721,20 @@ static void maybeParseGenericConstraints(Parser* parser, ContainerDecl* genericP constraint->sup = parser->ParseTypeExp(); AddMember(genericParent, constraint); } + else if (AdvanceIf(parser, TokenType::LParent)) + { + auto constraint = parser->astBuilder->create(); + constraint->whereTokenLoc = whereToken.loc; + parser->FillPosition(constraint); + constraint->toType = subType; + constraint->fromType = parser->ParseTypeExp(); + parser->ReadToken(TokenType::RParent); + if (AdvanceIf(parser, "implicit")) + { + addModifier(constraint, parser->astBuilder->create()); + } + AddMember(genericParent, constraint); + } } } @@ -8910,8 +8924,19 @@ static NodeBase* parseImplicitConversionModifier(Parser* parser, void* /*userDat ConversionCost cost = kConversionCost_Default; if (AdvanceIf(parser, TokenType::LParent)) { - cost = - ConversionCost(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent())); + if (AdvanceIf(parser, "constraint")) + { + cost = kConversionCost_TypeCoercionConstraint; + if (AdvanceIf(parser, TokenType::OpAdd)) + { + cost = kConversionCost_TypeCoercionConstraintPlusScalarToVector; + } + } + else + { + cost = ConversionCost( + stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent())); + } if (AdvanceIf(parser, TokenType::Comma)) { builtinKind = BuiltinConversionKind( -- cgit v1.2.3