New descriptor.c and descriptor.h (generated by upbc!)

1 files changed, 185 insertions, 169 deletions

diff --git a/descriptor/descriptor.h b/descriptor/descriptor.h
index e8765f2..39d3117 100644
--- a/descriptor/descriptor.h
+++ b/descriptor/descriptor.h
@@ -1,13 +1,26 @@
-/* Auto-generated from descriptor.proto.  Do not edit. */
+/* This file was generated by upbc (the upb compiler).  Do not edit. */
 
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_H_
+#ifndef DESCRIPTOR_DESCRIPTOR_H
+#define DESCRIPTOR_DESCRIPTOR_H
 
-#include "upb_string.h"
-#include "upb_array.h"
+#include <upb_string.h>
+
+#include <upb_array.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct google_protobuf_FileDescriptorSet;
+extern struct google_protobuf_FileDescriptorSet *upb_file_descriptor_set;
 
 /* Enums. */
 
+typedef enum google_protobuf_FieldOptions_CType {
+  GOOGLE_PROTOBUF_FIELDOPTIONS_CORD = 1,
+  GOOGLE_PROTOBUF_FIELDOPTIONS_STRING_PIECE = 2
+} google_protobuf_FieldOptions_CType;
+
 typedef enum google_protobuf_FieldDescriptorProto_Type {
   GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_DOUBLE = 1,
   GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_FLOAT = 2,
@@ -40,38 +53,37 @@ typedef enum google_protobuf_FileOptions_OptimizeMode {
   GOOGLE_PROTOBUF_FILEOPTIONS_CODE_SIZE = 2
 } google_protobuf_FileOptions_OptimizeMode;
 
-typedef enum google_protobuf_FieldOptions_CType {
-  GOOGLE_PROTOBUF_FIELDOPTIONS_CORD = 1,
-  GOOGLE_PROTOBUF_FIELDOPTIONS_STRING_PIECE = 2
-} google_protobuf_FieldOptions_CType;
-
 /* Forward declarations of all message types.
  * So they can refer to each other in possibly-recursive ways. */
 
-struct google_protobuf_FileDescriptorSet;
-typedef struct google_protobuf_FileDescriptorSet
-    google_protobuf_FileDescriptorSet;
-
-struct google_protobuf_FileDescriptorProto;
-typedef struct google_protobuf_FileDescriptorProto
-    google_protobuf_FileDescriptorProto;
+struct google_protobuf_UninterpretedOption_NamePart;
+typedef struct google_protobuf_UninterpretedOption_NamePart
+    google_protobuf_UninterpretedOption_NamePart;
 
 struct google_protobuf_DescriptorProto;
 typedef struct google_protobuf_DescriptorProto
     google_protobuf_DescriptorProto;
 
-struct google_protobuf_DescriptorProto_ExtensionRange;
-typedef struct google_protobuf_DescriptorProto_ExtensionRange
-    google_protobuf_DescriptorProto_ExtensionRange;
-
-struct google_protobuf_FieldDescriptorProto;
-typedef struct google_protobuf_FieldDescriptorProto
-    google_protobuf_FieldDescriptorProto;
-
 struct google_protobuf_EnumDescriptorProto;
 typedef struct google_protobuf_EnumDescriptorProto
     google_protobuf_EnumDescriptorProto;
 
+struct google_protobuf_UninterpretedOption;
+typedef struct google_protobuf_UninterpretedOption
+    google_protobuf_UninterpretedOption;
+
+struct google_protobuf_FileDescriptorProto;
+typedef struct google_protobuf_FileDescriptorProto
+    google_protobuf_FileDescriptorProto;
+
+struct google_protobuf_MethodDescriptorProto;
+typedef struct google_protobuf_MethodDescriptorProto
+    google_protobuf_MethodDescriptorProto;
+
+struct google_protobuf_EnumValueOptions;
+typedef struct google_protobuf_EnumValueOptions
+    google_protobuf_EnumValueOptions;
+
 struct google_protobuf_EnumValueDescriptorProto;
 typedef struct google_protobuf_EnumValueDescriptorProto
     google_protobuf_EnumValueDescriptorProto;
@@ -80,9 +92,17 @@ struct google_protobuf_ServiceDescriptorProto;
 typedef struct google_protobuf_ServiceDescriptorProto
     google_protobuf_ServiceDescriptorProto;
 
-struct google_protobuf_MethodDescriptorProto;
-typedef struct google_protobuf_MethodDescriptorProto
-    google_protobuf_MethodDescriptorProto;
+struct google_protobuf_FileDescriptorSet;
+typedef struct google_protobuf_FileDescriptorSet
+    google_protobuf_FileDescriptorSet;
+
+struct google_protobuf_DescriptorProto_ExtensionRange;
+typedef struct google_protobuf_DescriptorProto_ExtensionRange
+    google_protobuf_DescriptorProto_ExtensionRange;
+
+struct google_protobuf_FieldOptions;
+typedef struct google_protobuf_FieldOptions
+    google_protobuf_FieldOptions;
 
 struct google_protobuf_FileOptions;
 typedef struct google_protobuf_FileOptions
@@ -92,17 +112,13 @@ struct google_protobuf_MessageOptions;
 typedef struct google_protobuf_MessageOptions
     google_protobuf_MessageOptions;
 
-struct google_protobuf_FieldOptions;
-typedef struct google_protobuf_FieldOptions
-    google_protobuf_FieldOptions;
-
 struct google_protobuf_EnumOptions;
 typedef struct google_protobuf_EnumOptions
     google_protobuf_EnumOptions;
 
-struct google_protobuf_EnumValueOptions;
-typedef struct google_protobuf_EnumValueOptions
-    google_protobuf_EnumValueOptions;
+struct google_protobuf_FieldDescriptorProto;
+typedef struct google_protobuf_FieldDescriptorProto
+    google_protobuf_FieldDescriptorProto;
 
 struct google_protobuf_ServiceOptions;
 typedef struct google_protobuf_ServiceOptions
@@ -112,126 +128,132 @@ struct google_protobuf_MethodOptions;
 typedef struct google_protobuf_MethodOptions
     google_protobuf_MethodOptions;
 
-struct google_protobuf_UninterpretedOption;
-typedef struct google_protobuf_UninterpretedOption
-    google_protobuf_UninterpretedOption;
-
-struct google_protobuf_UninterpretedOption_NamePart;
-typedef struct google_protobuf_UninterpretedOption_NamePart
-    google_protobuf_UninterpretedOption_NamePart;
-
 /* The message definitions themselves. */
 
-struct google_protobuf_FileDescriptorSet {
+struct google_protobuf_UninterpretedOption_NamePart {
   union {
     uint8_t bytes[1];
     struct {
-      bool file:1;  /* = 1, repeated. */
+      bool name_part:1;  /* = 1, required. */
+      bool is_extension:1;  /* = 2, required. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_FileDescriptorProto)* file;
+  struct upb_string* name_part;
+  bool is_extension;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorSet)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)
 
-struct google_protobuf_FileDescriptorProto {
+struct google_protobuf_DescriptorProto {
   union {
     uint8_t bytes[1];
     struct {
       bool name:1;  /* = 1, optional. */
-      bool package:1;  /* = 2, optional. */
-      bool dependency:1;  /* = 3, repeated. */
-      bool message_type:1;  /* = 4, repeated. */
-      bool enum_type:1;  /* = 5, repeated. */
-      bool service:1;  /* = 6, repeated. */
-      bool extension:1;  /* = 7, repeated. */
-      bool options:1;  /* = 8, optional. */
+      bool field:1;  /* = 2, repeated. */
+      bool nested_type:1;  /* = 3, repeated. */
+      bool enum_type:1;  /* = 4, repeated. */
+      bool extension_range:1;  /* = 5, repeated. */
+      bool extension:1;  /* = 6, repeated. */
+      bool options:1;  /* = 7, optional. */
     } has;
   } set_flags;
   struct upb_string* name;
-  struct upb_string* package;
-  struct upb_string_array* dependency;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* message_type;
+  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* field;
+  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* nested_type;
   UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type;
-  UPB_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)* service;
+  UPB_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)* extension_range;
   UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* extension;
-  google_protobuf_FileOptions* options;
+  google_protobuf_MessageOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorProto)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto)
 
-struct google_protobuf_DescriptorProto_ExtensionRange {
+struct google_protobuf_EnumDescriptorProto {
   union {
     uint8_t bytes[1];
     struct {
-      bool start:1;  /* = 1, optional. */
-      bool end:1;  /* = 2, optional. */
+      bool name:1;  /* = 1, optional. */
+      bool value:1;  /* = 2, repeated. */
+      bool options:1;  /* = 3, optional. */
     } has;
   } set_flags;
-  int32_t start;
-  int32_t end;
+  struct upb_string* name;
+  UPB_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)* value;
+  google_protobuf_EnumOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)
-struct google_protobuf_DescriptorProto {
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumDescriptorProto)
+
+struct google_protobuf_UninterpretedOption {
   union {
     uint8_t bytes[1];
     struct {
-      bool name:1;  /* = 1, optional. */
-      bool field:1;  /* = 2, repeated. */
-      bool nested_type:1;  /* = 3, repeated. */
-      bool enum_type:1;  /* = 4, repeated. */
-      bool extension_range:1;  /* = 5, repeated. */
-      bool extension:1;  /* = 6, repeated. */
-      bool options:1;  /* = 7, optional. */
+      bool name:1;  /* = 2, repeated. */
+      bool identifier_value:1;  /* = 3, optional. */
+      bool positive_int_value:1;  /* = 4, optional. */
+      bool negative_int_value:1;  /* = 5, optional. */
+      bool double_value:1;  /* = 6, optional. */
+      bool string_value:1;  /* = 7, optional. */
     } has;
   } set_flags;
-  struct upb_string* name;
-  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* field;
-  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* extension;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* nested_type;
-  UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type;
-  UPB_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)* extension_range;
-  google_protobuf_MessageOptions* options;
+  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)* name;
+  struct upb_string* identifier_value;
+  uint64_t positive_int_value;
+  int64_t negative_int_value;
+  double double_value;
+  struct upb_string* string_value;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption)
 
-struct google_protobuf_FieldDescriptorProto {
+struct google_protobuf_FileDescriptorProto {
   union {
     uint8_t bytes[1];
     struct {
       bool name:1;  /* = 1, optional. */
-      bool extendee:1;  /* = 2, optional. */
-      bool number:1;  /* = 3, optional. */
-      bool label:1;  /* = 4, optional. */
-      bool type:1;  /* = 5, optional. */
-      bool type_name:1;  /* = 6, optional. */
-      bool default_value:1;  /* = 7, optional. */
+      bool package:1;  /* = 2, optional. */
+      bool dependency:1;  /* = 3, repeated. */
+      bool message_type:1;  /* = 4, repeated. */
+      bool enum_type:1;  /* = 5, repeated. */
+      bool service:1;  /* = 6, repeated. */
+      bool extension:1;  /* = 7, repeated. */
       bool options:1;  /* = 8, optional. */
     } has;
   } set_flags;
   struct upb_string* name;
-  int32_t number;
-  int32_t label; /* enum google.protobuf.FieldDescriptorProto.Label */
-  int32_t type; /* enum google.protobuf.FieldDescriptorProto.Type */
-  struct upb_string* type_name;
-  struct upb_string* extendee;
-  struct upb_string* default_value;
-  google_protobuf_FieldOptions* options;
+  struct upb_string* package;
+  struct upb_string_array* dependency;
+  UPB_MSG_ARRAY(google_protobuf_DescriptorProto)* message_type;
+  UPB_MSG_ARRAY(google_protobuf_EnumDescriptorProto)* enum_type;
+  UPB_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)* service;
+  UPB_MSG_ARRAY(google_protobuf_FieldDescriptorProto)* extension;
+  google_protobuf_FileOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldDescriptorProto)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorProto)
 
-struct google_protobuf_EnumDescriptorProto {
+struct google_protobuf_MethodDescriptorProto {
   union {
     uint8_t bytes[1];
     struct {
       bool name:1;  /* = 1, optional. */
-      bool value:1;  /* = 2, repeated. */
-      bool options:1;  /* = 3, optional. */
+      bool input_type:1;  /* = 2, optional. */
+      bool output_type:1;  /* = 3, optional. */
+      bool options:1;  /* = 4, optional. */
     } has;
   } set_flags;
   struct upb_string* name;
-  UPB_MSG_ARRAY(google_protobuf_EnumValueDescriptorProto)* value;
-  google_protobuf_EnumOptions* options;
+  struct upb_string* input_type;
+  struct upb_string* output_type;
+  google_protobuf_MethodOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumDescriptorProto)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodDescriptorProto)
+
+struct google_protobuf_EnumValueOptions {
+  union {
+    uint8_t bytes[1];
+    struct {
+      bool uninterpreted_option:1;  /* = 999, repeated. */
+    } has;
+  } set_flags;
+  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+};
+UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueOptions)
 
 struct google_protobuf_EnumValueDescriptorProto {
   union {
@@ -263,22 +285,48 @@ struct google_protobuf_ServiceDescriptorProto {
 };
 UPB_DEFINE_MSG_ARRAY(google_protobuf_ServiceDescriptorProto)
 
-struct google_protobuf_MethodDescriptorProto {
+struct google_protobuf_FileDescriptorSet {
   union {
     uint8_t bytes[1];
     struct {
-      bool name:1;  /* = 1, optional. */
-      bool input_type:1;  /* = 2, optional. */
-      bool output_type:1;  /* = 3, optional. */
-      bool options:1;  /* = 4, optional. */
+      bool file:1;  /* = 1, repeated. */
     } has;
   } set_flags;
-  struct upb_string* name;
-  struct upb_string* input_type;
-  struct upb_string* output_type;
-  google_protobuf_MethodOptions* options;
+  UPB_MSG_ARRAY(google_protobuf_FileDescriptorProto)* file;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodDescriptorProto)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FileDescriptorSet)
+
+struct google_protobuf_DescriptorProto_ExtensionRange {
+  union {
+    uint8_t bytes[1];
+    struct {
+      bool start:1;  /* = 1, optional. */
+      bool end:1;  /* = 2, optional. */
+    } has;
+  } set_flags;
+  int32_t start;
+  int32_t end;
+};
+UPB_DEFINE_MSG_ARRAY(google_protobuf_DescriptorProto_ExtensionRange)
+
+struct google_protobuf_FieldOptions {
+  union {
+    uint8_t bytes[1];
+    struct {
+      bool ctype:1;  /* = 1, optional. */
+      bool packed:1;  /* = 2, optional. */
+      bool deprecated:1;  /* = 3, optional. */
+      bool experimental_map_key:1;  /* = 9, optional. */
+      bool uninterpreted_option:1;  /* = 999, repeated. */
+    } has;
+  } set_flags;
+  uint32_t ctype;
+  bool packed;
+  bool deprecated;
+  struct upb_string* experimental_map_key;
+  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+};
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldOptions)
 
 struct google_protobuf_FileOptions {
   union {
@@ -293,8 +341,8 @@ struct google_protobuf_FileOptions {
   } set_flags;
   struct upb_string* java_package;
   struct upb_string* java_outer_classname;
+  uint32_t optimize_for;
   bool java_multiple_files;
-  int32_t optimize_for; /* enum google.protobuf.FileOptions.OptimizeMode */
   UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
 };
 UPB_DEFINE_MSG_ARRAY(google_protobuf_FileOptions)
@@ -312,21 +360,6 @@ struct google_protobuf_MessageOptions {
 };
 UPB_DEFINE_MSG_ARRAY(google_protobuf_MessageOptions)
 
-struct google_protobuf_FieldOptions {
-  union {
-    uint8_t bytes[1];
-    struct {
-      bool ctype:1;  /* = 1, optional. */
-      bool experimental_map_key:1;  /* = 9, optional. */
-      bool uninterpreted_option:1;  /* = 999, repeated. */
-    } has;
-  } set_flags;
-  int32_t ctype; /* enum google.protobuf.FieldOptions.CType */
-  struct upb_string* experimental_map_key;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
-};
-UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldOptions)
-
 struct google_protobuf_EnumOptions {
   union {
     uint8_t bytes[1];
@@ -338,16 +371,30 @@ struct google_protobuf_EnumOptions {
 };
 UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumOptions)
 
-struct google_protobuf_EnumValueOptions {
+struct google_protobuf_FieldDescriptorProto {
   union {
     uint8_t bytes[1];
     struct {
-      bool uninterpreted_option:1;  /* = 999, repeated. */
+      bool name:1;  /* = 1, optional. */
+      bool extendee:1;  /* = 2, optional. */
+      bool number:1;  /* = 3, optional. */
+      bool label:1;  /* = 4, optional. */
+      bool type:1;  /* = 5, optional. */
+      bool type_name:1;  /* = 6, optional. */
+      bool default_value:1;  /* = 7, optional. */
+      bool options:1;  /* = 8, optional. */
     } has;
   } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption)* uninterpreted_option;
+  struct upb_string* name;
+  struct upb_string* extendee;
+  int32_t number;
+  uint32_t label;
+  uint32_t type;
+  struct upb_string* type_name;
+  struct upb_string* default_value;
+  google_protobuf_FieldOptions* options;
 };
-UPB_DEFINE_MSG_ARRAY(google_protobuf_EnumValueOptions)
+UPB_DEFINE_MSG_ARRAY(google_protobuf_FieldDescriptorProto)
 
 struct google_protobuf_ServiceOptions {
   union {
@@ -371,39 +418,8 @@ struct google_protobuf_MethodOptions {
 };
 UPB_DEFINE_MSG_ARRAY(google_protobuf_MethodOptions)
 
-struct google_protobuf_UninterpretedOption_NamePart {
-  union {
-    uint8_t bytes[1];
-    struct {
-      bool name_part:1;  /* = 1, required. */
-      bool is_extension:1;  /* = 2, required. */
-    } has;
-  } set_flags;
-  struct upb_string* name_part;
-  bool is_extension;
-};
-UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)
-struct google_protobuf_UninterpretedOption {
-  union {
-    uint8_t bytes[1];
-    struct {
-      bool name:1;  /* = 2, repeated. */
-      bool identifier_value:1;  /* = 3, optional. */
-      bool positive_int_value:1;  /* = 4, optional. */
-      bool negative_int_value:1;  /* = 5, optional. */
-      bool double_value:1;  /* = 6, optional. */
-      bool string_value:1;  /* = 7, optional. */
-    } has;
-  } set_flags;
-  UPB_MSG_ARRAY(google_protobuf_UninterpretedOption_NamePart)* name;
-  struct upb_string* identifier_value;
-  uint64_t positive_int_value;
-  int64_t negative_int_value;
-  double double_value;
-  struct upb_string* string_value;
-};
-UPB_DEFINE_MSG_ARRAY(google_protobuf_UninterpretedOption)
-
-extern google_protobuf_FileDescriptorProto google_protobuf_filedescriptor;
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
 
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_H_ */
+#endif  /* DESCRIPTOR_DESCRIPTOR_H */