Skip to content

Commit

Permalink
String interpolation align and format support
Browse files Browse the repository at this point in the history 
Enhancements:
- Support alignment and format specifiers for interpolated expressions in string literals (#1071)
- Improved error recovery and reporting for incomplete string interpolations
  • Loading branch information
@degory
degory committed Feb 27, 2024
1 parent 88c4e77 commit da3dcec
Show file tree
Hide file tree
Showing 99 changed files with 786 additions and 134 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"ghul.compiler": {
"version": "0.8.1",
"version": "0.8.2",
"commands": [
"ghul-compiler"
]
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>0.8.2-alpha.127</Version>
<Version>0.8.3-alpha.56</Version>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/parse/incomplete-string-interpolation-1/err.expected
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
test.ghul: 6,5..7,1: error: newline in string literal
test.ghul: 6,17..6,18: error: newline in string literal
2 changes: 1 addition & 1 deletion integration-tests/parse/incomplete-string-interpolation-1/test.ghul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
entry() is
let x = 10;
let y = 20;

"interpolate
si

23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 8,5..8,6: error: newline in string literal
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-10/il.expected
View file
Empty file.
9 changes: 9 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-10/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

entry() is
let x = 10;
let y = 20;

"interpolate {x,y:G} interpolate {x,1234: ABCDEF } blah blah";

"
si
Empty file added integration-tests/parse/incomplete-string-interpolation-10/warn.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,19..7,33: error: in primary expression: expected (, [, cast, char literal, false, float literal, identifier, if, int literal, isa, new, null, self, string literal, super, true, typeof or { but found } interpolate
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-11/il.expected
View file
Empty file.
8 changes: 8 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-11/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

entry() is
let x = 10;
let y = 20;

// FIXME we need better error recovery here
"interpolate {} interpolate";
si
Empty file added integration-tests/parse/incomplete-string-interpolation-11/warn.expected
View file
Empty file.
2 changes: 1 addition & 1 deletion integration-tests/parse/incomplete-string-interpolation-2/err.expected
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
test.ghul: 7,19..8,1: error: newline in string literal
test.ghul: 7,31..7,32: error: newline in string literal
3 changes: 1 addition & 2 deletions integration-tests/parse/incomplete-string-interpolation-2/test.ghul
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ entry() is
let y = 20;

// FIXME we need better error recovery here
"interpolate {}
"interpolate {} interpolate
si

23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,1..7,3: error: in primary expression: expected (, [, cast, char literal, false, float literal, identifier, if, int literal, isa, new, null, self, string literal, super, true, typeof or { but found si
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-3/il.expected
View file
Empty file.
7 changes: 7 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-3/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

entry() is
let x = 10;
let y = 20;

"interpolate {x,y:G} interpolate {
si
Empty file added integration-tests/parse/incomplete-string-interpolation-3/warn.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,1..7,3: error: syntax error: expected } but found si
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-4/il.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions ...se/incomplete-string-interpolation-4/incomplete-string-interpolation-2/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions ...ts/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,19..7,20: error: newline in string literal
1 change: 1 addition & 0 deletions ...s/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions ...tests/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions ...tests/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added ...sts/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/il.expected
View file
Empty file.
8 changes: 8 additions & 0 deletions ...tests/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

entry() is
let x = 10;
let y = 20;

// FIXME we need better error recovery here
"interpolate {}
si
Empty file added ...s/parse/incomplete-string-interpolation-4/incomplete-string-interpolation-2/warn.expected
View file
Empty file.
7 changes: 7 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-4/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

entry() is
let x = 10;
let y = 20;

"interpolate {x,y:G} interpolate {x
si
Empty file added integration-tests/parse/incomplete-string-interpolation-4/warn.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,1..7,3: error: in primary expression: expected (, [, cast, char literal, false, float literal, identifier, if, int literal, isa, new, null, self, string literal, super, true, typeof or { but found si
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-5/il.expected
View file
Empty file.
7 changes: 7 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-5/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

entry() is
let x = 10;
let y = 20;

"interpolate {x,y:G} interpolate {x,
si
Empty file added integration-tests/parse/incomplete-string-interpolation-5/warn.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 7,1..7,3: error: syntax error: expected } but found si
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/fail.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

6 changes: 6 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/ghul.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compiler": "dotnet ../../../publish/ghul.dll",
"source": [
"."
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/ghulflags
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--type-check
Empty file added integration-tests/parse/incomplete-string-interpolation-6/il.expected
View file
Empty file.
7 changes: 7 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-6/test.ghul
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

entry() is
let x = 10;
let y = 20;

"interpolate {x,y:G} interpolate {x,1234
si
Empty file added integration-tests/parse/incomplete-string-interpolation-6/warn.expected
View file
Empty file.
23 changes: 23 additions & 0 deletions integration-tests/parse/incomplete-string-interpolation-7/.vscode/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Run test",
"command": "dotnet ghul-test \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Capture test expectation",
"command": "../../../tasks/capture.sh \"${workspaceFolder}\"",
"type": "shell",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
1 change: 1 addition & 0 deletions integration-tests/parse/incomplete-string-interpolation-7/err.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.ghul: 6,53..6,54: error: newline in interpolation format string
Loading

0 comments on commit da3dcec

Please sign in to comment.