Skip to content
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

Support expressions in string template #3662

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Support expressions in string template #3662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba580e2
Remove identifier constraint, add tests.
RZhang05 Oct 10, 2024
d93bb65
Add more tests for expressions in string templates.
RZhang05 Oct 10, 2024
ce4bb74
Update tests.
RZhang05 Oct 30, 2024
fab7567
Simplify error checking.
RZhang05 Nov 13, 2024
7e35480
Clean up valid tests for string templates.
RZhang05 Nov 14, 2024
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
49 changes: 49 additions & 0 deletions interpreter/misc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12509,4 +12509,53 @@ func TestInterpretStringTemplates(t *testing.T) {
inter.Globals.Get("x").GetValue(inter),
)
})

t.Run("func", func(t *testing.T) {
t.Parallel()

inter := parseCheckAndInterpret(t, `
let add = fun(): Int {
return 2+2
}
let x: String = "\(add())"
`)

AssertValuesEqual(
t,
inter,
interpreter.NewUnmeteredStringValue("4"),
inter.Globals.Get("x").GetValue(inter),
)
})

t.Run("ternary", func(t *testing.T) {
t.Parallel()

inter := parseCheckAndInterpret(t, `
let z = false
let x: String = "\(z ? "foo" : "bar" )"
`)

AssertValuesEqual(
t,
inter,
interpreter.NewUnmeteredStringValue("bar"),
inter.Globals.Get("x").GetValue(inter),
)
})

t.Run("nested", func(t *testing.T) {
t.Parallel()

inter := parseCheckAndInterpret(t, `
let x: String = "\(2*(4-2) + 1 == 5)"
`)

AssertValuesEqual(
t,
inter,
interpreter.NewUnmeteredStringValue("true"),
inter.Globals.Get("x").GetValue(inter),
)
})
}
4 changes: 0 additions & 4 deletions parser/expression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,10 +1191,6 @@ func defineStringExpression() {
if err != nil {
return nil, err
}
// limit string templates to identifiers only
if _, ok := value.(*ast.IdentifierExpression); !ok {
return nil, p.syntaxError("expected identifier got: %s", value.String())
}
_, err = p.mustOne(lexer.TokenParenClose)
if err != nil {
return nil, err
Expand Down
181 changes: 62 additions & 119 deletions parser/expression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6054,14 +6054,7 @@ func TestParseStringTemplate(t *testing.T) {
"\(test)"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6093,14 +6086,7 @@ func TestParseStringTemplate(t *testing.T) {
"this is a test \(abc)\(def) test"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6139,14 +6125,7 @@ func TestParseStringTemplate(t *testing.T) {
"this is a test \(FOO)
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Expand All @@ -6166,14 +6145,7 @@ func TestParseStringTemplate(t *testing.T) {
"\(.)"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Expand All @@ -6185,31 +6157,15 @@ func TestParseStringTemplate(t *testing.T) {
)
})

t.Run("invalid, num", func(t *testing.T) {
t.Run("valid, num", func(t *testing.T) {

t.Parallel()

_, errs := testParseExpression(`
"\(2 + 2) is a"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Message: "expected identifier got: 2 + 2",
Pos: ast.Position{Offset: 13, Line: 2, Column: 12},
},
},
errs,
)
require.Empty(t, errs)
})

t.Run("valid, nested identifier", func(t *testing.T) {
Expand All @@ -6220,14 +6176,7 @@ func TestParseStringTemplate(t *testing.T) {
"\((a))"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6259,14 +6208,7 @@ func TestParseStringTemplate(t *testing.T) {
"\()"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Expand All @@ -6278,54 +6220,51 @@ func TestParseStringTemplate(t *testing.T) {
)
})

t.Run("invalid, function identifier", func(t *testing.T) {
t.Run("valid, function identifier", func(t *testing.T) {

t.Parallel()

_, errs := testParseExpression(`
"\(add())"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}
require.Empty(t, errs)
})

require.Error(t, err)
t.Run("invalid, missing paren", func(t *testing.T) {

t.Parallel()

_, errs := testParseExpression(`
"\(add"
`)

require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Message: "expected identifier got: add()",
Pos: ast.Position{Offset: 12, Line: 2, Column: 11},
Message: "expected token ')'",
Pos: ast.Position{Offset: 10, Line: 2, Column: 9},
},
},
errs,
)
})

t.Run("invalid, unbalanced paren", func(t *testing.T) {
t.Run("invalid, nested expression paren", func(t *testing.T) {

t.Parallel()

_, errs := testParseExpression(`
"\(add"
"\((2+2)/2()"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Message: "expected token ')'",
Pos: ast.Position{Offset: 10, Line: 2, Column: 9},
Pos: ast.Position{Offset: 16, Line: 2, Column: 15},
},
},
errs,
Expand All @@ -6340,14 +6279,7 @@ func TestParseStringTemplate(t *testing.T) {
"outer string \( "\(inner template)" )"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.Error(t, err)
require.NotEmpty(t, errs)
AssertEqualWithDiff(t,
[]error{
&SyntaxError{
Expand All @@ -6367,14 +6299,7 @@ func TestParseStringTemplate(t *testing.T) {
"a\(b)c"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6406,14 +6331,7 @@ func TestParseStringTemplate(t *testing.T) {
"\(a)b\(c)"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6452,14 +6370,7 @@ func TestParseStringTemplate(t *testing.T) {
"\(a)\(b)\(c)"
`)

var err error
if len(errs) > 0 {
err = Error{
Errors: errs,
}
}

require.NoError(t, err)
require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
Expand Down Expand Up @@ -6496,6 +6407,38 @@ func TestParseStringTemplate(t *testing.T) {

AssertEqualWithDiff(t, expected, actual)
})

t.Run("valid, extra closing paren", func(t *testing.T) {
SupunS marked this conversation as resolved.
Show resolved Hide resolved

t.Parallel()

actual, errs := testParseExpression(`
"\(a))"
`)

require.Empty(t, errs)

expected := &ast.StringTemplateExpression{
Values: []string{
"",
")",
},
Expressions: []ast.Expression{
&ast.IdentifierExpression{
Identifier: ast.Identifier{
Identifier: "a",
Pos: ast.Position{Offset: 7, Line: 2, Column: 6},
},
},
},
Range: ast.Range{
StartPos: ast.Position{Offset: 4, Line: 2, Column: 3},
EndPos: ast.Position{Offset: 10, Line: 2, Column: 9},
},
}

AssertEqualWithDiff(t, expected, actual)
})
}

func TestParseNilCoalescing(t *testing.T) {
Expand Down
Loading
Loading