BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-26 11:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[C#, Java, C++] Fixes issue #5399 by always including namespaces (#5404)

Browse Source 
* [C#] Fixes issue #5399 by always including namespaces

* Updated tests for code generator changes

* Fixed 'As' method names
This commit is contained in:
John Luxford
2019-06-14 10:47:08 -05:00
committed by Wouter van Oortmerssen
parent a6be1d0d74
commit a80db8538c
26 changed files with 560 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/namespace_test/NamespaceA/NamespaceB/StructInNestedNS.cs
View File

@@ -20,11 +20,11 @@ public struct StructInNestedNS : IFlatbufferObject
public int B { get { return __p.bb.GetInt(__p.bb_pos + 4); } }
public void MutateB(int b) { __p.bb.PutInt(__p.bb_pos + 4, b); }
public static Offset<StructInNestedNS> CreateStructInNestedNS(FlatBufferBuilder builder, int A, int B) {
public static Offset<NamespaceA.NamespaceB.StructInNestedNS> CreateStructInNestedNS(FlatBufferBuilder builder, int A, int B) {
builder.Prep(4, 8);
builder.PutInt(B);
builder.PutInt(A);
return new Offset<StructInNestedNS>(builder.Offset);
return new Offset<NamespaceA.NamespaceB.StructInNestedNS>(builder.Offset);
}
};

6
tests/namespace_test/NamespaceA/NamespaceB/TableInNestedNS.cs
View File

@@ -20,7 +20,7 @@ public struct TableInNestedNS : IFlatbufferObject
public int Foo { get { int o = __p.__offset(4); return o != 0 ? __p.bb.GetInt(o + __p.bb_pos) : (int)0; } }
public bool MutateFoo(int foo) { int o = __p.__offset(4); if (o != 0) { __p.bb.PutInt(o + __p.bb_pos, foo); return true; } else { return false; } }
public static Offset<TableInNestedNS> CreateTableInNestedNS(FlatBufferBuilder builder,
public static Offset<NamespaceA.NamespaceB.TableInNestedNS> CreateTableInNestedNS(FlatBufferBuilder builder,
int foo = 0) {
builder.StartTable(1);
TableInNestedNS.AddFoo(builder, foo);
@@ -29,9 +29,9 @@ public struct TableInNestedNS : IFlatbufferObject
public static void StartTableInNestedNS(FlatBufferBuilder builder) { builder.StartTable(1); }
public static void AddFoo(FlatBufferBuilder builder, int foo) { builder.AddInt(0, foo, 0); }
public static Offset<TableInNestedNS> EndTableInNestedNS(FlatBufferBuilder builder) {
public static Offset<NamespaceA.NamespaceB.TableInNestedNS> EndTableInNestedNS(FlatBufferBuilder builder) {
int o = builder.EndTable();
return new Offset<TableInNestedNS>(o);
return new Offset<NamespaceA.NamespaceB.TableInNestedNS>(o);
}
};

6
tests/namespace_test/NamespaceA/SecondTableInA.cs
View File

@@ -19,7 +19,7 @@ public struct SecondTableInA : IFlatbufferObject
public NamespaceC.TableInC? ReferToC { get { int o = __p.__offset(4); return o != 0 ? (NamespaceC.TableInC?)(new NamespaceC.TableInC()).__assign(__p.__indirect(o + __p.bb_pos), __p.bb) : null; } }
public static Offset<SecondTableInA> CreateSecondTableInA(FlatBufferBuilder builder,
public static Offset<NamespaceA.SecondTableInA> CreateSecondTableInA(FlatBufferBuilder builder,
Offset<NamespaceC.TableInC> refer_to_cOffset = default(Offset<NamespaceC.TableInC>)) {
builder.StartTable(1);
SecondTableInA.AddReferToC(builder, refer_to_cOffset);
@@ -28,9 +28,9 @@ public struct SecondTableInA : IFlatbufferObject
public static void StartSecondTableInA(FlatBufferBuilder builder) { builder.StartTable(1); }
public static void AddReferToC(FlatBufferBuilder builder, Offset<NamespaceC.TableInC> referToCOffset) { builder.AddOffset(0, referToCOffset.Value, 0); }
public static Offset<SecondTableInA> EndSecondTableInA(FlatBufferBuilder builder) {
public static Offset<NamespaceA.SecondTableInA> EndSecondTableInA(FlatBufferBuilder builder) {
int o = builder.EndTable();
return new Offset<SecondTableInA>(o);
return new Offset<NamespaceA.SecondTableInA>(o);
}
};

4
tests/namespace_test/NamespaceA/TableInFirstNS.cs
View File

@@ -26,9 +26,9 @@ public struct TableInFirstNS : IFlatbufferObject
public static void AddFooTable(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.TableInNestedNS> fooTableOffset) { builder.AddOffset(0, fooTableOffset.Value, 0); }
public static void AddFooEnum(FlatBufferBuilder builder, NamespaceA.NamespaceB.EnumInNestedNS fooEnum) { builder.AddSbyte(1, (sbyte)fooEnum, 0); }
public static void AddFooStruct(FlatBufferBuilder builder, Offset<NamespaceA.NamespaceB.StructInNestedNS> fooStructOffset) { builder.AddStruct(2, fooStructOffset.Value, 0); }
public static Offset<TableInFirstNS> EndTableInFirstNS(FlatBufferBuilder builder) {
public static Offset<NamespaceA.TableInFirstNS> EndTableInFirstNS(FlatBufferBuilder builder) {
int o = builder.EndTable();
return new Offset<TableInFirstNS>(o);
return new Offset<NamespaceA.TableInFirstNS>(o);
}
};