summaryrefslogtreecommitdiff
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/upb_decoder.c4
-rw-r--r--stream/upb_decoder.h2
-rw-r--r--stream/upb_stdio.c37
-rw-r--r--stream/upb_stdio.h2
-rw-r--r--stream/upb_text.c93
-rw-r--r--stream/upb_text.h36
-rw-r--r--stream/upb_textprinter.c131
-rw-r--r--stream/upb_textprinter.h30
8 files changed, 201 insertions, 134 deletions
diff --git a/stream/upb_decoder.c b/stream/upb_decoder.c
index c06660f..9a3f6b0 100644
--- a/stream/upb_decoder.c
+++ b/stream/upb_decoder.c
@@ -574,3 +574,7 @@ void upb_decoder_reset(upb_decoder *d, upb_bytesrc *bytesrc)
d->buf_stream_offset = 0;
d->buf_offset = 0;
}
+
+upb_src *upb_decoder_src(upb_decoder *d) {
+ return &d->src;
+}
diff --git a/stream/upb_decoder.h b/stream/upb_decoder.h
index dde61fc..6ba4d77 100644
--- a/stream/upb_decoder.h
+++ b/stream/upb_decoder.h
@@ -44,7 +44,7 @@ void upb_decoder_reset(upb_decoder *d, upb_bytesrc *bytesrc);
// Returns a upb_src pointer by which the decoder can be used. The returned
// upb_src is invalidated by upb_decoder_reset() or upb_decoder_free().
-upb_src *upb_decoder_getsrc(upb_decoder *d);
+upb_src *upb_decoder_src(upb_decoder *d);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/stream/upb_stdio.c b/stream/upb_stdio.c
index 7cbca91..89a6621 100644
--- a/stream/upb_stdio.c
+++ b/stream/upb_stdio.c
@@ -6,6 +6,10 @@
#include "upb_stdio.h"
+#include <stddef.h>
+#include <stdlib.h>
+#include "upb_string.h"
+
// We can make this configurable if necessary.
#define BLOCK_SIZE 4096
@@ -13,11 +17,15 @@ struct upb_stdio {
upb_bytesrc bytesrc;
upb_bytesink bytesink;
FILE *file;
+};
+
+void upb_stdio_reset(upb_stdio *stdio, FILE* file) {
+ stdio->file = file;
}
static bool upb_stdio_read(upb_stdio *stdio, upb_string *str,
- int offset, int bytes_to_read) {
- char *buf = upb_string_getrwbuf(offset + bytes_to_read) + offset;
+ int offset, size_t bytes_to_read) {
+ char *buf = upb_string_getrwbuf(str, offset + bytes_to_read) + offset;
size_t read = fread(buf, 1, bytes_to_read, stdio->file);
if(read < bytes_to_read) {
// Error or EOF.
@@ -44,7 +52,7 @@ bool upb_stdio_append(upb_bytesrc *src, upb_string *str, upb_strlen_t len) {
return upb_stdio_read((upb_stdio*)src, str, upb_string_len(str), len);
}
-int32_t upb_bytesink_put(upb_bytesink *sink, upb_string *str) {
+int32_t upb_stdio_put(upb_bytesink *sink, upb_string *str) {
upb_stdio *stdio = (upb_stdio*)sink - offsetof(upb_stdio, bytesink);
upb_strlen_t len = upb_string_len(str);
size_t written = fwrite(upb_string_getrobuf(str), 1, len, stdio->file);
@@ -59,3 +67,26 @@ int32_t upb_bytesink_put(upb_bytesink *sink, upb_string *str) {
}
return written;
}
+
+static upb_bytesrc_vtable upb_stdio_bytesrc_vtbl = {
+ (upb_bytesrc_get_fptr)upb_stdio_get,
+ (upb_bytesrc_append_fptr)upb_stdio_append,
+};
+
+static upb_bytesink_vtable upb_stdio_bytesink_vtbl = {
+ upb_stdio_put
+};
+
+upb_stdio *upb_stdio_new() {
+ upb_stdio *stdio = malloc(sizeof(*stdio));
+ upb_bytesrc_init(&stdio->bytesrc, &upb_stdio_bytesrc_vtbl);
+ upb_bytesink_init(&stdio->bytesink, &upb_stdio_bytesink_vtbl);
+ return stdio;
+}
+
+void upb_stdio_free(upb_stdio *stdio) {
+ free(stdio);
+}
+
+upb_bytesrc* upb_stdio_bytesrc(upb_stdio *stdio) { return &stdio->bytesrc; }
+upb_bytesink* upb_stdio_bytesink(upb_stdio *stdio) { return &stdio->bytesink; }
diff --git a/stream/upb_stdio.h b/stream/upb_stdio.h
index 3c29fcb..fd71fdd 100644
--- a/stream/upb_stdio.h
+++ b/stream/upb_stdio.h
@@ -21,7 +21,7 @@ struct upb_stdio;
typedef struct upb_stdio upb_stdio;
// Creation/deletion.
-upb_stdio_ *upb_stdio__new();
+upb_stdio *upb_stdio_new();
void upb_stdio_free(upb_stdio *stdio);
// Reset/initialize the object for use. The src or sink will call
diff --git a/stream/upb_text.c b/stream/upb_text.c
deleted file mode 100644
index 4a25ecd..0000000
--- a/stream/upb_text.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * upb - a minimalist implementation of protocol buffers.
- *
- * Copyright (c) 2009 Joshua Haberman. See LICENSE for details.
- */
-
-#include <inttypes.h>
-#include "descriptor.h"
-#include "upb_text.h"
-#include "upb_data.h"
-
-bool upb_textprinter_putval(upb_textprinter *p, upb_value val) {
- upb_string *p->str = upb_string_tryrecycle(p->str);
-#define CASE(fmtstr, member) upb_string_printf(p->str, fmtstr, val.member); break;
- switch(type) {
- case UPB_TYPE(DOUBLE):
- CASE("%0.f", _double);
- case UPB_TYPE(FLOAT):
- CASE("%0.f", _float)
- case UPB_TYPE(INT64):
- case UPB_TYPE(SFIXED64):
- case UPB_TYPE(SINT64):
- CASE("%" PRId64, int64)
- case UPB_TYPE(UINT64):
- case UPB_TYPE(FIXED64):
- CASE("%" PRIu64, uint64)
- case UPB_TYPE(INT32):
- case UPB_TYPE(SFIXED32):
- case UPB_TYPE(SINT32):
- CASE("%" PRId32, int32)
- case UPB_TYPE(UINT32):
- case UPB_TYPE(FIXED32):
- case UPB_TYPE(ENUM):
- CASE("%" PRIu32, uint32);
- case UPB_TYPE(BOOL):
- CASE("%hhu", _bool);
- }
- return upb_bytesink_put(p->str);
-}
-
-bool upb_textprinter_putstr(upb_textprinter *p, upb_string *str) {
- upb_bytesink_put(UPB_STRLIT("\""));
- // TODO: escaping.
- upb_bytesink_put(str);
- upb_bytesink_put(UPB_STRLIT("\""));
-}
-
-static void print_indent(upb_text_printer *p, FILE *stream)
-{
- if(!p->single_line)
- for(int i = 0; i < p->indent_depth; i++)
- upb_bytesink_put(UPB_STRLIT(" "));
-}
-
-void upb_text_printfield(upb_text_printer *p, upb_strptr name,
- upb_field_type_t valtype, upb_value val,
- FILE *stream)
-{
- print_indent(p, stream);
- fprintf(stream, UPB_STRFMT ":", UPB_STRARG(name));
- upb_text_printval(valtype, val, stream);
- if(p->single_line)
- fputc(' ', stream);
- else
- fputc('\n', stream);
-}
-
-void upb_textprinter_startmsg(upb_textprinter *p)
-{
- print_indent(p, stream);
- fprintf(stream, UPB_STRFMT " {", UPB_STRARG(submsg_type));
- if(!p->single_line) fputc('\n', stream);
- p->indent_depth++;
-}
-
-void upb_text_pop(upb_text_printer *p, FILE *stream)
-{
- p->indent_depth--;
- print_indent(p, stream);
- fprintf(stream, "}\n");
-}
-
-static void printval(upb_text_printer *printer, upb_value v, upb_fielddef *f,
- FILE *stream)
-{
- if(upb_issubmsg(f)) {
- upb_text_push(printer, f->name, stream);
- printmsg(printer, v.msg, upb_downcast_msgdef(f->def), stream);
- upb_text_pop(printer, stream);
- } else {
- upb_text_printfield(printer, f->name, f->type, v, stream);
- }
-}
diff --git a/stream/upb_text.h b/stream/upb_text.h
deleted file mode 100644
index d89c9d6..0000000
--- a/stream/upb_text.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * upb - a minimalist implementation of protocol buffers.
- *
- * Copyright (c) 2009 Joshua Haberman. See LICENSE for details.
- */
-
-#ifndef UPB_TEXT_H_
-#define UPB_TEXT_H_
-
-#include "upb.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
- int indent_depth;
- bool single_line;
-} upb_text_printer;
-
-INLINE void upb_text_printer_init(upb_text_printer *p, bool single_line) {
- p->indent_depth = 0;
- p->single_line = single_line;
-}
-void upb_text_printval(upb_field_type_t type, upb_value p, FILE *file);
-void upb_text_printfield(upb_text_printer *p, upb_strptr name,
- upb_field_type_t valtype, upb_value val, FILE *stream);
-void upb_text_push(upb_text_printer *p, upb_strptr submsg_type,
- FILE *stream);
-void upb_text_pop(upb_text_printer *p, FILE *stream);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_TEXT_H_ */
diff --git a/stream/upb_textprinter.c b/stream/upb_textprinter.c
new file mode 100644
index 0000000..0f0357a
--- /dev/null
+++ b/stream/upb_textprinter.c
@@ -0,0 +1,131 @@
+/*
+ * upb - a minimalist implementation of protocol buffers.
+ *
+ * Copyright (c) 2009 Joshua Haberman. See LICENSE for details.
+ */
+
+#include "upb_textprinter.h"
+
+#include <inttypes.h>
+#include <malloc.h>
+#include "upb_def.h"
+#include "upb_string.h"
+
+struct _upb_textprinter {
+ upb_sink sink;
+ upb_bytesink *bytesink;
+ upb_string *str;
+ int indent_depth;
+ bool single_line;
+ upb_fielddef *f;
+};
+
+static void upb_textprinter_endfield(upb_textprinter *p)
+{
+ if(p->single_line)
+ upb_bytesink_put(p->bytesink, UPB_STRLIT(' '));
+ else
+ upb_bytesink_put(p->bytesink, UPB_STRLIT('\n'));
+}
+
+static bool upb_textprinter_putval(upb_textprinter *p, upb_value val) {
+ p->str = upb_string_tryrecycle(p->str);
+#define CASE(fmtstr, member) upb_string_printf(p->str, fmtstr, val.member); break;
+ switch(p->f->type) {
+ case UPB_TYPE(DOUBLE):
+ CASE("%0.f", _double);
+ case UPB_TYPE(FLOAT):
+ CASE("%0.f", _float)
+ case UPB_TYPE(INT64):
+ case UPB_TYPE(SFIXED64):
+ case UPB_TYPE(SINT64):
+ CASE("%" PRId64, int64)
+ case UPB_TYPE(UINT64):
+ case UPB_TYPE(FIXED64):
+ CASE("%" PRIu64, uint64)
+ case UPB_TYPE(INT32):
+ case UPB_TYPE(SFIXED32):
+ case UPB_TYPE(SINT32):
+ CASE("%" PRId32, int32)
+ case UPB_TYPE(UINT32):
+ case UPB_TYPE(FIXED32):
+ case UPB_TYPE(ENUM):
+ CASE("%" PRIu32, uint32);
+ case UPB_TYPE(BOOL):
+ CASE("%hhu", _bool);
+ }
+ upb_bytesink_put(p->bytesink, p->str);
+ upb_textprinter_endfield(p);
+ return upb_ok(upb_bytesink_status(p->bytesink));
+}
+
+static bool upb_textprinter_putstr(upb_textprinter *p, upb_string *str) {
+ upb_bytesink_put(p->bytesink, UPB_STRLIT("\""));
+ // TODO: escaping.
+ upb_bytesink_put(p->bytesink, str);
+ upb_bytesink_put(p->bytesink, UPB_STRLIT("\""));
+ upb_textprinter_endfield(p);
+ return upb_ok(upb_bytesink_status(p->bytesink));
+}
+
+static void upb_textprinter_indent(upb_textprinter *p)
+{
+ if(!p->single_line)
+ for(int i = 0; i < p->indent_depth; i++)
+ upb_bytesink_put(p->bytesink, UPB_STRLIT(" "));
+}
+
+static bool upb_textprinter_putdef(upb_textprinter *p, upb_fielddef *f)
+{
+ upb_textprinter_indent(p);
+ upb_bytesink_put(p->bytesink, f->name);
+ upb_bytesink_put(p->bytesink, UPB_STRLIT(":"));
+ p->f = f;
+ return upb_ok(upb_bytesink_status(p->bytesink));
+}
+
+static bool upb_textprinter_startmsg(upb_textprinter *p)
+{
+ upb_textprinter_indent(p);
+ upb_bytesink_put(p->bytesink, p->f->def->fqname);
+ upb_bytesink_put(p->bytesink, UPB_STRLIT(" {"));
+ if(!p->single_line) upb_bytesink_put(p->bytesink, UPB_STRLIT('\n'));
+ p->indent_depth++;
+ return upb_ok(upb_bytesink_status(p->bytesink));
+}
+
+static bool upb_textprinter_endmsg(upb_textprinter *p)
+{
+ p->indent_depth--;
+ upb_textprinter_indent(p);
+ upb_bytesink_put(p->bytesink, UPB_STRLIT("}"));
+ upb_textprinter_endfield(p);
+ return upb_ok(upb_bytesink_status(p->bytesink));
+}
+
+upb_sink_vtable upb_textprinter_vtbl = {
+ (upb_sink_putdef_fptr)upb_textprinter_putdef,
+ (upb_sink_putval_fptr)upb_textprinter_putval,
+ (upb_sink_putstr_fptr)upb_textprinter_putstr,
+ (upb_sink_startmsg_fptr)upb_textprinter_startmsg,
+ (upb_sink_endmsg_fptr)upb_textprinter_endmsg,
+};
+
+upb_textprinter *upb_textprinter_new() {
+ upb_textprinter *p = malloc(sizeof(*p));
+ upb_sink_init(&p->sink, &upb_textprinter_vtbl);
+ return p;
+}
+
+void upb_textprinter_free(upb_textprinter *p) {
+ free(p);
+}
+
+void upb_textprinter_reset(upb_textprinter *p, upb_bytesink *sink,
+ bool single_line) {
+ p->bytesink = sink;
+ p->single_line = single_line;
+ p->indent_depth = 0;
+}
+
+upb_sink *upb_textprinter_sink(upb_textprinter *p) { return &p->sink; }
diff --git a/stream/upb_textprinter.h b/stream/upb_textprinter.h
new file mode 100644
index 0000000..7e35412
--- /dev/null
+++ b/stream/upb_textprinter.h
@@ -0,0 +1,30 @@
+/*
+ * upb - a minimalist implementation of protocol buffers.
+ *
+ * Copyright (c) 2009 Joshua Haberman. See LICENSE for details.
+ */
+
+#ifndef UPB_TEXT_H_
+#define UPB_TEXT_H_
+
+#include "upb_stream.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _upb_textprinter;
+typedef struct _upb_textprinter upb_textprinter;
+
+upb_textprinter *upb_textprinter_new();
+void upb_textprinter_free(upb_textprinter *p);
+void upb_textprinter_reset(upb_textprinter *p, upb_bytesink *sink,
+ bool single_line);
+
+upb_sink *upb_textprinter_sink(upb_textprinter *p);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* UPB_TEXT_H_ */
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback