Skip to content

function expression use tuple syntax (comma separated) #58

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
pchalamet merged 2 commits into from
Nov 2, 2024
Merged

function expression use tuple syntax (comma separated) #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9888b4
function expression use tuple syntax (comma separated)
pchalamet Nov 2, 2024
9ce8858
add unit tests
pchalamet Nov 2, 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
4 changes: 2 additions & 2 deletions src/Terrabuild.Configuration.Tests/TestFiles/WORKSPACE2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ configuration {
secret: $map.toto == "prod" ? 1234 : 5678
secret2: $list.2
secret3: !false + !true
secret4: format("1" 2 $toto true nothing)
secret4: format("1", 2, $toto, true, nothing)
}
}

Expand All @@ -48,7 +48,7 @@ extension dotnet {
defaults = {
configuration1: $map.toto
configuration2: $map.?titi
configuration3: replace("toto titi" "toto" "titi")
configuration3: replace("toto titi", "toto", "titi")
}
}

Expand Down
660 changes: 354 additions & 306 deletions src/Terrabuild.Configuration/Gen/ProjectParser.fs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/Terrabuild.Configuration/Gen/ProjectParser.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ type nonTerminalId =
| NONTERM_ExprIndex
| NONTERM_Bool
| NONTERM_String
| NONTERM_ExprTuple
| NONTERM_ExprTupleContent
| NONTERM_ExprList
| NONTERM_ExprListContent
| NONTERM_ExprMap
Expand Down
576 changes: 312 additions & 264 deletions src/Terrabuild.Configuration/Gen/WorkspaceParser.fs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/Terrabuild.Configuration/Gen/WorkspaceParser.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ type nonTerminalId =
| NONTERM_ExprIndex
| NONTERM_Bool
| NONTERM_String
| NONTERM_ExprTuple
| NONTERM_ExprTupleContent
| NONTERM_ExprList
| NONTERM_ExprListContent
| NONTERM_ExprMap
Expand Down
22 changes: 15 additions & 7 deletions src/Terrabuild.Configuration/ProjectParser/Parser.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ let debugPrint s = ignore s
%left PLUS
%left DOT DOT_QUESTION
%right BANG
%left COMMA

%type <Terrabuild.Configuration.Project.AST.ProjectFile> ProjectFile
%%
Expand Down Expand Up @@ -141,13 +142,13 @@ Expr:
| Expr NOT_EQUAL Expr { Expr.Function (Function.NotEqual, [$1; $3]) }
| Expr PLUS Expr { Expr.Function (Function.Plus, [$1; $3]) }
| Expr MINUS Expr { Expr.Function (Function.Minus, [$1; $3]) }
| TRIM LPAREN Expr RPAREN { Expr.Function (Function.Trim, [$3]) }
| UPPER LPAREN Expr RPAREN { Expr.Function (Function.Upper, [$3]) }
| LOWER LPAREN Expr RPAREN { Expr.Function (Function.Lower, [$3]) }
| REPLACE LPAREN Expr Expr Expr RPAREN { Expr.Function (Function.Replace, [$3; $4; $5]) }
| COUNT LPAREN Expr RPAREN { Expr.Function (Function.Count, [$3])}
| VERSION LPAREN Expr RPAREN { Expr.Function (Function.Version, [$3]) }
| FORMAT LPAREN ExprListContent RPAREN { Expr.Function (Function.Format, $3) }
| TRIM ExprTuple { Expr.Function (Function.Trim, $2) }
| UPPER ExprTuple { Expr.Function (Function.Upper, $2) }
| LOWER ExprTuple { Expr.Function (Function.Lower, $2) }
| REPLACE ExprTuple { Expr.Function (Function.Replace, $2) }
| COUNT ExprTuple { Expr.Function (Function.Count, $2)}
| VERSION ExprTuple { Expr.Function (Function.Version, $2) }
| FORMAT ExprTuple { Expr.Function (Function.Format, $2) }
| Expr DOUBLE_QUESTION Expr { Expr.Function (Function.Coalesce, [$1; $3]) }
| Expr QUESTION Expr COLON Expr { Expr.Function (Function.Ternary, [$1; $3; $5] ) }
| BANG Expr { Expr.Function (Function.Not, [$2]) }
Expand All @@ -171,6 +172,13 @@ Bool:
String:
| STRING { $1 }

ExprTuple:
| LPAREN ExprTupleContent RPAREN { $2 }
ExprTupleContent:
| /* empty */ { [] }
| Expr { [$1] }
| ExprTupleContent COMMA Expr { $1 @ [$3] }

ExprList:
| LSQBRACKET ExprListContent RSQBRACKET { $2 }
ExprListContent:
Expand Down
22 changes: 15 additions & 7 deletions src/Terrabuild.Configuration/WorkspaceParser/Parser.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ let debugPrint s = ignore s
%left PLUS
%left DOT DOT_QUESTION
%right BANG
%left COMMA

%type <Terrabuild.Configuration.Workspace.AST.WorkspaceFile> WorkspaceFile
%%
Expand Down Expand Up @@ -126,13 +127,13 @@ Expr:
| Expr NOT_EQUAL Expr { Expr.Function (Function.NotEqual, [$1; $3]) }
| Expr PLUS Expr { Expr.Function (Function.Plus, [$1; $3]) }
| Expr MINUS Expr { Expr.Function (Function.Minus, [$1; $3]) }
| TRIM LPAREN Expr RPAREN { Expr.Function (Function.Trim, [$3]) }
| UPPER LPAREN Expr RPAREN { Expr.Function (Function.Upper, [$3]) }
| LOWER LPAREN Expr RPAREN { Expr.Function (Function.Lower, [$3]) }
| REPLACE LPAREN Expr Expr Expr RPAREN { Expr.Function (Function.Replace, [$3; $4; $5]) }
| COUNT LPAREN Expr RPAREN { Expr.Function (Function.Count, [$3])}
| VERSION LPAREN Expr RPAREN { Expr.Function (Function.Version, [$3]) }
| FORMAT LPAREN ExprListContent RPAREN { Expr.Function (Function.Format, $3) }
| TRIM ExprTuple { Expr.Function (Function.Trim, $2) }
| UPPER ExprTuple { Expr.Function (Function.Upper, $2) }
| LOWER ExprTuple { Expr.Function (Function.Lower, $2) }
| REPLACE ExprTuple { Expr.Function (Function.Replace, $2) }
| COUNT ExprTuple { Expr.Function (Function.Count, $2)}
| VERSION ExprTuple { Expr.Function (Function.Version, $2) }
| FORMAT ExprTuple { Expr.Function (Function.Format, $2) }
| Expr DOUBLE_QUESTION Expr { Expr.Function (Function.Coalesce, [$1; $3]) }
| Expr QUESTION Expr COLON Expr { Expr.Function (Function.Ternary, [$1; $3; $5] ) }
| BANG Expr { Expr.Function (Function.Not, [$2]) }
Expand All @@ -156,6 +157,13 @@ Bool:
String:
| STRING { $1 }

ExprTuple:
| LPAREN ExprTupleContent RPAREN { $2 }
ExprTupleContent:
| /* empty */ { [] }
| Expr { [$1] }
| ExprTupleContent COMMA Expr { $1 @ [$3] }

ExprList:
| LSQBRACKET ExprListContent RSQBRACKET { $2 }
ExprListContent:
Expand Down
2 changes: 1 addition & 1 deletion src/Terrabuild.Expressions/Eval.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ let rec eval (context: EvaluationContext) (expr: Expr) =
| Value.Bool b -> if b then "true" else "false"
| Value.Number n -> $"{n}"
| Value.String s -> s
| _ -> TerrabuildException.Raise($"Unsupported type for format")
| _ -> TerrabuildException.Raise($"Unsupported type for format {v}")

values
|> List.fold (fun acc value -> $"{acc}{formatValue value}") ""
Expand Down