Support structs in json_to_flatbuffer
Our JSON flatbuffer parsing code did not support structs properly.
Doing this enables easily defining lots of different layouts of
flatbuffers for more thoroughly testing flatbuffer-related changes (as
well as just making the JSON parsing more complete).
Change-Id: Ibfc7a149f9c8b314f6bbba70b4ca6b5857a8728b
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/aos/json_to_flatbuffer.fbs b/aos/json_to_flatbuffer.fbs
index 7180322..e66ec4a 100644
--- a/aos/json_to_flatbuffer.fbs
+++ b/aos/json_to_flatbuffer.fbs
@@ -62,6 +62,15 @@
nested_struct:FooStructNested;
}
+struct ScalarSweepStruct {
+ foo_float:float;
+ foo_double:double;
+ foo_int32:int32;
+ foo_uint32:uint32;
+ foo_int64:int64;
+ foo_uint64:uint64;
+}
+
struct StructEnum {
foo_enum:BaseType;
}
@@ -131,9 +140,11 @@
foo_struct:FooStruct (id: 34);
vector_foo_struct:[FooStruct] (id: 35);
foo_struct_enum:StructEnum (id: 36);
+ foo_struct_scalars:ScalarSweepStruct (id: 37);
+ vector_foo_struct_scalars:[ScalarSweepStruct] (id: 38);
- foo_enum_nonconsecutive:NonConsecutive (id: 37);
- foo_enum_nonconsecutive_default:NonConsecutive = Big (id: 38);
+ foo_enum_nonconsecutive:NonConsecutive (id: 39);
+ foo_enum_nonconsecutive_default:NonConsecutive = Big (id: 40);
}
root_type Configuration;