psych 2.0.12 → 5.2.3

data/ext/psych/psych_emitter.c

@@ -1,6 +1,14 @@
 #include <psych.h>
 
+#if !defined(RARRAY_CONST_PTR)
+#define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s)
+#endif
+#if !defined(RARRAY_AREF)
+#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
+#endif
+
 VALUE cPsychEmitter;
+static ID id_io;
 static ID id_write;
 static ID id_line_width;
 static ID id_indentation;
@@ -9,13 +17,13 @@ static ID id_canonical;
 static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 {
     if(!yaml_emitter_emit(emitter, event))
-	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+        rb_raise(rb_eRuntimeError, "%s", emitter->problem);
 }
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
 {
-    VALUE io = (VALUE)ctx;
-    VALUE str = rb_str_new((const char *)buffer, (long)size);
+    VALUE self = (VALUE)ctx, io = rb_attr_get(self, id_io);
+    VALUE str = rb_enc_str_new((const char *)buffer, (long)size, rb_utf8_encoding());
     VALUE wrote = rb_funcall(io, id_write, 1, str);
     return (int)NUM2INT(wrote);
 }
@@ -50,14 +58,13 @@ static const rb_data_type_t psych_emitter_type = {
 static VALUE allocate(VALUE klass)
 {
     yaml_emitter_t * emitter;
-
-    emitter = xmalloc(sizeof(yaml_emitter_t));
+    VALUE obj = TypedData_Make_Struct(klass, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_initialize(emitter);
     yaml_emitter_set_unicode(emitter, 1);
     yaml_emitter_set_indent(emitter, 2);
 
-    return TypedData_Wrap_Struct(klass, &psych_emitter_type, emitter);
+    return obj;
 }
 
 /* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
@@ -75,16 +82,17 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
-	line_width = rb_funcall(options, id_line_width, 0);
-	indent     = rb_funcall(options, id_indentation, 0);
-	canonical  = rb_funcall(options, id_canonical, 0);
+        line_width = rb_funcall(options, id_line_width, 0);
+        indent     = rb_funcall(options, id_indentation, 0);
+        canonical  = rb_funcall(options, id_canonical, 0);
 
-	yaml_emitter_set_width(emitter, NUM2INT(line_width));
-	yaml_emitter_set_indent(emitter, NUM2INT(indent));
-	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+        yaml_emitter_set_width(emitter, NUM2INT(line_width));
+        yaml_emitter_set_indent(emitter, NUM2INT(indent));
+        yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
-    yaml_emitter_set_output(emitter, writer, (void *)io);
+    rb_ivar_set(self, id_io, io);
+    yaml_emitter_set_output(emitter, writer, (void *)self);
 
     return self;
 }
@@ -128,84 +136,118 @@ static VALUE end_stream(VALUE self)
     return self;
 }
 
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+struct start_document_data {
+    VALUE self;
+    VALUE version;
+    VALUE tags;
+    VALUE imp;
+
+    yaml_tag_directive_t * head;
+};
+
+static VALUE start_document_try(VALUE d)
 {
+    struct start_document_data * data = (struct start_document_data *)d;
+    VALUE self = data->self;
+    VALUE version = data->version;
+    VALUE tags = data->tags;
+    VALUE imp = data->imp;
+
     yaml_emitter_t * emitter;
-    yaml_tag_directive_t * head = NULL;
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-
     Check_Type(version, T_ARRAY);
 
     if(RARRAY_LEN(version) > 0) {
-	VALUE major = rb_ary_entry(version, (long)0);
-	VALUE minor = rb_ary_entry(version, (long)1);
+        VALUE major = rb_ary_entry(version, (long)0);
+        VALUE minor = rb_ary_entry(version, (long)1);
 
-	version_directive.major = NUM2INT(major);
-	version_directive.minor = NUM2INT(minor);
+        version_directive.major = NUM2INT(major);
+        version_directive.minor = NUM2INT(minor);
     }
 
     if(RTEST(tags)) {
-	int i = 0;
-#ifdef HAVE_RUBY_ENCODING_H
-	rb_encoding * encoding = rb_utf8_encoding();
-#endif
+        long i = 0;
+        long len;
+        rb_encoding * encoding = rb_utf8_encoding();
 
-	Check_Type(tags, T_ARRAY);
+        Check_Type(tags, T_ARRAY);
 
-	head  = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
-	tail  = head;
+        len = RARRAY_LEN(tags);
+        data->head = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+        tail = data->head;
 
-	for(i = 0; i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_PTR(tags)[i];
-	    VALUE name;
-	    VALUE value;
+        for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+            VALUE tuple = RARRAY_AREF(tags, i);
+            VALUE name;
+            VALUE value;
 
-	    Check_Type(tuple, T_ARRAY);
+            Check_Type(tuple, T_ARRAY);
 
-	    if(RARRAY_LEN(tuple) < 2) {
-		xfree(head);
-		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
-	    }
-	    name  = RARRAY_PTR(tuple)[0];
-	    value = RARRAY_PTR(tuple)[1];
-#ifdef HAVE_RUBY_ENCODING_H
-	    name = rb_str_export_to_enc(name, encoding);
-	    value = rb_str_export_to_enc(value, encoding);
-#endif
+            if(RARRAY_LEN(tuple) < 2) {
+                rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+            }
+
+            name  = RARRAY_AREF(tuple, 0);
+            value = RARRAY_AREF(tuple, 1);
+            StringValue(name);
+            StringValue(value);
+            name = rb_str_export_to_enc(name, encoding);
+            value = rb_str_export_to_enc(value, encoding);
 
-	    tail->handle = (yaml_char_t *)StringValuePtr(name);
-	    tail->prefix = (yaml_char_t *)StringValuePtr(value);
+            tail->handle = (yaml_char_t *)StringValueCStr(name);
+            tail->prefix = (yaml_char_t *)StringValueCStr(value);
 
-	    tail++;
-	}
+            tail++;
+        }
     }
 
     yaml_document_start_event_initialize(
-	    &event,
-	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
-	    head,
-	    tail,
-	    imp ? 1 : 0
-	    );
+            &event,
+            (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+            data->head,
+            tail,
+            imp ? 1 : 0
+            );
 
     emit(emitter, &event);
 
-    if(head) xfree(head);
-
     return self;
 }
 
+static VALUE start_document_ensure(VALUE d)
+{
+    struct start_document_data * data = (struct start_document_data *)d;
+
+    xfree(data->head);
+
+    return Qnil;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    struct start_document_data data = {
+        .self = self,
+        .version = version,
+        .tags = tags,
+        .imp = imp,
+
+        .head = NULL,
+    };
+
+    return rb_ensure(start_document_try, (VALUE)&data, start_document_ensure, (VALUE)&data);
+}
+
 /* call-seq: emitter.end_document(implicit)
  *
  * End a document emission with an +implicit+ ending.
@@ -233,49 +275,46 @@ static VALUE end_document(VALUE self, VALUE imp)
  * See Psych::Handler#scalar
  */
 static VALUE scalar(
-	VALUE self,
-	VALUE value,
-	VALUE anchor,
-	VALUE tag,
-	VALUE plain,
-	VALUE quoted,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE value,
+        VALUE anchor,
+        VALUE tag,
+        VALUE plain,
+        VALUE quoted,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-#endif
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     Check_Type(value, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     value = rb_str_export_to_enc(value, encoding);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
+    const char *value_ptr = StringValuePtr(value);
     yaml_scalar_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    (yaml_char_t*)StringValuePtr(value),
-	    (int)RSTRING_LEN(value),
-	    plain ? 1 : 0,
-	    quoted ? 1 : 0,
-	    (yaml_scalar_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            (yaml_char_t*)value_ptr,
+            (int)RSTRING_LEN(value),
+            plain ? 1 : 0,
+            quoted ? 1 : 0,
+            (yaml_scalar_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -290,38 +329,36 @@ static VALUE scalar(
  * See Psych::Handler#start_sequence
  */
 static VALUE start_sequence(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_sequence_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -355,40 +392,37 @@ static VALUE end_sequence(VALUE self)
  * See Psych::Handler#start_mapping
  */
 static VALUE start_mapping(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-#endif
+
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
-#endif
 
     yaml_mapping_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_mapping_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_mapping_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -426,17 +460,15 @@ static VALUE alias(VALUE self, VALUE anchor)
     yaml_event_t event;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-#ifdef HAVE_RUBY_ENCODING_H
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
-#endif
 
     yaml_alias_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
+            );
 
     emit(emitter, &event);
 
@@ -524,6 +556,7 @@ static VALUE set_line_width(VALUE self, VALUE width)
 
 void Init_psych_emitter(void)
 {
+#undef rb_intern
     VALUE psych     = rb_define_module("Psych");
     VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
     cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);
@@ -548,9 +581,9 @@ void Init_psych_emitter(void)
     rb_define_method(cPsychEmitter, "line_width", line_width, 0);
     rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
 
+    id_io          = rb_intern("io");
     id_write       = rb_intern("write");
     id_line_width  = rb_intern("line_width");
     id_indentation = rb_intern("indentation");
     id_canonical   = rb_intern("canonical");
 }
-/* vim: set noet sws=4 sw=4: */