Make OneofDef stop deriving from Def.

It is clear now that oneofs are different form other
defs in one important way: they are not top-level
constructs that can stand on their own in a SymbolTable,
for example.  If you are iterating over a list of Defs
in a SymbolTable, there is no chance you will run into
a oneof.  To reflect this reality, OneofDef no longer
derives from Def, and the UPB_DEF_ONEOF is no longer
an enum value that needs to be handled.

1 files changed, 3 insertions, 2 deletions

diff --git a/upb/structdefs.int.h b/upb/structdefs.int.h
index b7b36fa..467963b 100644
--- a/upb/structdefs.int.h
+++ b/upb/structdefs.int.h
@@ -150,15 +150,16 @@ struct upb_enumdef {
 /* upb_oneofdef ***************************************************************/
 
 struct upb_oneofdef {
-  upb_def base;
+  upb_refcounted base;
 
+  const char *name;
   upb_strtable ntof;
   upb_inttable itof;
   const upb_msgdef *parent;
 };
 
 #define UPB_ONEOFDEF_INIT(name, ntof, itof, refs, ref2s) \
-  { UPB_DEF_INIT(name, UPB_DEF_ENUM, refs, ref2s), ntof, itof }
+  { UPB_REFCOUNT_INIT(refs, ref2s), name, ntof, itof }
 
 
 /* upb_symtab *****************************************************************/