summaryrefslogtreecommitdiffstats
path: root/source/slang/emit.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-06-26 14:09:53 -0700
committerTim Foley <tfoley@nvidia.com>2017-06-26 14:14:06 -0700
commit7d97d424c0a754ec49cccfc8af6c8983e0d06d80 (patch)
tree3669bf42ed6e971cde176cb422beab6c53158e8c /source/slang/emit.cpp
parent0259ddb0a72d3b12278404847f6e30b63e97cfc3 (diff)
Fix parsing of string literals.
String literals can be used as part of attributes, but we lacked an actual AST representation for them. This change adds basic parsing for string literals, as well as emit logic for them. I also included a fix for parsing of chained right-associative operators. To test these fixes, I've re-enabled one of the HLSL tests I disabled a while back. It would be good to go through and see how many of those we can re-enable now.
Diffstat (limited to 'source/slang/emit.cpp')
-rw-r--r--source/slang/emit.cpp31
1 files changed, 31 insertions, 0 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index eae9cd052..699294d84 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -765,6 +765,34 @@ static void emitCallExpr(
emitSimpleCallExpr(context, callExpr, outerPrec);
}
+static void emitStringLiteral(
+ EmitContext* context,
+ String const& value)
+{
+ emit(context, "\"");
+ for (auto c : value)
+ {
+ // TODO: This needs a more complete implementation,
+ // especially if we want to support Unicode.
+
+ char buffer[] = { c, 0 };
+ switch (c)
+ {
+ default:
+ emit(context, buffer);
+ break;
+
+ case '\"': emit(context, "\\\"");
+ case '\'': emit(context, "\\\'");
+ case '\\': emit(context, "\\\\");
+ case '\n': emit(context, "\\n");
+ case '\r': emit(context, "\\r");
+ case '\t': emit(context, "\\t");
+ }
+ }
+ emit(context, "\"");
+}
+
static void EmitExprWithPrecedence(EmitContext* context, RefPtr<ExpressionSyntaxNode> expr, int outerPrec)
{
bool needClose = false;
@@ -874,6 +902,9 @@ static void EmitExprWithPrecedence(EmitContext* context, RefPtr<ExpressionSyntax
case ConstantExpressionSyntaxNode::ConstantType::Bool:
Emit(context, litExpr->IntValue ? "true" : "false");
break;
+ case ConstantExpressionSyntaxNode::ConstantType::String:
+ emitStringLiteral(context, litExpr->stringValue);
+ break;
default:
assert(!"unreachable");
break;