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

Fixed functions signatures in vararg functions #1124

Merged
merged 3 commits into from
Dec 11, 2020
Merged

Fixed functions signatures in vararg functions #1124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0f2b32
function overload tests
majastrz Dec 11, 2020
6fc7975
fixed bug
majastrz Dec 11, 2020
b5c5f45
Updated signature format
majastrz Dec 11, 2020
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
Prev Previous commit
Updated signature format
  • Loading branch information
@majastrz
majastrz committed Dec 11, 2020
commit b5c5f45e6808d19f905bc74350bb319d719b8c9f
16 changes: 8 additions & 8 deletions src/Bicep.Core.Samples/Files/Functions/az.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"minimumArgumentCount": 3,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, param1: string, param2: string, ...rest: string[]): string",
"typeSignature": "(param0: string, param1: string, param2: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"param1: string",
"param2: string",
"...rest: string[]"
"... : string"
]
},
{
Expand Down Expand Up @@ -134,11 +134,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, param1: string, ...rest: string[]): string",
"typeSignature": "(param0: string, param1: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"param1: string",
"...rest: string[]"
"... : string"
]
},
{
Expand Down Expand Up @@ -172,11 +172,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, param1: string, ...rest: string[]): string",
"typeSignature": "(param0: string, param1: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"param1: string",
"...rest: string[]"
"... : string"
]
},
{
Expand All @@ -197,11 +197,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, param1: string, ...rest: string[]): string",
"typeSignature": "(param0: string, param1: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"param1: string",
"...rest: string[]"
"... : string"
]
}
]
48 changes: 24 additions & 24 deletions src/Bicep.Core.Samples/Files/Functions/sys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "any",
"flags": "default",
"typeSignature": "(param0: any, ...rest: any[]): any",
"typeSignature": "(param0: any, ... : any): any",
"parameterTypeSignatures": [
"param0: any",
"...rest: any[]"
"... : any"
]
},
{
Expand All @@ -99,10 +99,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "array",
"flags": "default",
"typeSignature": "(param0: array, ...rest: array[]): array",
"typeSignature": "(param0: array, ... : array): array",
"parameterTypeSignatures": [
"param0: array",
"...rest: array[]"
"... : array"
]
},
{
Expand All @@ -113,10 +113,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "bool | int | string",
"flags": "default",
"typeSignature": "(param0: bool | int | string, ...rest: (bool | int | string)[]): string",
"typeSignature": "(param0: bool | int | string, ... : bool | int | string): string",
"parameterTypeSignatures": [
"param0: bool | int | string",
"...rest: (bool | int | string)[]"
"... : bool | int | string"
]
},
{
Expand Down Expand Up @@ -269,10 +269,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "any",
"flags": "default",
"typeSignature": "(param0: string, ...rest: any[]): string",
"typeSignature": "(param0: string, ... : any): string",
"parameterTypeSignatures": [
"param0: string",
"...rest: any[]"
"... : any"
]
},
{
Expand All @@ -283,10 +283,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, ...rest: string[]): string",
"typeSignature": "(param0: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"...rest: string[]"
"... : string"
]
},
{
Expand Down Expand Up @@ -326,11 +326,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "object",
"flags": "default",
"typeSignature": "(param0: object, param1: object, ...rest: object[]): object",
"typeSignature": "(param0: object, param1: object, ... : object): object",
"parameterTypeSignatures": [
"param0: object",
"param1: object",
"...rest: object[]"
"... : object"
]
},
{
Expand All @@ -342,11 +342,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "array",
"flags": "default",
"typeSignature": "(param0: array, param1: array, ...rest: array[]): array",
"typeSignature": "(param0: array, param1: array, ... : array): array",
"parameterTypeSignatures": [
"param0: array",
"param1: array",
"...rest: array[]"
"... : array"
]
},
{
Expand Down Expand Up @@ -424,10 +424,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "int",
"flags": "default",
"typeSignature": "(param0: int, ...rest: int[]): int",
"typeSignature": "(param0: int, ... : int): int",
"parameterTypeSignatures": [
"param0: int",
"...rest: int[]"
"... : int"
]
},
{
Expand All @@ -451,10 +451,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "int",
"flags": "default",
"typeSignature": "(param0: int, ...rest: int[]): int",
"typeSignature": "(param0: int, ... : int): int",
"parameterTypeSignatures": [
"param0: int",
"...rest: int[]"
"... : int"
]
},
{
Expand Down Expand Up @@ -696,11 +696,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "object",
"flags": "default",
"typeSignature": "(param0: object, param1: object, ...rest: object[]): object",
"typeSignature": "(param0: object, param1: object, ... : object): object",
"parameterTypeSignatures": [
"param0: object",
"param1: object",
"...rest: object[]"
"... : object"
]
},
{
Expand All @@ -712,11 +712,11 @@
"minimumArgumentCount": 2,
"variableParameterType": "array",
"flags": "default",
"typeSignature": "(param0: array, param1: array, ...rest: array[]): array",
"typeSignature": "(param0: array, param1: array, ... : array): array",
"parameterTypeSignatures": [
"param0: array",
"param1: array",
"...rest: array[]"
"... : array"
]
},
{
Expand All @@ -727,10 +727,10 @@
"minimumArgumentCount": 1,
"variableParameterType": "string",
"flags": "default",
"typeSignature": "(param0: string, ...rest: string[]): string",
"typeSignature": "(param0: string, ... : string): string",
"parameterTypeSignatures": [
"param0: string",
"...rest: string[]"
"... : string"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/Bicep.Core.Samples/Files/InvalidExpressions_LF/main.diagnostics.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ var takeTooMany = take([

// wrong argument types
var concatWrongTypes = concat({
//@[30:33) [BCP048 (Error)] Cannot resolve function overload.\n Overload 1 of 2, "(param0: array, ...rest: array[]): array", gave the following error:\n Argument of type "object" is not assignable to parameter of type "array".\n Overload 2 of 2, "(param0: bool | int | string, ...rest: (bool | int | string)[]): string", gave the following error:\n Argument of type "object" is not assignable to parameter of type "bool | int | string". |{\n}|
//@[30:33) [BCP048 (Error)] Cannot resolve function overload.\n Overload 1 of 2, "(param0: array, ... : array): array", gave the following error:\n Argument of type "object" is not assignable to parameter of type "array".\n Overload 2 of 2, "(param0: bool | int | string, ... : bool | int | string): string", gave the following error:\n Argument of type "object" is not assignable to parameter of type "bool | int | string". |{\n}|
})
var concatWrongTypesContradiction = concat('s', [
//@[48:51) [BCP070 (Error)] Argument of type "array" is not assignable to parameter of type "bool | int | string". |[\n]|
Expand Down
3 changes: 1 addition & 2 deletions src/Bicep.Core/Semantics/FunctionOverload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ public FunctionOverload(string name, ReturnTypeBuilderDelegate returnTypeBuilder

if (variableParameterType != null)
{
var restParameterType = variableParameterType.TypeKind == TypeKind.Union ? $"({variableParameterType})[]": $"{variableParameterType}[]";
builder.Add($"...rest: {restParameterType}");
builder.Add($"... : {variableParameterType}");
}

this.ParameterTypeSignatures = builder.ToImmutable();
Expand Down