From ce9bba3cb5409844f8f3d7dcc235a9ea30cad090 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Fri, 20 Dec 2013 17:40:40 -0800
Subject: Sync from Google-internal development.

---
 bindings/lua/upb.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'bindings/lua/upb.c')

diff --git a/bindings/lua/upb.c b/bindings/lua/upb.c
index 7c41d98..9eb46f3 100644
--- a/bindings/lua/upb.c
+++ b/bindings/lua/upb.c
@@ -122,11 +122,8 @@ static void lupb_setdefault(lua_State *L, int narg, upb_fielddef *f) {
 
 void lupb_checkstatus(lua_State *L, upb_status *s) {
   if (!upb_ok(s)) {
-    lua_pushstring(L, upb_status_getstr(s));
-    upb_status_uninit(s);
+    lua_pushstring(L, upb_status_errmsg(s));
     lua_error(L);
-  } else {
-    upb_status_uninit(s);
   }
 }
 
@@ -576,6 +573,12 @@ static int lupb_fielddef_type(lua_State *L) {
   return 1;
 }
 
+static int lupb_fielddef_index(lua_State *L) {
+  const upb_fielddef *f = lupb_fielddef_check(L, 1);
+  lua_pushnumber(L, upb_fielddef_index(f));
+  return 1;
+}
+
 static int lupb_fielddef_intfmt(lua_State *L) {
   const upb_fielddef *f = lupb_fielddef_check(L, 1);
   lua_pushnumber(L, upb_fielddef_intfmt(f));
@@ -602,6 +605,7 @@ static const struct luaL_Reg lupb_fielddef_m[] = {
   {"default", lupb_fielddef_default},
   {"getsel", lupb_fielddef_getsel},
   {"has_subdef", lupb_fielddef_hassubdef},
+  {"index", lupb_fielddef_index},
   {"intfmt", lupb_fielddef_intfmt},
   {"istagdelim", lupb_fielddef_istagdelim},
   {"label", lupb_fielddef_label},
@@ -718,6 +722,12 @@ static int lupb_msgdef_selectorcount(lua_State *L) {
   return 1;
 }
 
+static int lupb_msgdef_submsgfieldcount(lua_State *L) {
+  const upb_msgdef *m = lupb_msgdef_check(L, 1);
+  lua_pushinteger(L, m->submsg_field_count);
+  return 1;
+}
+
 static int lupb_msgdef_field(lua_State *L) {
   const upb_msgdef *m = lupb_msgdef_check(L, 1);
   int type = lua_type(L, 2);
@@ -766,6 +776,7 @@ static const struct luaL_Reg lupb_msgdef_m[] = {
 
   // Internal-only.
   {"_selector_count", lupb_msgdef_selectorcount},
+  {"_submsg_field_count", lupb_msgdef_submsgfieldcount},
 
   {NULL, NULL}
 };
-- 
cgit v1.2.3