diff options
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/lua/table.c | 29 | ||||
| -rw-r--r-- | bindings/lua/upb.c | 134 |
2 files changed, 83 insertions, 80 deletions
diff --git a/bindings/lua/table.c b/bindings/lua/table.c index 450730a..4e6aae2 100644 --- a/bindings/lua/table.c +++ b/bindings/lua/table.c @@ -31,8 +31,8 @@ static void lupbtable_setnum(lua_State *L, int tab, const char *key, lua_setfield(L, tab - 1, key); } -static void lupbtable_pushval(lua_State *L, _upb_value val, upb_ctype_t type) { - switch (type) { +static void lupbtable_pushval(lua_State *L, _upb_value val, upb_ctype_t ctype) { + switch (ctype) { case UPB_CTYPE_INT32: lua_pushnumber(L, val.int32); break; @@ -43,15 +43,15 @@ static void lupbtable_pushval(lua_State *L, _upb_value val, upb_ctype_t type) { lua_pushstring(L, val.cstr); break; default: - luaL_error(L, "Unexpected type: %d", type); + luaL_error(L, "Unexpected type: %d", ctype); } } // Sets a few fields common to both hash table entries and arrays. -static void lupbtable_setmetafields(lua_State *L, int type, const void *ptr) { +static void lupbtable_setmetafields(lua_State *L, int ctype, const void *ptr) { // We tack this onto every entry so we know it even if the entries // don't stay with the table. - lua_pushnumber(L, type); + lua_pushnumber(L, ctype); lua_setfield(L, -2, "valtype"); // Set this to facilitate linking. @@ -60,7 +60,7 @@ static void lupbtable_setmetafields(lua_State *L, int type, const void *ptr) { } static void lupbtable_pushent(lua_State *L, const upb_tabent *e, - bool inttab, int type) { + bool inttab, int ctype) { lua_newtable(L); if (!upb_tabent_isempty(e)) { if (inttab) { @@ -69,12 +69,12 @@ static void lupbtable_pushent(lua_State *L, const upb_tabent *e, lua_pushstring(L, e->key.str); } lua_setfield(L, -2, "key"); - lupbtable_pushval(L, e->val, type); + lupbtable_pushval(L, e->val, ctype); lua_setfield(L, -2, "value"); } lua_pushlightuserdata(L, (void*)e->next); lua_setfield(L, -2, "next"); - lupbtable_setmetafields(L, type, e); + lupbtable_setmetafields(L, ctype, e); } // Dumps the shared part of upb_table into a Lua table. @@ -82,12 +82,12 @@ static void lupbtable_pushtable(lua_State *L, const upb_table *t, bool inttab) { lua_newtable(L); lupbtable_setnum(L, -1, "count", t->count); lupbtable_setnum(L, -1, "mask", t->mask); - lupbtable_setnum(L, -1, "type", t->type); + lupbtable_setnum(L, -1, "ctype", t->ctype); lupbtable_setnum(L, -1, "size_lg2", t->size_lg2); lua_newtable(L); for (int i = 0; i < upb_table_size(t); i++) { - lupbtable_pushent(L, &t->entries[i], inttab, t->type); + lupbtable_pushent(L, &t->entries[i], inttab, t->ctype); lua_rawseti(L, -2, i + 1); } lua_setfield(L, -2, "entries"); @@ -103,10 +103,10 @@ static void lupbtable_pushinttable(lua_State *L, const upb_inttable *t) { for (int i = 0; i < t->array_size; i++) { lua_newtable(L); if (upb_arrhas(t->array[i])) { - lupbtable_pushval(L, t->array[i], t->t.type); + lupbtable_pushval(L, t->array[i], t->t.ctype); lua_setfield(L, -2, "val"); } - lupbtable_setmetafields(L, t->t.type, &t->array[i]); + lupbtable_setmetafields(L, t->t.ctype, &t->array[i]); lua_rawseti(L, -2, i + 1); } lua_setfield(L, -2, "array"); @@ -156,8 +156,9 @@ static const struct luaL_Reg lupbtable_toplevel_m[] = { int luaopen_upbtable(lua_State *L) { lupb_newlib(L, "upb.table", lupbtable_toplevel_m); - // We define these here because they are not public (at least at the moment). - lupbtable_setfieldi(L, "CTYPE_PTR", UPB_CTYPE_PTR); + // We define these here because they are not public. + lupbtable_setfieldi(L, "CTYPE_PTR", UPB_CTYPE_PTR); + lupbtable_setfieldi(L, "CTYPE_CSTR", UPB_CTYPE_CSTR); lupbtable_setfieldi(L, "CTYPE_INT32", UPB_CTYPE_INT32); lua_pushlightuserdata(L, NULL); diff --git a/bindings/lua/upb.c b/bindings/lua/upb.c index c5badd6..7c41d98 100644 --- a/bindings/lua/upb.c +++ b/bindings/lua/upb.c @@ -72,76 +72,52 @@ static uint32_t chkint32(lua_State *L, int narg, const char *name) { return n; } -// Converts a number or bool from Lua -> upb_value. -static upb_value lupb_getvalue(lua_State *L, int narg, upb_fieldtype_t type) { - upb_value val; - if (type == UPB_TYPE_BOOL) { +// Sets a fielddef default from the given Lua value. +static void lupb_setdefault(lua_State *L, int narg, upb_fielddef *f) { + if (upb_fielddef_type(f) == UPB_TYPE_BOOL) { if (!lua_isboolean(L, narg)) luaL_error(L, "Must explicitly pass true or false for boolean fields"); - upb_value_setbool(&val, lua_toboolean(L, narg)); + upb_fielddef_setdefaultbool(f, lua_toboolean(L, narg)); } else { // Numeric type. lua_Number num = luaL_checknumber(L, narg); - switch (type) { + switch (upb_fielddef_type(f)) { case UPB_TYPE_INT32: case UPB_TYPE_ENUM: if (num > INT32_MAX || num < INT32_MIN || num != rint(num)) luaL_error(L, "Cannot convert %f to 32-bit integer", num); - upb_value_setint32(&val, num); + upb_fielddef_setdefaultint32(f, num); break; case UPB_TYPE_INT64: if (num > INT64_MAX || num < INT64_MIN || num != rint(num)) luaL_error(L, "Cannot convert %f to 64-bit integer", num); - upb_value_setint64(&val, num); + upb_fielddef_setdefaultint64(f, num); break; case UPB_TYPE_UINT32: if (num > UINT32_MAX || num < 0 || num != rint(num)) luaL_error(L, "Cannot convert %f to unsigned 32-bit integer", num); - upb_value_setuint32(&val, num); + upb_fielddef_setdefaultuint32(f, num); break; case UPB_TYPE_UINT64: if (num > UINT64_MAX || num < 0 || num != rint(num)) luaL_error(L, "Cannot convert %f to unsigned 64-bit integer", num); - upb_value_setuint64(&val, num); + upb_fielddef_setdefaultuint64(f, num); break; case UPB_TYPE_DOUBLE: if (num > DBL_MAX || num < -DBL_MAX) { // This could happen if lua_Number was long double. luaL_error(L, "Cannot convert %f to double", num); } - upb_value_setdouble(&val, num); + upb_fielddef_setdefaultdouble(f, num); break; case UPB_TYPE_FLOAT: if (num > FLT_MAX || num < -FLT_MAX) luaL_error(L, "Cannot convert %f to float", num); - upb_value_setfloat(&val, num); + upb_fielddef_setdefaultfloat(f, num); break; default: luaL_error(L, "invalid type"); } } - return val; -} - -// Converts a upb_value -> Lua value. -static void lupb_pushvalue(lua_State *L, upb_value val, upb_fieldtype_t type) { - switch (type) { - case UPB_TYPE_INT32: - case UPB_TYPE_ENUM: - lua_pushnumber(L, upb_value_getint32(val)); break; - case UPB_TYPE_INT64: - lua_pushnumber(L, upb_value_getint64(val)); break; - case UPB_TYPE_UINT32: - lua_pushnumber(L, upb_value_getuint32(val)); break; - case UPB_TYPE_UINT64: - lua_pushnumber(L, upb_value_getuint64(val)); break; - case UPB_TYPE_DOUBLE: - lua_pushnumber(L, upb_value_getdouble(val)); break; - case UPB_TYPE_FLOAT: - lua_pushnumber(L, upb_value_getfloat(val)); break; - case UPB_TYPE_BOOL: - lua_pushboolean(L, upb_value_getbool(val)); break; - default: luaL_error(L, "internal error"); - } } void lupb_checkstatus(lua_State *L, upb_status *s) { @@ -263,7 +239,7 @@ bool lupb_def_pushwrapper(lua_State *L, const upb_def *def, const void *owner) { case UPB_DEF_FIELD: type = LUPB_FIELDDEF; break; default: luaL_error(L, "unknown deftype %d", def->type); } - return lupb_refcounted_pushwrapper(L, upb_upcast(def), type, owner); + return lupb_refcounted_pushwrapper(L, UPB_UPCAST(def), type, owner); } void lupb_def_pushnewrapper(lua_State *L, const upb_def *def, @@ -332,7 +308,7 @@ static void lupb_fielddef_dosetdefault(lua_State *L, upb_fielddef *f, const char *str = lua_tolstring(L, narg, &len); CHK(upb_fielddef_setdefaultstr(f, str, len, &status)); } else { - upb_fielddef_setdefault(f, lupb_getvalue(L, narg, upbtype)); + lupb_setdefault(L, narg, f); } } @@ -451,7 +427,7 @@ static int lupb_fielddef_new(lua_State *L) { upb_fielddef *f = upb_fielddef_new(&f); int narg = lua_gettop(L); - lupb_def_pushnewrapper(L, upb_upcast(f), &f); + lupb_def_pushnewrapper(L, UPB_UPCAST(f), &f); if (narg == 0) return 1; @@ -488,10 +464,36 @@ static int lupb_fielddef_new(lua_State *L) { static int lupb_fielddef_default(lua_State *L) { const upb_fielddef *f = lupb_fielddef_check(L, 1); - upb_fieldtype_t type = upb_fielddef_type(f); - if (upb_fielddef_default_is_symbolic(f)) - type = UPB_TYPE_STRING; - lupb_pushvalue(L, upb_fielddef_default(f), type); + switch (upb_fielddef_type(f)) { + case UPB_TYPE_INT32: + int32: + lua_pushnumber(L, upb_fielddef_defaultint32(f)); break; + case UPB_TYPE_INT64: + lua_pushnumber(L, upb_fielddef_defaultint64(f)); break; + case UPB_TYPE_UINT32: + lua_pushnumber(L, upb_fielddef_defaultuint32(f)); break; + case UPB_TYPE_UINT64: + lua_pushnumber(L, upb_fielddef_defaultuint64(f)); break; + case UPB_TYPE_DOUBLE: + lua_pushnumber(L, upb_fielddef_defaultdouble(f)); break; + case UPB_TYPE_FLOAT: + lua_pushnumber(L, upb_fielddef_defaultfloat(f)); break; + case UPB_TYPE_BOOL: + lua_pushboolean(L, upb_fielddef_defaultbool(f)); break; + case UPB_TYPE_ENUM: + if (!upb_fielddef_default_is_symbolic(f)) + goto int32; + // Fallthrough. + case UPB_TYPE_STRING: + case UPB_TYPE_BYTES: { + size_t len; + const char *data = upb_fielddef_defaultstr(f, &len); + lua_pushlstring(L, data, len); + break; + } + case UPB_TYPE_MESSAGE: + return luaL_error(L, "Message fields do not have explicit defaults."); + } return 1; } @@ -542,9 +544,9 @@ static int lupb_fielddef_hassubdef(lua_State *L) { return 1; } -static int lupb_fielddef_msgdef(lua_State *L) { +static int lupb_fielddef_containingtype(lua_State *L) { const upb_fielddef *f = lupb_fielddef_check(L, 1); - lupb_def_pushwrapper(L, upb_upcast(upb_fielddef_msgdef(f)), NULL); + lupb_def_pushwrapper(L, UPB_UPCAST(upb_fielddef_containingtype(f)), NULL); return 1; } @@ -596,13 +598,13 @@ static int lupb_fielddef_gc(lua_State *L) { static const struct luaL_Reg lupb_fielddef_m[] = { LUPB_COMMON_DEF_METHODS + {"containing_type", lupb_fielddef_containingtype}, {"default", lupb_fielddef_default}, {"getsel", lupb_fielddef_getsel}, {"has_subdef", lupb_fielddef_hassubdef}, {"intfmt", lupb_fielddef_intfmt}, {"istagdelim", lupb_fielddef_istagdelim}, {"label", lupb_fielddef_label}, - {"msgdef", lupb_fielddef_msgdef}, {"name", lupb_fielddef_name}, {"number", lupb_fielddef_number}, {"subdef", lupb_fielddef_subdef}, @@ -657,7 +659,7 @@ static int lupb_msgdef_gc(lua_State *L) { static int lupb_msgdef_new(lua_State *L) { int narg = lua_gettop(L); upb_msgdef *md = upb_msgdef_new(&md); - lupb_def_pushnewrapper(L, upb_upcast(md), &md); + lupb_def_pushnewrapper(L, UPB_UPCAST(md), &md); if (narg == 0) return 1; @@ -669,7 +671,7 @@ static int lupb_msgdef_new(lua_State *L) { const char *key = lua_tostring(L, -2); if (streql(key, "full_name")) { // full_name="MyMessage" - CHK(upb_def_setfullname(upb_upcast(md), chkname(L, -1), &status)); + CHK(upb_def_setfullname(UPB_UPCAST(md), chkname(L, -1), &status)); } else if (streql(key, "fields")) { // fields={...} // Iterate over the list of fields. luaL_checktype(L, -1, LUA_TTABLE); @@ -730,14 +732,14 @@ static int lupb_msgdef_field(lua_State *L) { return luaL_argerror(L, 2, msg); } - lupb_def_pushwrapper(L, upb_upcast(f), NULL); + lupb_def_pushwrapper(L, UPB_UPCAST(f), NULL); return 1; } static int lupb_msgiter_next(lua_State *L) { upb_msg_iter *i = lua_touserdata(L, lua_upvalueindex(1)); if (upb_msg_done(i)) return 0; - lupb_def_pushwrapper(L, upb_upcast(upb_msg_iter_field(i)), NULL); + lupb_def_pushwrapper(L, UPB_UPCAST(upb_msg_iter_field(i)), NULL); upb_msg_next(i); return 1; } @@ -795,7 +797,7 @@ static int lupb_enumdef_gc(lua_State *L) { static int lupb_enumdef_new(lua_State *L) { int narg = lua_gettop(L); upb_enumdef *e = upb_enumdef_new(&e); - lupb_def_pushnewrapper(L, upb_upcast(e), &e); + lupb_def_pushnewrapper(L, UPB_UPCAST(e), &e); if (narg == 0) return 1; @@ -820,7 +822,7 @@ static int lupb_enumdef_new(lua_State *L) { lua_pop(L, 2); // The key/val we got from lua_rawgeti() } } else if (streql(key, "full_name")) { - CHK(upb_def_setfullname(upb_upcast(e), chkname(L, -1), &status)); + CHK(upb_def_setfullname(UPB_UPCAST(e), chkname(L, -1), &status)); } else { luaL_error(L, "Unknown initializer key '%s'", key); } @@ -933,7 +935,7 @@ void lupb_symtab_doadd(lua_State *L, upb_symtab *s, int narg) { static int lupb_symtab_new(lua_State *L) { int narg = lua_gettop(L); upb_symtab *s = upb_symtab_new(&s); - lupb_refcounted_pushnewrapper(L, upb_upcast(s), LUPB_SYMTAB, &s); + lupb_refcounted_pushnewrapper(L, UPB_UPCAST(s), LUPB_SYMTAB, &s); if (narg > 0) lupb_symtab_doadd(L, s, 1); return 1; } @@ -1127,20 +1129,20 @@ int luaopen_upb(lua_State *L) { lupb_setfieldi(L, "DEF_SERVICE", UPB_DEF_SERVICE); lupb_setfieldi(L, "DEF_ANY", UPB_DEF_ANY); - lupb_setfieldi(L, "UPB_HANDLER_INT32", UPB_HANDLER_INT32); - lupb_setfieldi(L, "UPB_HANDLER_INT64", UPB_HANDLER_INT64); - lupb_setfieldi(L, "UPB_HANDLER_UINT32", UPB_HANDLER_UINT32); - lupb_setfieldi(L, "UPB_HANDLER_UINT64", UPB_HANDLER_UINT64); - lupb_setfieldi(L, "UPB_HANDLER_FLOAT", UPB_HANDLER_FLOAT); - lupb_setfieldi(L, "UPB_HANDLER_DOUBLE", UPB_HANDLER_DOUBLE); - lupb_setfieldi(L, "UPB_HANDLER_BOOL", UPB_HANDLER_BOOL); - lupb_setfieldi(L, "UPB_HANDLER_STARTSTR", UPB_HANDLER_STARTSTR); - lupb_setfieldi(L, "UPB_HANDLER_STRING", UPB_HANDLER_STRING); - lupb_setfieldi(L, "UPB_HANDLER_ENDSTR", UPB_HANDLER_ENDSTR); - lupb_setfieldi(L, "UPB_HANDLER_STARTSUBMSG", UPB_HANDLER_STARTSUBMSG); - lupb_setfieldi(L, "UPB_HANDLER_ENDSUBMSG", UPB_HANDLER_ENDSUBMSG); - lupb_setfieldi(L, "UPB_HANDLER_STARTSEQ", UPB_HANDLER_STARTSEQ); - lupb_setfieldi(L, "UPB_HANDLER_ENDSEQ", UPB_HANDLER_ENDSEQ); + lupb_setfieldi(L, "HANDLER_INT32", UPB_HANDLER_INT32); + lupb_setfieldi(L, "HANDLER_INT64", UPB_HANDLER_INT64); + lupb_setfieldi(L, "HANDLER_UINT32", UPB_HANDLER_UINT32); + lupb_setfieldi(L, "HANDLER_UINT64", UPB_HANDLER_UINT64); + lupb_setfieldi(L, "HANDLER_FLOAT", UPB_HANDLER_FLOAT); + lupb_setfieldi(L, "HANDLER_DOUBLE", UPB_HANDLER_DOUBLE); + lupb_setfieldi(L, "HANDLER_BOOL", UPB_HANDLER_BOOL); + lupb_setfieldi(L, "HANDLER_STARTSTR", UPB_HANDLER_STARTSTR); + lupb_setfieldi(L, "HANDLER_STRING", UPB_HANDLER_STRING); + lupb_setfieldi(L, "HANDLER_ENDSTR", UPB_HANDLER_ENDSTR); + lupb_setfieldi(L, "HANDLER_STARTSUBMSG", UPB_HANDLER_STARTSUBMSG); + lupb_setfieldi(L, "HANDLER_ENDSUBMSG", UPB_HANDLER_ENDSUBMSG); + lupb_setfieldi(L, "HANDLER_STARTSEQ", UPB_HANDLER_STARTSEQ); + lupb_setfieldi(L, "HANDLER_ENDSEQ", UPB_HANDLER_ENDSEQ); return 1; // Return package table. } |