summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/idl_gen_general.cpp10
-rw-r--r--tests/FlatBuffers.Test/FlatBuffers.Test.csproj3
-rw-r--r--tests/MyGame/Example/Any.cs1
-rw-r--r--tests/MyGame/Example/Any.go1
-rw-r--r--tests/MyGame/Example/Any.java3
-rw-r--r--tests/MyGame/Example/TestSimpleTableWithEnum.cs31
-rw-r--r--tests/MyGame/Example/TestSimpleTableWithEnum.go27
-rw-r--r--tests/MyGame/Example/TestSimpleTableWithEnum.java31
-rwxr-xr-xtests/monster_test.fbs6
-rw-r--r--tests/monster_test_generated.h36
10 files changed, 144 insertions, 5 deletions
diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index def1ad3b..b2b71465 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -789,7 +789,15 @@ static void GenStruct(const LanguageParameters &lang, const Parser &parser,
// Java doesn't have defaults, which means this method must always
// supply all arguments, and thus won't compile when fields are added.
if (lang.language != GeneratorOptions::kJava) {
- code += " = " + GenDefaultValue(lang, field.value, false);
+ code += " = ";
+ // in C#, enum values have their own type, so we need to cast the
+ // numeric value to the proper type
+ if (lang.language == GeneratorOptions::kCSharp &&
+ field.value.type.enum_def != nullptr &&
+ field.value.type.base_type != BASE_TYPE_UNION) {
+ code += "(" + field.value.type.enum_def->name + ")";
+ }
+ code += GenDefaultValue(lang, field.value, false);
}
}
code += ") {\n builder.";
diff --git a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
index fd1c6020..bfc0fe18 100644
--- a/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
+++ b/tests/FlatBuffers.Test/FlatBuffers.Test.csproj
@@ -71,6 +71,9 @@
<Compile Include="..\MyGame\Example\Test.cs">
<Link>MyGame\Example\Test.cs</Link>
</Compile>
+ <Compile Include="..\MyGame\Example\TestSimpleTableWithEnum.cs">
+ <Link>MyGame\Example\TestSimpleTableWithEnum.cs</Link>
+ </Compile>
<Compile Include="..\MyGame\Example\Vec3.cs">
<Link>MyGame\Example\Vec3.cs</Link>
</Compile>
diff --git a/tests/MyGame/Example/Any.cs b/tests/MyGame/Example/Any.cs
index b7a5b361..a05a9185 100644
--- a/tests/MyGame/Example/Any.cs
+++ b/tests/MyGame/Example/Any.cs
@@ -7,6 +7,7 @@ public enum Any : byte
{
NONE = 0,
Monster = 1,
+ TestSimpleTableWithEnum = 2,
};
diff --git a/tests/MyGame/Example/Any.go b/tests/MyGame/Example/Any.go
index 0039bb8c..a23de4cb 100644
--- a/tests/MyGame/Example/Any.go
+++ b/tests/MyGame/Example/Any.go
@@ -5,4 +5,5 @@ package Example
const (
AnyNONE = 0
AnyMonster = 1
+ AnyTestSimpleTableWithEnum = 2
)
diff --git a/tests/MyGame/Example/Any.java b/tests/MyGame/Example/Any.java
index f811f973..cdc3ec56 100644
--- a/tests/MyGame/Example/Any.java
+++ b/tests/MyGame/Example/Any.java
@@ -6,8 +6,9 @@ public final class Any {
private Any() { }
public static final byte NONE = 0;
public static final byte Monster = 1;
+ public static final byte TestSimpleTableWithEnum = 2;
- private static final String[] names = { "NONE", "Monster", };
+ private static final String[] names = { "NONE", "Monster", "TestSimpleTableWithEnum", };
public static String name(int e) { return names[e]; }
};
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.cs b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
new file mode 100644
index 00000000..d2e75b52
--- /dev/null
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.cs
@@ -0,0 +1,31 @@
+// automatically generated, do not modify
+
+namespace MyGame.Example
+{
+
+using FlatBuffers;
+
+public sealed class TestSimpleTableWithEnum : Table {
+ public static TestSimpleTableWithEnum GetRootAsTestSimpleTableWithEnum(ByteBuffer _bb) { return GetRootAsTestSimpleTableWithEnum(_bb, new TestSimpleTableWithEnum()); }
+ public static TestSimpleTableWithEnum GetRootAsTestSimpleTableWithEnum(ByteBuffer _bb, TestSimpleTableWithEnum obj) { return (obj.__init(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
+ public TestSimpleTableWithEnum __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+ public Color Color { get { int o = __offset(4); return o != 0 ? (Color)bb.GetSbyte(o + bb_pos) : (Color)2; } }
+
+ public static Offset<TestSimpleTableWithEnum> CreateTestSimpleTableWithEnum(FlatBufferBuilder builder,
+ Color color = (Color)2) {
+ builder.StartObject(1);
+ TestSimpleTableWithEnum.AddColor(builder, color);
+ return TestSimpleTableWithEnum.EndTestSimpleTableWithEnum(builder);
+ }
+
+ public static void StartTestSimpleTableWithEnum(FlatBufferBuilder builder) { builder.StartObject(1); }
+ public static void AddColor(FlatBufferBuilder builder, Color color) { builder.AddSbyte(0, (sbyte)(color), 2); }
+ public static Offset<TestSimpleTableWithEnum> EndTestSimpleTableWithEnum(FlatBufferBuilder builder) {
+ int o = builder.EndObject();
+ return new Offset<TestSimpleTableWithEnum>(o);
+ }
+};
+
+
+}
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.go b/tests/MyGame/Example/TestSimpleTableWithEnum.go
new file mode 100644
index 00000000..a26a53e4
--- /dev/null
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.go
@@ -0,0 +1,27 @@
+// automatically generated, do not modify
+
+package Example
+
+import (
+ flatbuffers "github.com/google/flatbuffers/go"
+)
+type TestSimpleTableWithEnum struct {
+ _tab flatbuffers.Table
+}
+
+func (rcv *TestSimpleTableWithEnum) Init(buf []byte, i flatbuffers.UOffsetT) {
+ rcv._tab.Bytes = buf
+ rcv._tab.Pos = i
+}
+
+func (rcv *TestSimpleTableWithEnum) Color() int8 {
+ o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
+ if o != 0 {
+ return rcv._tab.GetInt8(o + rcv._tab.Pos)
+ }
+ return 2
+}
+
+func TestSimpleTableWithEnumStart(builder *flatbuffers.Builder) { builder.StartObject(1) }
+func TestSimpleTableWithEnumAddColor(builder *flatbuffers.Builder, color int8) { builder.PrependInt8Slot(0, color, 2) }
+func TestSimpleTableWithEnumEnd(builder *flatbuffers.Builder) flatbuffers.UOffsetT { return builder.EndObject() }
diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.java b/tests/MyGame/Example/TestSimpleTableWithEnum.java
new file mode 100644
index 00000000..af9d7dbf
--- /dev/null
+++ b/tests/MyGame/Example/TestSimpleTableWithEnum.java
@@ -0,0 +1,31 @@
+// automatically generated, do not modify
+
+package MyGame.Example;
+
+import java.nio.*;
+import java.lang.*;
+import java.util.*;
+import com.google.flatbuffers.*;
+
+public final class TestSimpleTableWithEnum extends Table {
+ public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb) { return getRootAsTestSimpleTableWithEnum(_bb, new TestSimpleTableWithEnum()); }
+ public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb, TestSimpleTableWithEnum obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__init(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
+ public TestSimpleTableWithEnum __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; return this; }
+
+ public byte color() { int o = __offset(4); return o != 0 ? bb.get(o + bb_pos) : 2; }
+
+ public static int createTestSimpleTableWithEnum(FlatBufferBuilder builder,
+ byte color) {
+ builder.startObject(1);
+ TestSimpleTableWithEnum.addColor(builder, color);
+ return TestSimpleTableWithEnum.endTestSimpleTableWithEnum(builder);
+ }
+
+ public static void startTestSimpleTableWithEnum(FlatBufferBuilder builder) { builder.startObject(1); }
+ public static void addColor(FlatBufferBuilder builder, byte color) { builder.addByte(0, color, 2); }
+ public static int endTestSimpleTableWithEnum(FlatBufferBuilder builder) {
+ int o = builder.endObject();
+ return o;
+ }
+};
+
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
index 53fa87b8..6a205b05 100755
--- a/tests/monster_test.fbs
+++ b/tests/monster_test.fbs
@@ -8,10 +8,14 @@ attribute "priority";
enum Color:byte (bit_flags) { Red = 0, Green, Blue = 3, }
-union Any { Monster } // TODO: add more elements
+union Any { Monster, TestSimpleTableWithEnum } // TODO: add more elements
struct Test { a:short; b:byte; }
+table TestSimpleTableWithEnum {
+ color: Color = Green;
+}
+
struct Vec3 (force_align: 16) {
x:float;
y:float;
diff --git a/tests/monster_test_generated.h b/tests/monster_test_generated.h
index 7fb698b0..93262ddd 100644
--- a/tests/monster_test_generated.h
+++ b/tests/monster_test_generated.h
@@ -15,6 +15,7 @@ namespace MyGame {
namespace Example {
struct Test;
+struct TestSimpleTableWithEnum;
struct Vec3;
struct Stat;
struct Monster;
@@ -34,11 +35,12 @@ inline const char *EnumNameColor(Color e) { return EnumNamesColor()[e - Color_Re
enum Any {
Any_NONE = 0,
- Any_Monster = 1
+ Any_Monster = 1,
+ Any_TestSimpleTableWithEnum = 2
};
inline const char **EnumNamesAny() {
- static const char *names[] = { "NONE", "Monster", nullptr };
+ static const char *names[] = { "NONE", "Monster", "TestSimpleTableWithEnum", nullptr };
return names;
}
@@ -94,6 +96,35 @@ MANUALLY_ALIGNED_STRUCT(16) Vec3 FLATBUFFERS_FINAL_CLASS {
};
STRUCT_END(Vec3, 32);
+struct TestSimpleTableWithEnum FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+ Color color() const { return static_cast<Color>(GetField<int8_t>(4, 2)); }
+ bool mutate_color(Color color) { return SetField(4, static_cast<int8_t>(color)); }
+ bool Verify(flatbuffers::Verifier &verifier) const {
+ return VerifyTableStart(verifier) &&
+ VerifyField<int8_t>(verifier, 4 /* color */) &&
+ verifier.EndTable();
+ }
+};
+
+struct TestSimpleTableWithEnumBuilder {
+ flatbuffers::FlatBufferBuilder &fbb_;
+ flatbuffers::uoffset_t start_;
+ void add_color(Color color) { fbb_.AddElement<int8_t>(4, static_cast<int8_t>(color), 2); }
+ TestSimpleTableWithEnumBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
+ TestSimpleTableWithEnumBuilder &operator=(const TestSimpleTableWithEnumBuilder &);
+ flatbuffers::Offset<TestSimpleTableWithEnum> Finish() {
+ auto o = flatbuffers::Offset<TestSimpleTableWithEnum>(fbb_.EndTable(start_, 1));
+ return o;
+ }
+};
+
+inline flatbuffers::Offset<TestSimpleTableWithEnum> CreateTestSimpleTableWithEnum(flatbuffers::FlatBufferBuilder &_fbb,
+ Color color = Color_Green) {
+ TestSimpleTableWithEnumBuilder builder_(_fbb);
+ builder_.add_color(color);
+ return builder_.Finish();
+}
+
struct Stat FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const flatbuffers::String *id() const { return GetPointer<const flatbuffers::String *>(4); }
flatbuffers::String *mutable_id() { return GetPointer<flatbuffers::String *>(4); }
@@ -318,6 +349,7 @@ inline bool VerifyAny(flatbuffers::Verifier &verifier, const void *union_obj, An
switch (type) {
case Any_NONE: return true;
case Any_Monster: return verifier.VerifyTable(reinterpret_cast<const Monster *>(union_obj));
+ case Any_TestSimpleTableWithEnum: return verifier.VerifyTable(reinterpret_cast<const TestSimpleTableWithEnum *>(union_obj));
default: return false;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 14:13:44 +0000