From 4a0879458d6653c2c4ec5eab202111fc9f27971b Mon Sep 17 00:00:00 2001 From: Todd Hansen <32498632+thansen24@users.noreply.github.com> Date: Tue, 17 Aug 2021 10:02:57 -0500 Subject: [PATCH] [C#] Remove superfluous semicolon in C# structs (#6791) Aims to resolve #6788 -Remove superfluous semicolon in C# structs --- src/idl_gen_csharp.cpp | 2 +- tests/MyGame/Example/Ability.cs | 2 +- tests/MyGame/Example/ArrayStruct.cs | 2 +- tests/MyGame/Example/ArrayTable.cs | 2 +- tests/MyGame/Example/Monster.cs | 2 +- tests/MyGame/Example/NestedStruct.cs | 2 +- tests/MyGame/Example/Referrable.cs | 2 +- tests/MyGame/Example/Stat.cs | 2 +- tests/MyGame/Example/StructOfStructs.cs | 2 +- tests/MyGame/Example/Test.cs | 2 +- tests/MyGame/Example/TestSimpleTableWithEnum.cs | 2 +- tests/MyGame/Example/TypeAliases.cs | 2 +- tests/MyGame/Example/Vec3.cs | 2 +- tests/MyGame/Example2/Monster.cs | 2 +- tests/MyGame/InParentNamespace.cs | 2 +- tests/MyGame/MonsterExtra.cs | 2 +- tests/keyword_test/KeywordsInTable.cs | 2 +- tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs | 2 +- tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs | 2 +- tests/namespace_test/NamespaceA/SecondTableInA.cs | 2 +- tests/namespace_test/NamespaceA/TableInFirstNS.cs | 2 +- tests/namespace_test/NamespaceC/TableInC.cs | 2 +- tests/optional_scalars/ScalarStuff.cs | 2 +- tests/union_vector/Attacker.cs | 2 +- tests/union_vector/BookReader.cs | 2 +- tests/union_vector/Movie.cs | 2 +- tests/union_vector/Rapunzel.cs | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/idl_gen_csharp.cpp b/src/idl_gen_csharp.cpp index 2b0425387..fe90979fb 100644 --- a/src/idl_gen_csharp.cpp +++ b/src/idl_gen_csharp.cpp @@ -1335,7 +1335,7 @@ class CSharpGenerator : public BaseGenerator { GenPackUnPack_ObjectAPI(struct_def, code_ptr, opts, struct_has_create, field_has_create_set); } - code += "};\n\n"; + code += "}\n\n"; if (opts.generate_object_based_api) { GenStruct_ObjectAPI(struct_def, code_ptr, opts); diff --git a/tests/MyGame/Example/Ability.cs b/tests/MyGame/Example/Ability.cs index bd49ccd97..ae6a5b424 100644 --- a/tests/MyGame/Example/Ability.cs +++ b/tests/MyGame/Example/Ability.cs @@ -43,7 +43,7 @@ public struct Ability : IFlatbufferObject _o.Id, _o.Distance); } -}; +} public class AbilityT { diff --git a/tests/MyGame/Example/ArrayStruct.cs b/tests/MyGame/Example/ArrayStruct.cs index 41c088db2..df0e2ac0d 100644 --- a/tests/MyGame/Example/ArrayStruct.cs +++ b/tests/MyGame/Example/ArrayStruct.cs @@ -97,7 +97,7 @@ public struct ArrayStruct : IFlatbufferObject _o.E, _f); } -}; +} public class ArrayStructT { diff --git a/tests/MyGame/Example/ArrayTable.cs b/tests/MyGame/Example/ArrayTable.cs index f622df5cc..9dc3d456b 100644 --- a/tests/MyGame/Example/ArrayTable.cs +++ b/tests/MyGame/Example/ArrayTable.cs @@ -44,7 +44,7 @@ public struct ArrayTable : IFlatbufferObject AddA(builder, MyGame.Example.ArrayStruct.Pack(builder, _o.A)); return EndArrayTable(builder); } -}; +} public class ArrayTableT { diff --git a/tests/MyGame/Example/Monster.cs b/tests/MyGame/Example/Monster.cs index d2f89c24c..ccf84fced 100644 --- a/tests/MyGame/Example/Monster.cs +++ b/tests/MyGame/Example/Monster.cs @@ -741,7 +741,7 @@ public struct Monster : IFlatbufferObject _testrequirednestedflatbuffer, _scalar_key_sorted_tables); } -}; +} public class MonsterT { diff --git a/tests/MyGame/Example/NestedStruct.cs b/tests/MyGame/Example/NestedStruct.cs index 13e349847..f323342c0 100644 --- a/tests/MyGame/Example/NestedStruct.cs +++ b/tests/MyGame/Example/NestedStruct.cs @@ -66,7 +66,7 @@ public struct NestedStruct : IFlatbufferObject _c, _d); } -}; +} public class NestedStructT { diff --git a/tests/MyGame/Example/Referrable.cs b/tests/MyGame/Example/Referrable.cs index 0c6584baf..e6f3146f3 100644 --- a/tests/MyGame/Example/Referrable.cs +++ b/tests/MyGame/Example/Referrable.cs @@ -74,7 +74,7 @@ public struct Referrable : IFlatbufferObject builder, _o.Id); } -}; +} public class ReferrableT { diff --git a/tests/MyGame/Example/Stat.cs b/tests/MyGame/Example/Stat.cs index 809f587e9..149b136fc 100644 --- a/tests/MyGame/Example/Stat.cs +++ b/tests/MyGame/Example/Stat.cs @@ -94,7 +94,7 @@ public struct Stat : IFlatbufferObject _o.Val, _o.Count); } -}; +} public class StatT { diff --git a/tests/MyGame/Example/StructOfStructs.cs b/tests/MyGame/Example/StructOfStructs.cs index cdd82fbd4..3a1607dc8 100644 --- a/tests/MyGame/Example/StructOfStructs.cs +++ b/tests/MyGame/Example/StructOfStructs.cs @@ -61,7 +61,7 @@ public struct StructOfStructs : IFlatbufferObject _c_id, _c_distance); } -}; +} public class StructOfStructsT { diff --git a/tests/MyGame/Example/Test.cs b/tests/MyGame/Example/Test.cs index a6419ed2b..a805218c9 100644 --- a/tests/MyGame/Example/Test.cs +++ b/tests/MyGame/Example/Test.cs @@ -44,7 +44,7 @@ public struct Test : IFlatbufferObject _o.A, _o.B); } -}; +} public class TestT { diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs index bd1fba8e6..99a498bd5 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.cs +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs @@ -49,7 +49,7 @@ internal partial struct TestSimpleTableWithEnum : IFlatbufferObject builder, _o.Color); } -}; +} internal partial class TestSimpleTableWithEnumT { diff --git a/tests/MyGame/Example/TypeAliases.cs b/tests/MyGame/Example/TypeAliases.cs index 584cceb4f..1801dc886 100644 --- a/tests/MyGame/Example/TypeAliases.cs +++ b/tests/MyGame/Example/TypeAliases.cs @@ -158,7 +158,7 @@ public struct TypeAliases : IFlatbufferObject _v8, _vf64); } -}; +} public class TypeAliasesT { diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs index 54fc8f992..31c9f7ea5 100644 --- a/tests/MyGame/Example/Vec3.cs +++ b/tests/MyGame/Example/Vec3.cs @@ -71,7 +71,7 @@ public struct Vec3 : IFlatbufferObject _test3_a, _test3_b); } -}; +} public class Vec3T { diff --git a/tests/MyGame/Example2/Monster.cs b/tests/MyGame/Example2/Monster.cs index fc1916056..3232bd639 100644 --- a/tests/MyGame/Example2/Monster.cs +++ b/tests/MyGame/Example2/Monster.cs @@ -37,7 +37,7 @@ public struct Monster : IFlatbufferObject StartMonster(builder); return EndMonster(builder); } -}; +} public class MonsterT { diff --git a/tests/MyGame/InParentNamespace.cs b/tests/MyGame/InParentNamespace.cs index 163cd9c52..b266aae0f 100644 --- a/tests/MyGame/InParentNamespace.cs +++ b/tests/MyGame/InParentNamespace.cs @@ -37,7 +37,7 @@ public struct InParentNamespace : IFlatbufferObject StartInParentNamespace(builder); return EndInParentNamespace(builder); } -}; +} public class InParentNamespaceT { diff --git a/tests/MyGame/MonsterExtra.cs b/tests/MyGame/MonsterExtra.cs index f3d557302..6af993288 100644 --- a/tests/MyGame/MonsterExtra.cs +++ b/tests/MyGame/MonsterExtra.cs @@ -147,7 +147,7 @@ public struct MonsterExtra : IFlatbufferObject _dvec, _fvec); } -}; +} public class MonsterExtraT { diff --git a/tests/keyword_test/KeywordsInTable.cs b/tests/keyword_test/KeywordsInTable.cs index aa2badcfe..fe91e8b23 100644 --- a/tests/keyword_test/KeywordsInTable.cs +++ b/tests/keyword_test/KeywordsInTable.cs @@ -53,7 +53,7 @@ public struct KeywordsInTable : IFlatbufferObject _o.Is, _o.Private); } -}; +} public class KeywordsInTableT { diff --git a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs index 6fa9dd3c4..0ed6a6386 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs @@ -43,7 +43,7 @@ public struct StructInNestedNS : IFlatbufferObject _o.A, _o.B); } -}; +} public class StructInNestedNST { diff --git a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs index b9471661b..9e6711297 100644 --- a/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs +++ b/tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs @@ -49,7 +49,7 @@ public struct TableInNestedNS : IFlatbufferObject builder, _o.Foo); } -}; +} public class TableInNestedNST { diff --git a/tests/namespace_test/NamespaceA/SecondTableInA.cs b/tests/namespace_test/NamespaceA/SecondTableInA.cs index 3cad23180..6e7ef88d9 100644 --- a/tests/namespace_test/NamespaceA/SecondTableInA.cs +++ b/tests/namespace_test/NamespaceA/SecondTableInA.cs @@ -49,7 +49,7 @@ public struct SecondTableInA : IFlatbufferObject builder, _refer_to_c); } -}; +} public class SecondTableInAT { diff --git a/tests/namespace_test/NamespaceA/TableInFirstNS.cs b/tests/namespace_test/NamespaceA/TableInFirstNS.cs index 112d4e889..6522f4933 100644 --- a/tests/namespace_test/NamespaceA/TableInFirstNS.cs +++ b/tests/namespace_test/NamespaceA/TableInFirstNS.cs @@ -83,7 +83,7 @@ public struct TableInFirstNS : IFlatbufferObject _foo_union, _o.FooStruct); } -}; +} public class TableInFirstNST { diff --git a/tests/namespace_test/NamespaceC/TableInC.cs b/tests/namespace_test/NamespaceC/TableInC.cs index 2881003e0..2077e326d 100644 --- a/tests/namespace_test/NamespaceC/TableInC.cs +++ b/tests/namespace_test/NamespaceC/TableInC.cs @@ -56,7 +56,7 @@ public struct TableInC : IFlatbufferObject _refer_to_a1, _refer_to_a2); } -}; +} public class TableInCT { diff --git a/tests/optional_scalars/ScalarStuff.cs b/tests/optional_scalars/ScalarStuff.cs index 9b48e47c8..f7ad73a80 100644 --- a/tests/optional_scalars/ScalarStuff.cs +++ b/tests/optional_scalars/ScalarStuff.cs @@ -261,7 +261,7 @@ public struct ScalarStuff : IFlatbufferObject _o.MaybeEnum, _o.DefaultEnum); } -}; +} public class ScalarStuffT { diff --git a/tests/union_vector/Attacker.cs b/tests/union_vector/Attacker.cs index d5bb81b89..cf6d1a7ca 100644 --- a/tests/union_vector/Attacker.cs +++ b/tests/union_vector/Attacker.cs @@ -46,7 +46,7 @@ public struct Attacker : IFlatbufferObject builder, _o.SwordAttackDamage); } -}; +} public class AttackerT { diff --git a/tests/union_vector/BookReader.cs b/tests/union_vector/BookReader.cs index 3f80cdf5e..6cd88b3f2 100644 --- a/tests/union_vector/BookReader.cs +++ b/tests/union_vector/BookReader.cs @@ -35,7 +35,7 @@ public struct BookReader : IFlatbufferObject builder, _o.BooksRead); } -}; +} public class BookReaderT { diff --git a/tests/union_vector/Movie.cs b/tests/union_vector/Movie.cs index bfbc10de3..f85daa6a7 100644 --- a/tests/union_vector/Movie.cs +++ b/tests/union_vector/Movie.cs @@ -148,7 +148,7 @@ public struct Movie : IFlatbufferObject _characters_type, _characters); } -}; +} public class MovieT { diff --git a/tests/union_vector/Rapunzel.cs b/tests/union_vector/Rapunzel.cs index e5ffff8e0..31d2cdfd3 100644 --- a/tests/union_vector/Rapunzel.cs +++ b/tests/union_vector/Rapunzel.cs @@ -35,7 +35,7 @@ public struct Rapunzel : IFlatbufferObject builder, _o.HairLength); } -}; +} public class RapunzelT {