summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--upb/bindings/lua/upb/table.c6
-rw-r--r--upb/msg.c8
-rw-r--r--upb/msg.h93
-rw-r--r--upb/table.int.h43
-rw-r--r--upb/upb.h97
5 files changed, 120 insertions, 127 deletions
diff --git a/upb/bindings/lua/upb/table.c b/upb/bindings/lua/upb/table.c
index 79120c7..9692df4 100644
--- a/upb/bindings/lua/upb/table.c
+++ b/upb/bindings/lua/upb/table.c
@@ -33,13 +33,13 @@ static void lupbtable_setnum(lua_State *L, int tab, const char *key,
static void lupbtable_pushval(lua_State *L, upb_tabval val, upb_ctype_t ctype) {
switch (ctype) {
case UPB_CTYPE_INT32:
- lua_pushnumber(L, val.val);
+ lua_pushnumber(L, upb_msgval_getint32(val));
break;
case UPB_CTYPE_PTR:
- lupb_def_pushwrapper(L, (void*)val.val, NULL);
+ lupb_def_pushwrapper(L, upb_msgval_getptr(val), NULL);
break;
case UPB_CTYPE_CSTR:
- lua_pushstring(L, (const char*)val.val);
+ lua_pushstring(L, upb_msgval_getcstr(val));
break;
default:
luaL_error(L, "Unexpected type: %d", ctype);
diff --git a/upb/msg.c b/upb/msg.c
index 527587f..a045102 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -95,16 +95,12 @@ static uint8_t upb_msg_fielddefsize(const upb_fielddef *f) {
* pointer to that in the tables for extensions/maps. */
static upb_value upb_toval(upb_msgval val) {
upb_value ret;
- UPB_UNUSED(val);
- memset(&ret, 0, sizeof(upb_value)); /* XXX */
+ ret.val = val;
return ret;
}
static upb_msgval upb_msgval_fromval(upb_value val) {
- upb_msgval ret;
- UPB_UNUSED(val);
- memset(&ret, 0, sizeof(upb_msgval)); /* XXX */
- return ret;
+ return val.val;
}
static upb_ctype_t upb_fieldtotabtype(upb_fieldtype_t type) {
diff --git a/upb/msg.h b/upb/msg.h
index e875f6e..34a48c6 100644
--- a/upb/msg.h
+++ b/upb/msg.h
@@ -30,34 +30,11 @@
#include "upb/handlers.h"
#include "upb/sink.h"
-#ifdef __cplusplus
-
-namespace upb {
-class Array;
-class Map;
-class MapIterator;
-class MessageFactory;
-class MessageLayout;
-class Visitor;
-class VisitorPlan;
-}
-
-#endif
-
-UPB_DECLARE_TYPE(upb::MessageFactory, upb_msgfactory)
-UPB_DECLARE_TYPE(upb::MessageLayout, upb_msglayout)
-UPB_DECLARE_TYPE(upb::Array, upb_array)
-UPB_DECLARE_TYPE(upb::Map, upb_map)
-UPB_DECLARE_TYPE(upb::MapIterator, upb_mapiter)
-UPB_DECLARE_TYPE(upb::Visitor, upb_visitor)
-UPB_DECLARE_TYPE(upb::VisitorPlan, upb_visitorplan)
/* TODO(haberman): C++ accessors */
UPB_BEGIN_EXTERN_C
-typedef void upb_msg;
-
/** upb_msglayout *************************************************************/
@@ -110,76 +87,6 @@ const upb_visitorplan *upb_msgfactory_getvisitorplan(upb_msgfactory *f,
const upb_handlers *h);
-/** upb_stringview ************************************************************/
-
-typedef struct {
- const char *data;
- size_t size;
-} upb_stringview;
-
-UPB_INLINE upb_stringview upb_stringview_make(const char *data, size_t size) {
- upb_stringview ret;
- ret.data = data;
- ret.size = size;
- return ret;
-}
-
-#define UPB_STRINGVIEW_INIT(ptr, len) {ptr, len}
-
-
-/** upb_msgval ****************************************************************/
-
-/* A union representing all possible protobuf values. Used for generic get/set
- * operations. */
-
-typedef union {
- bool b;
- float flt;
- double dbl;
- int32_t i32;
- int64_t i64;
- uint32_t u32;
- uint64_t u64;
- const upb_map* map;
- const upb_msg* msg;
- const upb_array* arr;
- const void* ptr;
- upb_stringview str;
-} upb_msgval;
-
-#define ACCESSORS(name, membername, ctype) \
- UPB_INLINE ctype upb_msgval_get ## name(upb_msgval v) { \
- return v.membername; \
- } \
- UPB_INLINE void upb_msgval_set ## name(upb_msgval *v, ctype cval) { \
- v->membername = cval; \
- } \
- UPB_INLINE upb_msgval upb_msgval_ ## name(ctype v) { \
- upb_msgval ret; \
- ret.membername = v; \
- return ret; \
- }
-
-ACCESSORS(bool, b, bool)
-ACCESSORS(float, flt, float)
-ACCESSORS(double, dbl, double)
-ACCESSORS(int32, i32, int32_t)
-ACCESSORS(int64, i64, int64_t)
-ACCESSORS(uint32, u32, uint32_t)
-ACCESSORS(uint64, u64, uint64_t)
-ACCESSORS(map, map, const upb_map*)
-ACCESSORS(msg, msg, const upb_msg*)
-ACCESSORS(ptr, ptr, const void*)
-ACCESSORS(arr, arr, const upb_array*)
-ACCESSORS(str, str, upb_stringview)
-
-#undef ACCESSORS
-
-UPB_INLINE upb_msgval upb_msgval_makestr(const char *data, size_t size) {
- return upb_msgval_str(upb_stringview_make(data, size));
-}
-
-
/** upb_msg *******************************************************************/
/* A upb_msg represents a protobuf message. It always corresponds to a specific
diff --git a/upb/table.int.h b/upb/table.int.h
index 225235e..610e3bc 100644
--- a/upb/table.int.h
+++ b/upb/table.int.h
@@ -24,10 +24,6 @@
#include <string.h>
#include "upb/upb.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/* upb_value ******************************************************************/
@@ -49,7 +45,7 @@ typedef enum {
} upb_ctype_t;
typedef struct {
- uint64_t val;
+ upb_msgval val;
#ifndef NDEBUG
/* In debug mode we carry the value type around also so we can check accesses
* to be sure the right member is being read. */
@@ -73,13 +69,13 @@ UPB_INLINE char *upb_gstrdup(const char *s) {
return upb_strdup(s, &upb_alloc_global);
}
-UPB_INLINE void _upb_value_setval(upb_value *v, uint64_t val,
+UPB_INLINE void _upb_value_setval(upb_value *v, upb_msgval val,
upb_ctype_t ctype) {
v->val = val;
SET_TYPE(v->ctype, ctype);
}
-UPB_INLINE upb_value _upb_value_val(uint64_t val, upb_ctype_t ctype) {
+UPB_INLINE upb_value _upb_value_val(upb_msgval val, upb_ctype_t ctype) {
upb_value ret;
_upb_value_setval(&ret, val, ctype);
return ret;
@@ -95,7 +91,7 @@ UPB_INLINE upb_value _upb_value_val(uint64_t val, upb_ctype_t ctype) {
* upb_value upb_value_int32(int32_t val); */
#define FUNCS(name, membername, type_t, converter, proto_type) \
UPB_INLINE void upb_value_set ## name(upb_value *val, type_t cval) { \
- val->val = (converter)cval; \
+ val->val = upb_msgval_ ## converter(cval); \
SET_TYPE(val->ctype, proto_type); \
} \
UPB_INLINE upb_value upb_value_ ## name(type_t val) { \
@@ -105,18 +101,18 @@ UPB_INLINE upb_value _upb_value_val(uint64_t val, upb_ctype_t ctype) {
} \
UPB_INLINE type_t upb_value_get ## name(upb_value val) { \
UPB_ASSERT_DEBUGVAR(val.ctype == proto_type); \
- return (type_t)(converter)val.val; \
+ return (type_t)upb_msgval_get ## converter(val.val); \
}
-FUNCS(int32, int32, int32_t, int32_t, UPB_CTYPE_INT32)
-FUNCS(int64, int64, int64_t, int64_t, UPB_CTYPE_INT64)
-FUNCS(uint32, uint32, uint32_t, uint32_t, UPB_CTYPE_UINT32)
-FUNCS(uint64, uint64, uint64_t, uint64_t, UPB_CTYPE_UINT64)
-FUNCS(bool, _bool, bool, bool, UPB_CTYPE_BOOL)
-FUNCS(cstr, cstr, char*, uintptr_t, UPB_CTYPE_CSTR)
-FUNCS(ptr, ptr, void*, uintptr_t, UPB_CTYPE_PTR)
-FUNCS(constptr, constptr, const void*, uintptr_t, UPB_CTYPE_CONSTPTR)
-FUNCS(fptr, fptr, upb_func*, uintptr_t, UPB_CTYPE_FPTR)
+FUNCS(int32, int32, int32_t, int32, UPB_CTYPE_INT32)
+FUNCS(int64, int64, int64_t, int64, UPB_CTYPE_INT64)
+FUNCS(uint32, uint32, uint32_t, uint32, UPB_CTYPE_UINT32)
+FUNCS(uint64, uint64, uint64_t, uint64, UPB_CTYPE_UINT64)
+FUNCS(bool, _bool, bool, bool, UPB_CTYPE_BOOL)
+FUNCS(cstr, cstr, char*, cstr, UPB_CTYPE_CSTR)
+FUNCS(ptr, ptr, void*, ptr, UPB_CTYPE_PTR)
+FUNCS(constptr, constptr, const void*, constptr, UPB_CTYPE_CONSTPTR)
+FUNCS(fptr, fptr, upb_func*, fptr, UPB_CTYPE_FPTR)
#undef FUNCS
@@ -187,7 +183,7 @@ UPB_INLINE char *upb_tabstr(upb_tabkey key, uint32_t *len) {
* This separate definition is necessary because in C++, UINTPTR_MAX isn't
* reliably available. */
typedef struct {
- uint64_t val;
+ upb_msgval val;
} upb_tabval;
#else
@@ -218,7 +214,7 @@ typedef union {
} staticinit;
/* The normal accessor that we use for everything at runtime. */
- uint64_t val;
+ upb_msgval val;
} upb_tabval;
#ifdef UPB_PTR_IS_64BITS
@@ -352,7 +348,7 @@ static const upb_tabent *upb_getentry(const upb_table *t, uint32_t hash) {
}
UPB_INLINE bool upb_arrhas(upb_tabval key) {
- return key.val != (uint64_t)-1;
+ return key.val.u64 != (uint64_t)-1;
}
/* Initialize and uninitialize a table, respectively. If memory allocation
@@ -589,9 +585,6 @@ void upb_inttable_iter_setdone(upb_inttable_iter *i);
bool upb_inttable_iter_isequal(const upb_inttable_iter *i1,
const upb_inttable_iter *i2);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+UPB_END_EXTERN_C
#endif /* UPB_TABLE_H_ */
diff --git a/upb/upb.h b/upb/upb.h
index 2d6db8e..50ac0f1 100644
--- a/upb/upb.h
+++ b/upb/upb.h
@@ -12,14 +12,23 @@
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
+#include <stdint.h>
+
#ifdef __cplusplus
namespace upb {
+class Array;
class Allocator;
class Arena;
class Environment;
class ErrorSpace;
+class Map;
+class MapIterator;
+class MessageFactory;
+class MessageLayout;
class Status;
+class Visitor;
+class VisitorPlan;
template <int N> class InlinedArena;
template <int N> class InlinedEnvironment;
}
@@ -733,6 +742,94 @@ template <int N> class upb::InlinedEnvironment : public upb::Environment {
#endif /* __cplusplus */
+UPB_DECLARE_TYPE(upb::MessageFactory, upb_msgfactory)
+UPB_DECLARE_TYPE(upb::MessageLayout, upb_msglayout)
+UPB_DECLARE_TYPE(upb::Array, upb_array)
+UPB_DECLARE_TYPE(upb::Map, upb_map)
+UPB_DECLARE_TYPE(upb::MapIterator, upb_mapiter)
+UPB_DECLARE_TYPE(upb::Visitor, upb_visitor)
+UPB_DECLARE_TYPE(upb::VisitorPlan, upb_visitorplan)
+
+UPB_BEGIN_EXTERN_C
+
+typedef void upb_msg;
+
+
+/** upb_stringview ************************************************************/
+
+typedef struct {
+ const char *data;
+ size_t size;
+} upb_stringview;
+
+UPB_INLINE upb_stringview upb_stringview_make(const char *data, size_t size) {
+ upb_stringview ret;
+ ret.data = data;
+ ret.size = size;
+ return ret;
+}
+
+#define UPB_STRINGVIEW_INIT(ptr, len) {ptr, len}
+
+
+/** upb_msgval ****************************************************************/
+
+/* A union representing all possible protobuf values. Used for generic get/set
+ * operations. */
+
+typedef union {
+ bool b;
+ float flt;
+ double dbl;
+ int32_t i32;
+ int64_t i64;
+ uint32_t u32;
+ uint64_t u64;
+ const upb_array* arr;
+ const upb_map* map;
+ const upb_msg* msg;
+ const void* ptr;
+ const char* csptr;
+ upb_func* fptr;
+ upb_stringview str;
+} upb_msgval;
+
+#define ACCESSORS(name, membername, ctype) \
+ UPB_INLINE ctype upb_msgval_get ## name(upb_msgval v) { \
+ return v.membername; \
+ } \
+ UPB_INLINE void upb_msgval_set ## name(upb_msgval *v, ctype cval) { \
+ v->membername = cval; \
+ } \
+ UPB_INLINE upb_msgval upb_msgval_ ## name(ctype v) { \
+ upb_msgval ret; \
+ ret.membername = v; \
+ return ret; \
+ }
+
+ACCESSORS(bool, b, bool)
+ACCESSORS(float, flt, float)
+ACCESSORS(double, dbl, double)
+ACCESSORS(int32, i32, int32_t)
+ACCESSORS(int64, i64, int64_t)
+ACCESSORS(uint32, u32, uint32_t)
+ACCESSORS(uint64, u64, uint64_t)
+ACCESSORS(arr, arr, const upb_array*)
+ACCESSORS(map, map, const upb_map*)
+ACCESSORS(msg, msg, const upb_msg*)
+ACCESSORS(ptr, ptr, const void*)
+ACCESSORS(str, str, upb_stringview)
+ACCESSORS(fptr, fptr, upb_func*)
+ACCESSORS(cstr, csptr, const char*)
+ACCESSORS(constptr, ptr, const void*)
+
+#undef ACCESSORS
+
+UPB_INLINE upb_msgval upb_msgval_makestr(const char *data, size_t size) {
+ return upb_msgval_str(upb_stringview_make(data, size));
+}
+
+
#endif /* UPB_H_ */
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback