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

Migrate C# ModuleDef to V9 #1670

Merged
merged 15 commits into from
Dec 16, 2024
Merged

Migrate C# ModuleDef to V9 #1670

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db75e7e
[WIP] C#: migrate from V8 to V9
RReverser Oct 22, 2024
9ed1ec5
Ignore RLS steps
RReverser Dec 9, 2024
bd600d1
Fixups
RReverser Dec 9, 2024
6449f54
cargo fmt
RReverser Dec 9, 2024
4600ea5
Revert irrelevant change
RReverser Dec 10, 2024
168c78f
Revert one more irrelevant change
RReverser Dec 10, 2024
4c123ac
Address review comments
RReverser Dec 12, 2024
08d6b91
Revert index change
RReverser Dec 16, 2024
0ffdc78
Merge branch 'master' into ingvar/v9
RReverser Dec 16, 2024
f3bdd2c
Migrate C# scheduling to the new API
RReverser Dec 16, 2024
6a3fb78
Bump C# versions to match client SDK
RReverser Dec 16, 2024
9c4345d
"Remove" declaration for [Table(Schedule)] diag
RReverser Dec 16, 2024
0131746
Add one more diagnostic
RReverser Dec 16, 2024
b3ec33a
More fixes
RReverser Dec 16, 2024
0ca5d6c
Commit missing files
RReverser Dec 16, 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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion crates/bindings-csharp/BSATN.Codegen/Type.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,13 @@ public void Write(System.IO.BinaryWriter writer, {{FullName}} value) {
{{write}}
}

public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
RReverser marked this conversation as resolved.
Show resolved Hide resolved
registrar.RegisterType<{{FullName}}>(_ => new SpacetimeDB.BSATN.AlgebraicType.{{Kind}}(new SpacetimeDB.BSATN.AggregateElement[] {
{{MemberDeclaration.GenerateDefs(Members)}}
}));

SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<{{FullName}}>.GetAlgebraicType(SpacetimeDB.BSATN.ITypeRegistrar registrar) =>
kazimuth marked this conversation as resolved.
Show resolved Hide resolved
GetAlgebraicType(registrar);
}
"""
);
Expand Down
6 changes: 5 additions & 1 deletion crates/bindings-csharp/BSATN.Codegen/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,11 @@ public override string ToString()
sb.Append(" : ").AppendJoin(", ", BaseTypes);
}

sb.Append(typeScope.Constraints).AppendLine(" {");
if (typeScope.Constraints.Length > 0)
{
sb.Append(' ').Append(typeScope.Constraints);
}
sb.AppendLine(" {");
}

sb.AppendLine();
Expand Down
6 changes: 5 additions & 1 deletion crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomClass.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void Write(System.IO.BinaryWriter writer, CustomClass value)
value.WriteFields(writer);
}

public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) =>
registrar.RegisterType<CustomClass>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
Expand All @@ -39,5 +39,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
new(nameof(StringField), StringField.GetAlgebraicType(registrar))
}
));

SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomClass>.GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) => GetAlgebraicType(registrar);
}
} // CustomClass
6 changes: 5 additions & 1 deletion crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomStruct.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void Write(System.IO.BinaryWriter writer, CustomStruct value)
value.WriteFields(writer);
}

public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) =>
registrar.RegisterType<CustomStruct>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
Expand All @@ -39,5 +39,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
new(nameof(StringField), StringField.GetAlgebraicType(registrar))
}
));

SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomStruct>.GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) => GetAlgebraicType(registrar);
}
} // CustomStruct
6 changes: 5 additions & 1 deletion ...bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#CustomTaggedEnum.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void Write(System.IO.BinaryWriter writer, CustomTaggedEnum value)
}
}

public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) =>
registrar.RegisterType<CustomTaggedEnum>(_ => new SpacetimeDB.BSATN.AlgebraicType.Sum(
Expand All @@ -58,5 +58,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
new(nameof(StringVariant), StringVariant.GetAlgebraicType(registrar))
}
));

SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<CustomTaggedEnum>.GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) => GetAlgebraicType(registrar);
}
} // CustomTaggedEnum
6 changes: 5 additions & 1 deletion crates/bindings-csharp/Codegen.Tests/fixtures/client/snapshots/Type#PublicTable.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void Write(System.IO.BinaryWriter writer, PublicTable value)
value.WriteFields(writer);
}

public SpacetimeDB.BSATN.AlgebraicType GetAlgebraicType(
public SpacetimeDB.BSATN.AlgebraicType.Ref GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) =>
registrar.RegisterType<PublicTable>(_ => new SpacetimeDB.BSATN.AlgebraicType.Product(
Expand Down Expand Up @@ -144,5 +144,9 @@ SpacetimeDB.BSATN.ITypeRegistrar registrar
)
}
));

SpacetimeDB.BSATN.AlgebraicType SpacetimeDB.BSATN.IReadWrite<PublicTable>.GetAlgebraicType(
SpacetimeDB.BSATN.ITypeRegistrar registrar
) => GetAlgebraicType(registrar);
}
} // PublicTable
Loading
Loading