WIP.

3 files changed, 16 insertions, 262 deletions

diff --git a/upb/bindings/lua/def.c b/upb/bindings/lua/def.c
index 194acc3..7b3f612 100644
--- a/upb/bindings/lua/def.c
+++ b/upb/bindings/lua/def.c
@@ -6,7 +6,6 @@
 #include "lauxlib.h"
 #include "upb/bindings/lua/upb.h"
 #include "upb/def.h"
-#include "upb/pb/glue.h"
 
 #define LUPB_ENUMDEF "lupb.enumdef"
 #define LUPB_FIELDDEF "lupb.fielddef"
@@ -1196,37 +1195,27 @@ static int lupb_symtab_gc(lua_State *L) {
 }
 
 static int lupb_symtab_add(lua_State *L) {
+  size_t len;
   upb_symtab *s = lupb_symtab_check(L, 1);
-  int n;
-  upb_def **defs;
-
-  luaL_checktype(L, 2, LUA_TTABLE);
-  /* Iterate over table twice.  First iteration to count entries and
-   * check constraints. */
-  n = 0;
-  for (lua_pushnil(L); lua_next(L, 2); lua_pop(L, 1)) {
-    lupb_def_checkmutable(L, -1);
-    ++n;
-  }
+  const char *str = luaL_checklstring(L, 2, &len);
+  google_protobuf_FileDescriptorSet *set =
+      google_protobuf_FileDescriptorSet_parsenew(upb_stringview_make(str, len),
+                                                 upb_symtab_arena(s));
+  size_t i;
+  upb_array *file_arr;
 
-  /* Second iteration to build deflist.
-   * Allocate list with lua_newuserdata() so it is anchored as a GC root in
-   * case any Lua functions longjmp(). */
-  defs = lua_newuserdata(L, n * sizeof(*defs));
-  n = 0;
-  for (lua_pushnil(L); lua_next(L, 2); lua_pop(L, 1)) {
-    upb_def *def = lupb_def_checkmutable(L, -1);
-    defs[n++] = def;
+  if (!set) {
+    luaL_argerror(L, 2, "failed to parse descriptor");
   }
 
-  CHK(upb_symtab_add(s, defs, n, NULL, &status));
-  return 0;
-}
+  file_arr = (upb_array*)google_protobuf_FileDescriptorSet_file(set);
+  for (i = 0; i < upb_array_size(file_arr); i++) {
+    upb_msgval entry = upb_array_get(file_arr, i);
+    google_protobuf_FileDescriptorProto *file =
+        (void *)upb_msgval_getmsg(entry);
+    CHK(upb_symtab_addfile(s, file, &status));
+  }
 
-static int lupb_symtab_addfile(lua_State *L) {
-  upb_symtab *s = lupb_symtab_check(L, 1);
-  upb_filedef *f = lupb_filedef_checkmutable(L, 2);
-  CHK(upb_symtab_addfile(s, f, &status));
   return 0;
 }
 
@@ -1262,7 +1251,6 @@ static int lupb_symtab_defs(lua_State *L) {
 
 static const struct luaL_Reg lupb_symtab_m[] = {
   {"add", lupb_symtab_add},
-  {"add_file", lupb_symtab_addfile},
   {"defs", lupb_symtab_defs},
   {"lookup", lupb_symtab_lookup},
   {NULL, NULL}
@@ -1290,25 +1278,6 @@ static int lupb_freeze(lua_State *L) {
   return 0;
 }
 
-/* This is a *temporary* API that will be removed once pending refactorings are
- * complete (it does not belong here in core because it depends on both
- * the descriptor.proto schema and the protobuf binary format. */
-static int lupb_loaddescriptor(lua_State *L) {
-  size_t len;
-  const char *str = luaL_checklstring(L, 1, &len);
-  size_t i;
-  upb_filedef **files = NULL;
-  CHK(files = upb_loaddescriptor(str, len, &files, &status));
-
-  lua_newtable(L);
-  for (i = 1; *files; i++, files++) {
-    lupb_filedef_pushnewrapper(L, *files, &files);
-    lua_rawseti(L, -2, i);
-  }
-
-  return 1;
-}
-
 static void lupb_setfieldi(lua_State *L, const char *field, int i) {
   lua_pushinteger(L, i);
   lua_setfield(L, -2, field);
@@ -1322,7 +1291,6 @@ static const struct luaL_Reg lupbdef_toplevel_m[] = {
   {"OneofDef", lupb_oneofdef_new},
   {"SymbolTable", lupb_symtab_new},
   {"freeze", lupb_freeze},
-  {"load_descriptor", lupb_loaddescriptor},
 
   {NULL, NULL}
 };
diff --git a/upb/bindings/lua/upb/table.c b/upb/bindings/lua/upb/table.c
deleted file mode 100644
index 79120c7..0000000
--- a/upb/bindings/lua/upb/table.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-** require("upb.table") -- a Lua extension for accessing upb_table
-**
-** This is an internal-only interface and exists for the sole purpose of
-** writing a C code generator in Lua that can dump a upb_table as static C
-** initializers.  This lets us use Lua for convenient string manipulation while
-** saving us from re-implementing the upb_table hash function and hash table
-** layout / collision strategy in Lua.
-**
-** Since this is used only as part of the toolchain (and not part of the
-** runtime) we do not hold this module to the same stringent requirements as
-** the main Lua modules (for example that misbehaving Lua programs cannot
-** crash the interpreter).
-*/
-
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lauxlib.h"
-#include "upb/bindings/lua/upb.h"
-#include "upb/def.h"
-#include "upb/structdefs.int.h"
-#include "upb/table.int.h"
-
-static void lupbtable_setnum(lua_State *L, int tab, const char *key,
-                             lua_Number val) {
-  lua_pushnumber(L, val);
-  lua_setfield(L, tab - 1, 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);
-      break;
-    case UPB_CTYPE_PTR:
-      lupb_def_pushwrapper(L, (void*)val.val, NULL);
-      break;
-    case UPB_CTYPE_CSTR:
-      lua_pushstring(L, (const char*)val.val);
-      break;
-    default:
-      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 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, ctype);
-  lua_setfield(L, -2, "valtype");
-
-  /* Set this to facilitate linking. */
-  lua_pushlightuserdata(L, (void*)ptr);
-  lua_setfield(L, -2, "ptr");
-}
-
-static void lupbtable_pushent(lua_State *L, const upb_tabent *e,
-                              bool inttab, int ctype) {
-  lua_newtable(L);
-  if (!upb_tabent_isempty(e)) {
-    if (inttab) {
-      lua_pushnumber(L, e->key);
-    } else {
-      uint32_t len;
-      const char *str = upb_tabstr(e->key, &len);
-      lua_pushlstring(L, str, len);
-    }
-    lua_setfield(L, -2, "key");
-    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, ctype, e);
-}
-
-/* Dumps the shared part of upb_table into a Lua table. */
-static void lupbtable_pushtable(lua_State *L, const upb_table *t, bool inttab) {
-  size_t i;
-
-  lua_newtable(L);
-  lupbtable_setnum(L, -1, "count", t->count);
-  lupbtable_setnum(L, -1, "mask",  t->mask);
-  lupbtable_setnum(L, -1, "ctype", t->ctype);
-  lupbtable_setnum(L, -1, "size_lg2",  t->size_lg2);
-
-  lua_newtable(L);
-  for (i = 0; i < upb_table_size(t); i++) {
-    lupbtable_pushent(L, &t->entries[i], inttab, t->ctype);
-    lua_rawseti(L, -2, i + 1);
-  }
-  lua_setfield(L, -2, "entries");
-}
-
-/* Dumps a upb_inttable to a Lua table. */
-static void lupbtable_pushinttable(lua_State *L, const upb_inttable *t) {
-  size_t i;
-
-  lupbtable_pushtable(L, &t->t, true);
-  lupbtable_setnum(L, -1, "array_size", t->array_size);
-  lupbtable_setnum(L, -1, "array_count", t->array_count);
-
-  lua_newtable(L);
-  for (i = 0; i < t->array_size; i++) {
-    lua_newtable(L);
-    if (upb_arrhas(t->array[i])) {
-      lupbtable_pushval(L, t->array[i], t->t.ctype);
-      lua_setfield(L, -2, "val");
-    }
-    lupbtable_setmetafields(L, t->t.ctype, &t->array[i]);
-    lua_rawseti(L, -2, i + 1);
-  }
-  lua_setfield(L, -2, "array");
-}
-
-static void lupbtable_pushstrtable(lua_State *L, const upb_strtable *t) {
-  lupbtable_pushtable(L, &t->t, false);
-}
-
-static int lupbtable_msgdef_itof(lua_State *L) {
-  const upb_msgdef *m = lupb_msgdef_check(L, 1);
-  lupbtable_pushinttable(L, &m->itof);
-  return 1;
-}
-
-static int lupbtable_msgdef_ntof(lua_State *L) {
-  const upb_msgdef *m = lupb_msgdef_check(L, 1);
-  lupbtable_pushstrtable(L, &m->ntof);
-  return 1;
-}
-
-static int lupbtable_enumdef_iton(lua_State *L) {
-  const upb_enumdef *e = lupb_enumdef_check(L, 1);
-  lupbtable_pushinttable(L, &e->iton);
-  return 1;
-}
-
-static int lupbtable_enumdef_ntoi(lua_State *L) {
-  const upb_enumdef *e = lupb_enumdef_check(L, 1);
-  lupbtable_pushstrtable(L, &e->ntoi);
-  return 1;
-}
-
-static int lupbtable_symtab_symtab(lua_State *L) {
-  const upb_symtab *s = lupb_symtab_check(L, 1);
-  lupbtable_pushstrtable(L, &s->symtab);
-  return 1;
-}
-
-static void lupbtable_setfieldi(lua_State *L, const char *field, int i) {
-  lua_pushnumber(L, i);
-  lua_setfield(L, -2, field);
-}
-
-/* These aren't from the table, but they access other internal-only
- * definitions. */
-static int lupb_fielddef_selectorbase(lua_State *L) {
-  const upb_fielddef *f = lupb_fielddef_check(L, 1);
-  if (!upb_fielddef_isfrozen(f))
-    luaL_error(L, "_selectorbase is only defined for frozen fielddefs");
-  lua_pushinteger(L, f->selector_base);
-  return 1;
-}
-
-static int lupb_msgdef_selectorcount(lua_State *L) {
-  const upb_msgdef *m = lupb_msgdef_check(L, 1);
-  lua_pushinteger(L, m->selector_count);
-  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 const struct luaL_Reg lupbtable_toplevel_m[] = {
-  {"msgdef_itof", lupbtable_msgdef_itof},
-  {"msgdef_ntof", lupbtable_msgdef_ntof},
-  {"enumdef_iton", lupbtable_enumdef_iton},
-  {"enumdef_ntoi", lupbtable_enumdef_ntoi},
-  {"symtab_symtab", lupbtable_symtab_symtab},
-
-  {"msgdef_selector_count", lupb_msgdef_selectorcount},
-  {"msgdef_submsg_field_count", lupb_msgdef_submsgfieldcount},
-
-  {"fielddef_selector_base", lupb_fielddef_selectorbase},
-
-  {NULL, NULL}
-};
-
-int luaopen_upb_table_c(lua_State *L) {
-  static char module_key;
-  if (lupb_openlib(L, &module_key, "upb.table", lupbtable_toplevel_m)) {
-    return 1;
-  }
-
-  /* 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);
-  lua_setfield(L, -2, "NULL");
-
-  return 1;  /* Return a single Lua value, the package table created above. */
-}
diff --git a/upb/bindings/lua/upb/table.lua b/upb/bindings/lua/upb/table.lua
deleted file mode 100644
index ad8b066..0000000
--- a/upb/bindings/lua/upb/table.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-
-require "upb"
-return require "upb.table_c"