diff options
Diffstat (limited to 'source/slang/parser.cpp')
| -rw-r--r-- | source/slang/parser.cpp | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp index 61d7b225d..8edc3a122 100644 --- a/source/slang/parser.cpp +++ b/source/slang/parser.cpp @@ -3014,9 +3014,7 @@ namespace Slang { auto nextOpPrec = GetOpLevel(parser, parser->tokenReader.PeekTokenType()); - if((GetAssociativityFromLevel(nextOpPrec) == Associativity::Right) && (nextOpPrec != opPrec)) - break; - else if( nextOpPrec <= opPrec) + if((GetAssociativityFromLevel(nextOpPrec) == Associativity::Right) ? (nextOpPrec < opPrec) : (nextOpPrec <= opPrec)) break; right = parseInfixExprWithPrecedence(parser, right, nextOpPrec); @@ -3206,6 +3204,33 @@ namespace Slang return constExpr; } + case TokenType::StringLiterial: + { + RefPtr<ConstantExpressionSyntaxNode> constExpr = new ConstantExpressionSyntaxNode(); + auto token = parser->tokenReader.AdvanceToken(); + parser->FillPosition(constExpr.Ptr()); + constExpr->ConstType = ConstantExpressionSyntaxNode::ConstantType::String; + + if (!parser->LookAheadToken(TokenType::StringLiterial)) + { + // Easy/common case: a single string + constExpr->stringValue = getStringLiteralTokenValue(token); + } + else + { + StringBuilder sb; + sb << getStringLiteralTokenValue(token); + while (parser->LookAheadToken(TokenType::StringLiterial)) + { + token = parser->tokenReader.AdvanceToken(); + sb << getStringLiteralTokenValue(token); + } + constExpr->stringValue = sb.ProduceString(); + } + + return constExpr; + } + case TokenType::Identifier: { // TODO(tfoley): Need a name-lookup step here to resolve |