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

Jump to bottom

Take argument labels into account when declaring members for nested declarations #1717

Merged
merged 1 commit into from Jun 13, 2022
Merged

Take argument labels into account when declaring members for nested declarations #1717

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions runtime/sema/check_composite_declaration.go
View file
Open in desktop
Expand Up @@ -562,6 +562,7 @@ func (checker *Checker) declareCompositeMembersAndValue(
TypeAnnotation: NewTypeAnnotation(nestedCompositeDeclarationVariable.Type),
DeclarationKind: nestedCompositeDeclarationVariable.DeclarationKind,
VariableKind: ast.VariableKindConstant,
ArgumentLabels: nestedCompositeDeclarationVariable.ArgumentLabels,
IgnoreInSerialization: true,
DocString: nestedCompositeDeclaration.DocString,
})
Expand Down
261 changes: 261 additions & 0 deletions runtime/tests/checker/invocation_test.go
View file
Open in desktop
Expand Up @@ -24,8 +24,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/onflow/cadence/runtime/ast"
"github.com/onflow/cadence/runtime/common"
"github.com/onflow/cadence/runtime/sema"
"github.com/onflow/cadence/runtime/stdlib"
"github.com/onflow/cadence/runtime/tests/utils"
)

func TestCheckInvalidFunctionCallWithTooFewArguments(t *testing.T) {
Expand Down Expand Up @@ -343,3 +346,261 @@ func TestCheckInvocationWithOnlyVarargs(t *testing.T) {

require.NoError(t, err)
}

func TestCheckArgumentLabels(t *testing.T) {

t.Parallel()

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

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

t.Parallel()

_, err := ParseAndCheck(t, `
fun test(foo bar: Int, baz: String) {}

let t = test(x: 1, "2")
`)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})

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

t.Parallel()

importedChecker, err := ParseAndCheckWithOptions(t,
`
fun test(foo bar: Int, baz: String) {}
`,
ParseAndCheckOptions{
Location: utils.ImportedLocation,
},
)

require.NoError(t, err)

_, err = ParseAndCheckWithOptions(t,
`
import "imported"

let t = test(x: 1, "2")
`,
ParseAndCheckOptions{
Options: []sema.Option{
sema.WithImportHandler(
func(_ *sema.Checker, _ common.Location, _ ast.Range) (sema.Import, error) {
return sema.ElaborationImport{
Elaboration: importedChecker.Elaboration,
}, nil
},
),
},
},
)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})
})

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

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

t.Parallel()

_, err := ParseAndCheck(t, `
struct Test {
fun test(foo bar: Int, baz: String) {}
}

let t = Test().test(x: 1, "2")
`)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})

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

t.Parallel()

importedChecker, err := ParseAndCheckWithOptions(t,
`
struct Test {
fun test(foo bar: Int, baz: String) {}
}
`,
ParseAndCheckOptions{
Location: utils.ImportedLocation,
},
)

require.NoError(t, err)

_, err = ParseAndCheckWithOptions(t,
`
import "imported"

let t = Test().test(x: 1, "2")
`,
ParseAndCheckOptions{
Options: []sema.Option{
sema.WithImportHandler(
func(_ *sema.Checker, _ common.Location, _ ast.Range) (sema.Import, error) {
return sema.ElaborationImport{
Elaboration: importedChecker.Elaboration,
}, nil
},
),
},
},
)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})
})

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

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

t.Parallel()

_, err := ParseAndCheck(t, `
struct Test {
init(foo bar: Int, baz: String) {}
}

let t = Test(x: 1, "2")
`)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})

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

t.Parallel()

importedChecker, err := ParseAndCheckWithOptions(t,
`
struct Test {
init(foo bar: Int, baz: String) {}
}
`,
ParseAndCheckOptions{
Location: utils.ImportedLocation,
},
)

require.NoError(t, err)

_, err = ParseAndCheckWithOptions(t,
`
import "imported"

let t = Test(x: 1, "2")
`,
ParseAndCheckOptions{
Options: []sema.Option{
sema.WithImportHandler(
func(_ *sema.Checker, _ common.Location, _ ast.Range) (sema.Import, error) {
return sema.ElaborationImport{
Elaboration: importedChecker.Elaboration,
}, nil
},
),
},
},
)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})
})

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

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

t.Parallel()

_, err := ParseAndCheck(t, `
contract C {
struct S {
init(foo bar: Int, baz: String) {}
}
}

let t = C.S(x: 1, "2")
`)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})

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

t.Parallel()

importedChecker, err := ParseAndCheckWithOptions(t,
`
contract C {
struct S {
init(foo bar: Int, baz: String) {}
}
}
`,
ParseAndCheckOptions{
Location: utils.ImportedLocation,
},
)

require.NoError(t, err)

_, err = ParseAndCheckWithOptions(t,
`
import "imported"

let t = C.S(x: 1, "2")
`,
ParseAndCheckOptions{
Options: []sema.Option{
sema.WithImportHandler(
func(_ *sema.Checker, _ common.Location, _ ast.Range) (sema.Import, error) {
return sema.ElaborationImport{
Elaboration: importedChecker.Elaboration,
}, nil
},
),
},
},
)

errs := ExpectCheckerErrors(t, err, 2)

assert.IsType(t, &sema.IncorrectArgumentLabelError{}, errs[0])
assert.IsType(t, &sema.MissingArgumentLabelError{}, errs[1])
})

})
}