summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-parser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/slang-parser.cpp')
-rw-r--r--source/slang/slang-parser.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
index 45f4be477..555c79445 100644
--- a/source/slang/slang-parser.cpp
+++ b/source/slang/slang-parser.cpp
@@ -6560,14 +6560,19 @@ namespace Slang
static NodeBase* parseImplicitConversionModifier(Parser* parser, void* /*userData*/)
{
ImplicitConversionModifier* modifier = parser->astBuilder->create<ImplicitConversionModifier>();
-
+ BuiltinConversionKind builtinKind = kBuiltinConversion_Unknown;
ConversionCost cost = kConversionCost_Default;
if( AdvanceIf(parser, TokenType::LParent) )
{
cost = ConversionCost(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+ if (AdvanceIf(parser, TokenType::Comma))
+ {
+ builtinKind = BuiltinConversionKind(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+ }
parser->ReadToken(TokenType::RParent);
}
modifier->cost = cost;
+ modifier->builtinConversionKind = builtinKind;
return modifier;
}