Skip to content

[Compile Time Constant Extraction] Update string literal JSON formatting #62836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2023
Merged

[Compile Time Constant Extraction] Update string literal JSON formatting #62836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/ConstExtract/ConstExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
case ExprKind::BooleanLiteral:
case ExprKind::FloatLiteral:
case ExprKind::IntegerLiteral:
case ExprKind::NilLiteral:
case ExprKind::StringLiteral: {
case ExprKind::NilLiteral: {
std::string literalOutput;
llvm::raw_string_ostream OutputStream(literalOutput);
expr->printConstExprValue(&OutputStream, nullptr);
Expand All @@ -137,6 +136,14 @@ static std::shared_ptr<CompileTimeValue> extractCompileTimeValue(Expr *expr) {
break;
}

case ExprKind::StringLiteral: {
auto stringLiteralExpression = cast<StringLiteralExpr>(expr);
std::string literalOutput;
llvm::raw_string_ostream OutputStream(literalOutput);
OutputStream << stringLiteralExpression->getValue();
return std::make_shared<RawLiteralValue>(literalOutput);
}

case ExprKind::Array: {
auto arrayExpr = cast<ArrayExpr>(expr);
std::vector<std::shared_ptr<CompileTimeValue>> elementValues;
Expand Down
4 changes: 2 additions & 2 deletions test/ConstExtraction/ExtractCalls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// CHECK-NEXT: "label": "buz",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"\""
// CHECK-NEXT: "value": ""
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "fuz",
Expand All @@ -57,7 +57,7 @@
// CHECK-NEXT: "label": "buz",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"hello\""
// CHECK-NEXT: "value": "hello"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "fuz",
Expand Down
22 changes: 11 additions & 11 deletions test/ConstExtraction/ExtractGroups.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"hi\""
// CHECK-NEXT: "value": "hi"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand Down Expand Up @@ -86,7 +86,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"One\""
// CHECK-NEXT: "value": "One"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
Expand All @@ -96,7 +96,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Two\""
// CHECK-NEXT: "value": "Two"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
Expand All @@ -106,7 +106,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Three\""
// CHECK-NEXT: "value": "Three"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
Expand All @@ -132,15 +132,15 @@
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"a\""
// CHECK-NEXT: "value": "a"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"b\""
// CHECK-NEXT: "value": "b"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"c\""
// CHECK-NEXT: "value": "c"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
Expand All @@ -155,7 +155,7 @@
// CHECK-NEXT: "value": [
// CHECK-NEXT: {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"z\""
// CHECK-NEXT: "value": "z"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
Expand All @@ -172,7 +172,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Bar\""
// CHECK-NEXT: "value": "Bar"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "InitCall",
Expand All @@ -185,7 +185,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "key": {
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Int\""
// CHECK-NEXT: "value": "Int"
// CHECK-NEXT: },
// CHECK-NEXT: "value": {
// CHECK-NEXT: "valueKind": "RawLiteral",
Expand All @@ -210,7 +210,7 @@
// CHECK-NEXT: {
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"foo\""
// CHECK-NEXT: "value": "foo"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "type": "ExtractGroups.Bar",
Expand Down
15 changes: 10 additions & 5 deletions test/ConstExtraction/ExtractLiterals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,23 @@
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Hello, World\""
// CHECK-NEXT: "value": "First \"string\"\nSecond \\ string"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "string2",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Hi\""
// CHECK-NEXT: "value": "Hi"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "label": "string3",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Hey\""
// CHECK-NEXT: "value": "Hey"
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand Down Expand Up @@ -147,7 +147,7 @@
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "valueKind": "RawLiteral",
// CHECK-NEXT: "value": "\"Hello\"",
// CHECK-NEXT: "value": "Hello",
// CHECK-NEXT: "attributes": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "ExtractLiterals.Buffered",
Expand Down Expand Up @@ -251,7 +251,12 @@ public struct Floats : MyProto {
}

public struct Strings : MyProto {
let string1: String = "Hello, World"
let string1: String =
"""
First "string"
Second \\ string
"""

let string2: String = (("Hi"))
var string3: String { ("Hey") }
}
Expand Down