Release version 0.5.3

Author: mikkelfj

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## [0.5.3-pre]
+## [0.5.3]
 - BREAKING: 0.5.3 changes behavour of builder create calls so arguments
   are always ordered by field id when id attributes are being used, for
   example `MyGame_Example_Monster_create()` in `monster_test_fbs` (#81).

README.md

@@ -289,11 +289,13 @@ fi
 
 ## Status
 
-Release 0.5.3 (not released)
-BREAKING: 0.5.3 changes behavour of builder create calls so arguments
-are always ordered by field id when id attributes are being used, for
-example `MyGame_Example_Monster_create()` in `monster_test.fbs`
-([#81](https://github.com/dvidelabs/flatcc/issues/81)).
+Release 0.5.3 inlcudes various bug fixes (see changelog) and one
+breaking but likely low impact change: BREAKING: 0.5.3 changes behavour
+of builder create calls so arguments are always ordered by field id when
+id attributes are being used, for example
+`MyGame_Example_Monster_create()` in `monster_test.fbs`
+([#81](https://github.com/dvidelabs/flatcc/issues/81)). Fixes undefined
+behavior when sorting tables by a numeric key field.
 
 Release 0.5.2 introduces optional `_get` suffix to reader methods. By
 using `flatcc -g` only `_get` methods are valid. This removes potential

include/flatcc/flatcc_version.h

@@ -2,12 +2,12 @@
 extern "C" {
 #endif
 
-#define FLATCC_VERSION_TEXT "0.5.3-pre"
+#define FLATCC_VERSION_TEXT "0.5.3"
 #define FLATCC_VERSION_MAJOR 0
 #define FLATCC_VERSION_MINOR 5
 #define FLATCC_VERSION_PATCH 3
 /* 1 or 0 */
-#define FLATCC_VERSION_RELEASED 0
+#define FLATCC_VERSION_RELEASED 1
 
 #ifdef __cplusplus
 }

include/flatcc/reflection/flatbuffers_common_builder.h

@@ -1,7 +1,7 @@
 #ifndef FLATBUFFERS_COMMON_BUILDER_H
 #define FLATBUFFERS_COMMON_BUILDER_H
 
-/* Generated by flatcc 0.5.3-pre FlatBuffers schema compiler for C by dvide.com */
+/* Generated by flatcc 0.5.3 FlatBuffers schema compiler for C by dvide.com */
 
 /* Common FlatBuffers build functionality for C. */
 
@@ -227,15 +227,15 @@ static inline N ## _union_vec_ref_t N ## _vec_create(NS ## builder_t *B, const N
 __flatbuffers_build_union_vector_ops(NS, N ## _vec, N, N)\
 /* Preserves DAG structure separately for type and value vector, so a type vector could be shared for many value vectors. */\
 static inline N ## _union_vec_ref_t N ## _vec_clone(NS ## builder_t *B, N ##_union_vec_t vec)\
-{ N ## _union_vec_ref_t _uvref, _ret = { 0, 0 }; NS ## union_ref_t _uref; size_t _i, _len; flatcc_builder_ref_t *_p;\
+{ N ## _union_vec_ref_t _uvref, _ret = { 0, 0 }; NS ## union_ref_t _uref; size_t _i, _len;\
   if (vec.type == 0) return _ret;\
   _uvref.type = flatcc_builder_refmap_find(B, vec.type); _uvref.value = flatcc_builder_refmap_find(B, vec.value);\
   _len = N ## _union_vec_len(vec); if (_uvref.type == 0) {\
   _uvref.type = flatcc_builder_refmap_insert(B, vec.type, (flatcc_builder_create_type_vector(B, vec.type, _len))); }\
   if (_uvref.type == 0) return _ret; if (_uvref.value == 0) {\
-    if (flatcc_builder_start_offset_vector(B)) return _ret;\
-    _p = flatcc_builder_extend_offset_vector(B, _len); if (!_p) return _ret;\
-   for (_i = 0; _i < _len; ++_i) { _uref = N ## _clone(B, N ## _union_vec_at(vec, _i)); _p[_i] = _uref.value; }\
+  if (flatcc_builder_start_offset_vector(B)) return _ret;\
+  for (_i = 0; _i < _len; ++_i) { _uref = N ## _clone(B, N ## _union_vec_at(vec, _i));\
+    if (!_uref.value || !(flatcc_builder_offset_vector_push(B, _uref.value))) return _ret; }\
   _uvref.value = flatcc_builder_refmap_insert(B, vec.value, flatcc_builder_end_offset_vector(B));\
   if (_uvref.value == 0) return _ret; } return _uvref; }
 
@@ -287,10 +287,10 @@ static inline N ## _vec_ref_t N ## _vec_create(NS ## builder_t *B, const N ## _r
 { return flatcc_builder_create_offset_vector(B, data, len); }\
 __flatbuffers_build_offset_vector_ops(NS, N ## _vec, N, N)\
 static inline N ## _vec_ref_t N ## _vec_clone(NS ## builder_t *B, N ##_vec_t vec)\
-{ int _ret; N ## _ref_t *_p; size_t _i, _len; __flatbuffers_memoize_begin(B, vec);\
+{ int _ret; N ## _ref_t _e; size_t _i, _len; __flatbuffers_memoize_begin(B, vec);\
  _len = N ## _vec_len(vec); if (flatcc_builder_start_offset_vector(B)) return 0;\
-  _p = flatcc_builder_extend_offset_vector(B, _len); if (!_p) return 0;\
-  for (_i = 0; _i < _len; ++_i) { if (!(_p[_i] = N ## _clone(B, N ## _vec_at(vec, _i)))) return 0; }\
+  for (_i = 0; _i < _len; ++_i) { if (!(_e = N ## _clone(B, N ## _vec_at(vec, _i)))) return 0;\
+    if (!flatcc_builder_offset_vector_push(B, _e)) return 0; }\
   __flatbuffers_memoize_end(B, vec, flatcc_builder_end_offset_vector(B)); }\
 
 #define __flatbuffers_build_string_ops(NS, N)\

include/flatcc/reflection/flatbuffers_common_reader.h

@@ -1,7 +1,7 @@
 #ifndef FLATBUFFERS_COMMON_READER_H
 #define FLATBUFFERS_COMMON_READER_H
 
-/* Generated by flatcc 0.5.3-pre FlatBuffers schema compiler for C by dvide.com */
+/* Generated by flatcc 0.5.3 FlatBuffers schema compiler for C by dvide.com */
 
 /* Common FlatBuffers read functionality for C. */
 
@@ -392,18 +392,24 @@ __flatbuffers_heap_sort(N, , __flatbuffers_identity, N ## _vec_at, N ## _vec_len
 static inline void N ## _vec_sort(N ## _mutable_vec_t vec__tmp) { __ ## N ## __heap_sort(vec__tmp); }
 #define __flatbuffers_scalar_diff(x, y) ((x) < (y) ? -1 : (x) > (y))
 #define __flatbuffers_string_diff(x, y) __flatbuffers_string_n_cmp((x), (const char *)(y), flatbuffers_string_len(y))
-#define __flatbuffers_scalar_swap(vec, a, b, TE) { TE x__tmp = vec[b]; vec[b] = vec[a]; vec[a] = x__tmp; }
-#define __flatbuffers_string_swap(vec, a, b, TE)\
+#define __flatbuffers_value_swap(vec, a, b, TE) { TE x__tmp = vec[b]; vec[b] = vec[a]; vec[a] = x__tmp; }
+#define __flatbuffers_uoffset_swap(vec, a, b, TE)\
 { TE ta__tmp, tb__tmp, d__tmp;\
   d__tmp = (TE)((a - b) * sizeof(vec[0]));\
   ta__tmp =  __flatbuffers_uoffset_read_from_pe(vec + b) - d__tmp;\
   tb__tmp =  __flatbuffers_uoffset_read_from_pe(vec + a) + d__tmp;\
   __flatbuffers_uoffset_write_to_pe(vec + a, ta__tmp);\
   __flatbuffers_uoffset_write_to_pe(vec + b, tb__tmp); }
-#define __flatbuffers_define_sort_by_scalar_field(N, NK, TK, TE)\
-  __flatbuffers_define_sort_by_field(N, NK, TK, TE, __flatbuffers_scalar_diff, __flatbuffers_scalar_swap)
-#define __flatbuffers_define_sort_by_string_field(N, NK)\
-  __flatbuffers_define_sort_by_field(N, NK, flatbuffers_string_t, flatbuffers_uoffset_t, __flatbuffers_string_diff, __flatbuffers_string_swap)
+#define __flatbuffers_scalar_swap(vec, a, b, TE) __flatbuffers_value_swap(vec, a, b, TE)
+#define __flatbuffers_string_swap(vec, a, b, TE) __flatbuffers_uoffset_swap(vec, a, b, TE)
+#define __flatbuffers_struct_swap(vec, a, b, TE) __flatbuffers_value_swap(vec, a, b, TE)
+#define __flatbuffers_table_swap(vec, a, b, TE) __flatbuffers_uoffset_swap(vec, a, b, TE)
+#define __flatbuffers_define_struct_sort_by_scalar_field(N, NK, TK, TE)\
+  __flatbuffers_define_sort_by_field(N, NK, TK, TE, __flatbuffers_scalar_diff, __flatbuffers_struct_swap)
+#define __flatbuffers_define_table_sort_by_scalar_field(N, NK, TK)\
+  __flatbuffers_define_sort_by_field(N, NK, TK, flatbuffers_uoffset_t, __flatbuffers_scalar_diff, __flatbuffers_table_swap)
+#define __flatbuffers_define_table_sort_by_string_field(N, NK)\
+  __flatbuffers_define_sort_by_field(N, NK, flatbuffers_string_t, flatbuffers_uoffset_t, __flatbuffers_string_diff, __flatbuffers_table_swap)
 #define __flatbuffers_define_scalar_sort(N, T) __flatbuffers_define_sort(N, T, T, __flatbuffers_scalar_diff, __flatbuffers_scalar_swap)
 #define __flatbuffers_define_string_sort() __flatbuffers_define_sort(flatbuffers_string, flatbuffers_string_t, flatbuffers_uoffset_t, __flatbuffers_string_diff, __flatbuffers_string_swap)
 #define __flatbuffers_define_scalar_vector(N, T)\

include/flatcc/reflection/reflection_builder.h

@@ -1,7 +1,7 @@
 #ifndef REFLECTION_BUILDER_H
 #define REFLECTION_BUILDER_H
 
-/* Generated by flatcc 0.5.3-pre FlatBuffers schema compiler for C by dvide.com */
+/* Generated by flatcc 0.5.3 FlatBuffers schema compiler for C by dvide.com */
 
 #ifndef REFLECTION_READER_H
 #include "reflection_reader.h"

include/flatcc/reflection/reflection_reader.h

@@ -1,7 +1,7 @@
 #ifndef REFLECTION_READER_H
 #define REFLECTION_READER_H
 
-/* Generated by flatcc 0.5.3-pre FlatBuffers schema compiler for C by dvide.com */
+/* Generated by flatcc 0.5.3 FlatBuffers schema compiler for C by dvide.com */
 
 #ifndef FLATBUFFERS_COMMON_READER_H
 #include "flatbuffers_common_reader.h"
@@ -166,7 +166,7 @@ __flatbuffers_table_as_root(reflection_KeyValue)
 
 __flatbuffers_define_string_field(0, reflection_KeyValue, key, 1)
 __flatbuffers_define_find_by_string_field(reflection_KeyValue, key)
-__flatbuffers_define_sort_by_string_field(reflection_KeyValue, key)
+__flatbuffers_define_table_sort_by_string_field(reflection_KeyValue, key)
 __flatbuffers_define_default_find_by_string_field(reflection_KeyValue, key)
 __flatbuffers_define_default_scan_by_string_field(reflection_KeyValue, key)
 #define reflection_KeyValue_vec_sort reflection_KeyValue_vec_sort_by_key
@@ -184,7 +184,7 @@ __flatbuffers_define_string_field(0, reflection_EnumVal, name, 1)
 __flatbuffers_define_scalar_field(1, reflection_EnumVal, value, flatbuffers_int64, int64_t, INT64_C(0))
 /* Note: find only works on vectors sorted by this field. */
 __flatbuffers_define_find_by_scalar_field(reflection_EnumVal, value, int64_t)
-__flatbuffers_define_sort_by_scalar_field(reflection_EnumVal, value, int64_t, flatbuffers_uoffset_t)
+__flatbuffers_define_table_sort_by_scalar_field(reflection_EnumVal, value, int64_t)
 __flatbuffers_define_default_find_by_scalar_field(reflection_EnumVal, value, int64_t)
 __flatbuffers_define_default_scan_by_scalar_field(reflection_EnumVal, value, int64_t)
 #define reflection_EnumVal_vec_sort reflection_EnumVal_vec_sort_by_value
@@ -201,7 +201,7 @@ __flatbuffers_table_as_root(reflection_Enum)
 
 __flatbuffers_define_string_field(0, reflection_Enum, name, 1)
 __flatbuffers_define_find_by_string_field(reflection_Enum, name)
-__flatbuffers_define_sort_by_string_field(reflection_Enum, name)
+__flatbuffers_define_table_sort_by_string_field(reflection_Enum, name)
 __flatbuffers_define_default_find_by_string_field(reflection_Enum, name)
 __flatbuffers_define_default_scan_by_string_field(reflection_Enum, name)
 #define reflection_Enum_vec_sort reflection_Enum_vec_sort_by_name
@@ -220,7 +220,7 @@ __flatbuffers_table_as_root(reflection_Field)
 
 __flatbuffers_define_string_field(0, reflection_Field, name, 1)
 __flatbuffers_define_find_by_string_field(reflection_Field, name)
-__flatbuffers_define_sort_by_string_field(reflection_Field, name)
+__flatbuffers_define_table_sort_by_string_field(reflection_Field, name)
 __flatbuffers_define_default_find_by_string_field(reflection_Field, name)
 __flatbuffers_define_default_scan_by_string_field(reflection_Field, name)
 #define reflection_Field_vec_sort reflection_Field_vec_sort_by_name
@@ -244,7 +244,7 @@ __flatbuffers_table_as_root(reflection_Object)
 
 __flatbuffers_define_string_field(0, reflection_Object, name, 1)
 __flatbuffers_define_find_by_string_field(reflection_Object, name)
-__flatbuffers_define_sort_by_string_field(reflection_Object, name)
+__flatbuffers_define_table_sort_by_string_field(reflection_Object, name)
 __flatbuffers_define_default_find_by_string_field(reflection_Object, name)
 __flatbuffers_define_default_scan_by_string_field(reflection_Object, name)
 #define reflection_Object_vec_sort reflection_Object_vec_sort_by_name

include/flatcc/reflection/reflection_verifier.h

@@ -1,7 +1,7 @@
 #ifndef REFLECTION_VERIFIER_H
 #define REFLECTION_VERIFIER_H
 
-/* Generated by flatcc 0.5.3-pre FlatBuffers schema compiler for C by dvide.com */
+/* Generated by flatcc 0.5.3 FlatBuffers schema compiler for C by dvide.com */
 
 #ifndef REFLECTION_READER_H
 #include "reflection_reader.h"