Refactoring: split defs into their own file, move private parsing funcs out of .h file.

1 files changed, 0 insertions, 110 deletions

diff --git a/src/upb_msg.c b/src/upb_msg.c
index c56168e..4c78063 100644
--- a/src/upb_msg.c
+++ b/src/upb_msg.c
@@ -13,116 +13,6 @@
 #include "upb_serialize.h"
 #include "upb_text.h"
 
-/* Rounds p up to the next multiple of t. */
-#define ALIGN_UP(p, t) ((p) % (t) == 0 ? (p) : (p) + ((t) - ((p) % (t))))
-
-static int div_round_up(int numerator, int denominator) {
-  /* cf. http://stackoverflow.com/questions/17944/how-to-round-up-the-result-of-integer-division */
-  return numerator > 0 ? (numerator - 1) / denominator + 1 : 0;
-}
-
-/* Callback for sorting fields. */
-static int compare_fields(const void *e1, const void *e2) {
-  const google_protobuf_FieldDescriptorProto *fd1 = *(void**)e1;
-  const google_protobuf_FieldDescriptorProto *fd2 = *(void**)e2;
-  /* Required fields go before non-required. */
-  bool req1 = fd1->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED;
-  bool req2 = fd2->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED;
-  if(req1 != req2) {
-    return req2 - req1;
-  } else {
-    /* Within required and non-required field lists, list in number order.
-     * TODO: consider ordering by data size to reduce padding. */
-    return fd1->number - fd2->number;
-  }
-}
-
-void upb_msgdef_sortfds(google_protobuf_FieldDescriptorProto **fds, size_t num)
-{
-  qsort(fds, num, sizeof(void*), compare_fields);
-}
-
-void upb_msgdef_init(struct upb_msgdef *m, google_protobuf_DescriptorProto *d,
-                     struct upb_string fqname, bool sort, struct upb_context *c,
-                     struct upb_status *status)
-{
-  (void)status;  // Nothing that can fail at the moment.
-  int num_fields = d->set_flags.has.field ? d->field->len : 0;
-  upb_inttable_init(&m->fields_by_num, num_fields,
-                    sizeof(struct upb_fieldsbynum_entry));
-  upb_strtable_init(&m->fields_by_name, num_fields,
-                    sizeof(struct upb_fieldsbyname_entry));
-
-  m->descriptor = d;
-  m->fqname = fqname;
-  m->context = c;
-  m->num_fields = num_fields;
-  m->set_flags_bytes = div_round_up(m->num_fields, 8);
-  /* These are incremented in the loop. */
-  m->num_required_fields = 0;
-  m->size = m->set_flags_bytes;
-
-  m->fields = malloc(sizeof(*m->fields) * m->num_fields);
-  m->field_descriptors = malloc(sizeof(*m->field_descriptors) * m->num_fields);
-  for(unsigned int i = 0; i < m->num_fields; i++) {
-    /* We count on the caller to keep this pointer alive. */
-    m->field_descriptors[i] = d->field->elements[i];
-  }
-  if(sort) upb_msgdef_sortfds(m->field_descriptors, m->num_fields);
-
-  size_t max_align = 0;
-  for(unsigned int i = 0; i < m->num_fields; i++) {
-    struct upb_msg_fielddef *f = &m->fields[i];
-    google_protobuf_FieldDescriptorProto *fd = m->field_descriptors[i];
-    struct upb_type_info *type_info = &upb_type_info[fd->type];
-
-    /* General alignment rules are: each member must be at an address that is a
-     * multiple of that type's alignment.  Also, the size of the structure as
-     * a whole must be a multiple of the greatest alignment of any member. */
-    f->field_index = i;
-    f->byte_offset = ALIGN_UP(m->size, type_info->align);
-    f->type = fd->type;
-    f->label = fd->label;
-    m->size = f->byte_offset + type_info->size;
-    max_align = UPB_MAX(max_align, type_info->align);
-    if(fd->label == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_LABEL_REQUIRED)
-      m->num_required_fields++;
-
-    /* Insert into the tables.  Note that f->ref will be uninitialized, even in
-     * the tables' copies of *f, which is why we must update them separately
-     * in upb_msg_setref() below. */
-    struct upb_fieldsbynum_entry nument = {.e = {.key = fd->number}, .f = *f};
-    struct upb_fieldsbyname_entry strent = {.e = {.key = *fd->name}, .f = *f};
-    upb_inttable_insert(&m->fields_by_num, &nument.e);
-    upb_strtable_insert(&m->fields_by_name, &strent.e);
-  }
-
-  if(max_align > 0)
-    m->size = ALIGN_UP(m->size, max_align);
-}
-
-void upb_msgdef_free(struct upb_msgdef *m)
-{
-  upb_inttable_free(&m->fields_by_num);
-  upb_strtable_free(&m->fields_by_name);
-  free(m->fields);
-  free(m->field_descriptors);
-}
-
-void upb_msgdef_setref(struct upb_msgdef *m, struct upb_msg_fielddef *f,
-                       union upb_symbol_ref ref) {
-  struct google_protobuf_FieldDescriptorProto *d =
-      upb_msg_field_descriptor(f, m);
-  struct upb_fieldsbynum_entry *int_e = upb_inttable_fast_lookup(
-      &m->fields_by_num, d->number, sizeof(struct upb_fieldsbynum_entry));
-  struct upb_fieldsbyname_entry *str_e =
-      upb_strtable_lookup(&m->fields_by_name, d->name);
-  assert(int_e && str_e);
-  f->ref = ref;
-  int_e->f.ref = ref;
-  str_e->f.ref = ref;
-}
-
 /* Parsing.  ******************************************************************/
 
 struct upb_msgparser_frame {