-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[C#] Fix collision of field name and type name (#7149)
* Fix C/C++ Create<Type>Direct with sorted vectors If a struct has a key the vector has to be sorted. To sort the vector you can't use "const". * Changes due to code review * Improve code readability * Add generate of JSON schema to string to lib * option indent_step is supported * Remove unused variables * Fix break in test * Fix style to be consistent with rest of the code * [TS] Fix reserved words as arguments (#6955) * [TS] Fix generation of reserved words in object api (#7106) * [TS] Fix generation of object api * [TS] Fix MakeCamel -> ConvertCase * [C#] Fix collision of field name and type name * [TS] Add test for struct of struct of struct * Update generated files * Add missing files * [TS] Fix query of null/undefined fields in object api * Add example for type field name collision
- Loading branch information
Showing
4 changed files
with
107 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| namespace type_field_collsion; | ||
|
|
||
| // This table tests collsions of identifiers. | ||
| table Collision { | ||
| collision : int; | ||
| } | ||
|
|
||
| root_type Collision; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // <auto-generated> | ||
| // automatically generated by the FlatBuffers compiler, do not modify | ||
| // </auto-generated> | ||
|
|
||
| namespace type_field_collsion | ||
| { | ||
|
|
||
| using global::System; | ||
| using global::System.Collections.Generic; | ||
| using global::FlatBuffers; | ||
|
|
||
| public struct Collision : IFlatbufferObject | ||
| { | ||
| private Table __p; | ||
| public ByteBuffer ByteBuffer { get { return __p.bb; } } | ||
| public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); } | ||
| public static Collision GetRootAsCollision(ByteBuffer _bb) { return GetRootAsCollision(_bb, new Collision()); } | ||
| public static Collision GetRootAsCollision(ByteBuffer _bb, Collision obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); } | ||
| public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); } | ||
| public Collision __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } | ||
|
|
||
| public int Collision_ { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } } | ||
|
|
||
| public static Offset<type_field_collsion.Collision> CreateCollision(FlatBufferBuilder builder, | ||
| int collision = 0) { | ||
| builder.StartTable(1); | ||
| Collision.AddCollision(builder, collision); | ||
| return Collision.EndCollision(builder); | ||
| } | ||
|
|
||
| public static void StartCollision(FlatBufferBuilder builder) { builder.StartTable(1); } | ||
| public static void AddCollision(FlatBufferBuilder builder, int collision) { builder.AddInt(0, collision, 0); } | ||
| public static Offset<type_field_collsion.Collision> EndCollision(FlatBufferBuilder builder) { | ||
| int o = builder.EndTable(); | ||
| return new Offset<type_field_collsion.Collision>(o); | ||
| } | ||
| public static void FinishCollisionBuffer(FlatBufferBuilder builder, Offset<type_field_collsion.Collision> offset) { builder.Finish(offset.Value); } | ||
| public static void FinishSizePrefixedCollisionBuffer(FlatBufferBuilder builder, Offset<type_field_collsion.Collision> offset) { builder.FinishSizePrefixed(offset.Value); } | ||
| public CollisionT UnPack() { | ||
| var _o = new CollisionT(); | ||
| this.UnPackTo(_o); | ||
| return _o; | ||
| } | ||
| public void UnPackTo(CollisionT _o) { | ||
| _o.Collision_ = this.Collision_; | ||
| } | ||
| public static Offset<type_field_collsion.Collision> Pack(FlatBufferBuilder builder, CollisionT _o) { | ||
| if (_o == null) return default(Offset<type_field_collsion.Collision>); | ||
| return CreateCollision( | ||
| builder, | ||
| _o.Collision_); | ||
| } | ||
| } | ||
|
|
||
| public class CollisionT | ||
| { | ||
| public int Collision_ { get; set; } | ||
|
|
||
| public CollisionT() { | ||
| this.Collision_ = 0; | ||
| } | ||
| public static CollisionT DeserializeFromBinary(byte[] fbBuffer) { | ||
| return Collision.GetRootAsCollision(new ByteBuffer(fbBuffer)).UnPack(); | ||
| } | ||
| public byte[] SerializeToBinary() { | ||
| var fbb = new FlatBufferBuilder(0x10000); | ||
| Collision.FinishCollisionBuffer(fbb, Collision.Pack(fbb, this)); | ||
| return fbb.DataBuffer.ToSizedArray(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } |