Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ jobs:
uses: actions/setup-dotnet@v6
with:
dotnet-version: 10.0.x
cache: true
cache-dependency-path: '**/packages.lock.json'

- name: Install GitVersion
shell: pwsh
Expand Down
18 changes: 9 additions & 9 deletions Expressif.Cli.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down Expand Up @@ -190,7 +190,7 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
},
"Expressif-cli": {
Expand Down Expand Up @@ -280,8 +280,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down Expand Up @@ -391,7 +391,7 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
},
"Expressif-cli": {
Expand Down Expand Up @@ -481,8 +481,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down Expand Up @@ -592,7 +592,7 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
},
"Expressif-cli": {
Expand Down
66 changes: 33 additions & 33 deletions Expressif.Cli/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -50,15 +50,15 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
}
},
"net10.0/linux-musl-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -72,8 +72,8 @@
"net10.0/linux-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -87,8 +87,8 @@
"net10.0/win-arm64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -102,8 +102,8 @@
"net10.0/win-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down Expand Up @@ -144,8 +144,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -163,15 +163,15 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
}
},
"net8.0/linux-musl-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -185,8 +185,8 @@
"net8.0/linux-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -200,8 +200,8 @@
"net8.0/win-arm64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -215,8 +215,8 @@
"net8.0/win-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down Expand Up @@ -257,8 +257,8 @@
},
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -276,15 +276,15 @@
"expressif": {
"type": "Project",
"dependencies": {
"Expressif.Syntax": "[0.28.0, )"
"Expressif.Syntax": "[0.29.0, )"
}
}
},
"net9.0/linux-musl-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -298,8 +298,8 @@
"net9.0/linux-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -313,8 +313,8 @@
"net9.0/win-arm64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand All @@ -328,8 +328,8 @@
"net9.0/win-x64": {
"Expressif.Syntax": {
"type": "Transitive",
"resolved": "0.28.0",
"contentHash": "WHKuIeBbGvFp1cnW4+z1SFFDFfnqDLRF2XBemidJ7or/R+SWvykobfFLfrEwcJSsiFu6iync2ty0Wc/yH9A+6A==",
"resolved": "0.29.0",
"contentHash": "tfePgRVqH3IVww9K7CioNzZ0qlaqK6qBS8tXx2SuEKP8FyBW4LXbhBKp2SaAppPGzmzv2VBB8tUsQwF7JBrwEw==",
"dependencies": {
"TreeSitter.DotNet": "1.3.0"
}
Expand Down
18 changes: 18 additions & 0 deletions Expressif.Testing/Bindings/ParameterBinderTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,24 @@ public void Bind_TupleLiteral_PreservesNestedTuple()
Assert.That(parameter.Values.Last(), Is.TypeOf<TupleParameter>());
}

[Test]
public void Bind_TupleLiteral_PreservesSpreadElements()
{
var syntax = SyntaxFactory.Tuple(
SyntaxFactory.TupleElement(SyntaxFactory.Number(1)),
SyntaxFactory.TupleElement(SyntaxFactory.Variable("items"), true),
SyntaxFactory.TupleElement(null, true));

var parameter = (TupleParameter)BindParameter(syntax);

Assert.Multiple(() =>
{
Assert.That(parameter.Elements.Select(element => element.IsSpread),
Is.EqualTo(new[] { false, true, true }));
Assert.That(parameter.Elements.Last().Value, Is.TypeOf<IncomingValueParameter>());
});
}

private static IParameter BindParameter(ValueSyntax value)
=> Binder.BindParameter(SyntaxFactory.Closed(value));
}
8 changes: 7 additions & 1 deletion Expressif.Testing/Bindings/SyntaxFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ public static ArrayElementSyntax ArrayElement(ExpressionSyntax? value, bool spre
=> new(new SourceSpan(0, 0), string.Empty, value, spread);

public static TupleLiteralSyntax Tuple(params ValueSyntax[] values)
=> new(new SourceSpan(0, 0), string.Empty, values);
=> new(new SourceSpan(0, 0), string.Empty, values.Select(value => TupleElement(value)));

public static TupleLiteralSyntax Tuple(params TupleElementSyntax[] elements)
=> new(new SourceSpan(0, 0), string.Empty, elements);

public static TupleElementSyntax TupleElement(ExpressionSyntax? value, bool spread = false)
=> new(new SourceSpan(0, 0), string.Empty, value, spread);

public static RecordLiteralSyntax Record(params RecordEntrySyntax[] entries)
=> new(new SourceSpan(0, 0), string.Empty, entries);
Expand Down
11 changes: 11 additions & 0 deletions Expressif.Testing/Functions/Array/CardinalityTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Expressif.Functions.Array;
using Expressif.Testing.Conformance;

namespace Expressif.Testing.Functions.Array;

public class CardinalityTest
{
[Conformance]
public void Cardinality_Valid(object?[] value, int expected)
=> Assert.That(new Cardinality().Evaluate(value), Is.EqualTo(expected));
}
21 changes: 0 additions & 21 deletions Expressif.Testing/Functions/Special/TupleFunctionsTest.cs

This file was deleted.

Loading
Loading