From babefc3c66552db4a0b0302324f1280b0faacd82 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <joshua@reverberate.org>
Date: Tue, 21 Jul 2009 01:44:13 -0700
Subject: Bugfixes to parser.

---
 src/upb_msg.h | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/upb_msg.h')

diff --git a/src/upb_msg.h b/src/upb_msg.h
index 0cb3cd5..9eaf6c2 100644
--- a/src/upb_msg.h
+++ b/src/upb_msg.h
@@ -101,7 +101,6 @@
 #include "upb.h"
 #include "upb_table.h"
 #include "upb_parse.h"
-#include "descriptor.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -195,16 +194,6 @@ INLINE struct upb_msg_field *upb_msg_fieldbyname(struct upb_msg *m,
   return e ? &e->f : NULL;
 }
 
-INLINE bool upb_issubmsgtype(upb_field_type_t type) {
-  return type == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_GROUP  ||
-         type == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_MESSAGE;
-}
-
-INLINE bool upb_isstringtype(upb_field_type_t type) {
-  return type == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_STRING  ||
-         type == GOOGLE_PROTOBUF_FIELDDESCRIPTORPROTO_TYPE_BYTES;
-}
-
 INLINE bool upb_issubmsg(struct upb_msg_field *f) {
   return upb_issubmsgtype(f->type);
 }
@@ -311,12 +300,14 @@ struct upb_msg_parse_frame {
   void *data;
 };
 
+//#include "upb_text.h"
 struct upb_msg_parse_state {
   struct upb_parse_state s;
   bool merge;
   bool byref;
   struct upb_msg *m;
   struct upb_msg_parse_frame stack[UPB_MAX_NESTING], *top;
+  //struct upb_text_printer p;
 };
 
 /* Initializes/frees a message parser.  The parser will write the data to the
-- 
cgit v1.2.3