psych 3.1.0-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aecf497b38e244ea95807fb3fe1d141b389e0d37c0e173b2f4bdc158e8726d28
-  data.tar.gz: a809b927f7912dc80ffd65854fc3d8ab532392766c8c0266b832c4af3403d8f9
+  metadata.gz: e956d1f39d537bbab914f9d69e070bc18268aa68ecf0ed219f515ae254409654
+  data.tar.gz: c0a085a0afa83a1e78b8f4521a9904e4d800758ecdaff7efe9895faf060ad31c
 SHA512:
-  metadata.gz: d17f6a46ca368eb95aacbbd382c50b9551c957b0102c7e36c1fb7813ee54dfd1aecd9a215e5fdda61eca2dbf8e85358357ff32d0c960a064a8ac333259c984d0
-  data.tar.gz: cdfb0def297ab0a049dca31280c298fa5a6ea71578fa0151da3a1ff64f93d50e93d8ed6b616f0cb5b74dbedffe3516568ee71b924779273bfbacf5bb79c9a2ae
+  metadata.gz: 07e866fdc5b8a36fd037ebc6fe1fffa585c4da0a53a997eb0e09fad12717a3bc91d8005fcd9648602b2008e8b648a028b7133291d1306c2c6998a0e15f4be170
+  data.tar.gz: e31fe82bdef97efab8bb201a9fdb06eeafd94413890b2f890087ca15780738e137be16cac2680d2c40bed3a93e32836fa4819494c047e482c9784c8b22229db7

data/Gemfile

@@ -1,3 +1,9 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development do
+  gem 'rake-compiler', ">= 0.4.1"
+  gem 'minitest', "~> 5.0"
+  gem 'ruby-maven', :platforms => :jruby
+end

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2009 Aaron Patterson, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,8 +1,5 @@
 # Psych
 
-[![Build Status](https://travis-ci.org/ruby/psych.svg?branch=master)](https://travis-ci.org/ruby/psych)
-[![Build status](https://ci.appveyor.com/api/projects/status/2t6x109xfmbx209k/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/psych/branch/master)
-
 *   https://github.com/ruby/psych
 
 ## Description

data/Rakefile

@@ -28,21 +28,7 @@ if RUBY_PLATFORM =~ /java/
   end
 else
   require 'rake/extensiontask'
-  spec = Gem::Specification.load("psych.gemspec")
-  Rake::ExtensionTask.new("psych", spec) do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
-    ext.cross_compile = true
-    ext.cross_platform = %w[x86-mingw32 x64-mingw32]
-    ext.cross_compiling do |s|
-      s.files.concat ["lib/2.3/psych.so", "lib/2.4/psych.so", "lib/2.5/psych.so"]
-    end
-  end
-end
-
-desc "Compile binaries for mingw platform using rake-compiler-dock"
-task 'build:mingw' do
-  require 'rake_compiler_dock'
-  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0"
+  Rake::ExtensionTask.new("psych")
 end
 
 task :default => [:compile, :test]

data/ext/java/org/jruby/ext/psych/PsychLibrary.java

@@ -44,8 +44,11 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
+import org.yaml.snakeyaml.error.Mark;
 
 public class PsychLibrary implements Library {
+    private static final String DUMMY_VERSION = "0.0";
+
     public void load(final Ruby runtime, boolean wrap) {
         RubyModule psych = runtime.defineModule("Psych");
 
@@ -57,12 +60,33 @@ public class PsychLibrary implements Library {
         catch( IOException e ) {
             // ignored
         }
-        String snakeyamlVersion = props.getProperty("version", "0.0");
+        String snakeyamlVersion = props.getProperty("version", DUMMY_VERSION);
 
         if (snakeyamlVersion.endsWith("-SNAPSHOT")) {
             snakeyamlVersion = snakeyamlVersion.substring(0, snakeyamlVersion.length() - "-SNAPSHOT".length());
         }
 
+        // Try to determine if we have a new enough SnakeYAML.
+        // Versions before 1.21 removed a Mark constructor that JRuby uses.
+        // See https://github.com/bundler/bundler/issues/6878
+        if (snakeyamlVersion.equals(DUMMY_VERSION)) {
+            try {
+                // Use reflection to try to confirm we have a new enough version
+                Mark.class.getConstructor(String.class, int.class, int.class, int.class, int[].class, int.class);
+            } catch (NoSuchMethodException nsme) {
+                throw runtime.newLoadError("bad SnakeYAML version, required 1.21 or higher; check your CLASSPATH for a conflicting jar");
+            }
+        } else {
+            // Parse version string to check for 1.21+
+            String[] majorMinor = snakeyamlVersion.split("\\.");
+
+            if (majorMinor.length < 2 || Integer.parseInt(majorMinor[0]) < 1 || Integer.parseInt(majorMinor[1]) < 21) {
+                throw runtime.newLoadError(
+                        "bad SnakeYAML version " + snakeyamlVersion +
+                                ", required 1.21 or higher; check your CLASSPATH for a conflicting jar");
+            }
+        }
+
         RubyString version = runtime.newString(snakeyamlVersion + ".0");
         version.setFrozen(true);
         psych.setConstant("SNAKEYAML_VERSION", version);

data/ext/java/org/jruby/ext/psych/PsychYamlTree.java

@@ -44,12 +44,4 @@ public class PsychYamlTree {
 
         psychYamlTree.defineAnnotatedMethods(PsychYamlTree.class);
     }
-
-    @JRubyMethod(visibility = PRIVATE)
-    public static IRubyObject private_iv_get(ThreadContext context, IRubyObject self, IRubyObject target, IRubyObject prop) {
-        IRubyObject obj = (IRubyObject)target.getInternalVariables().getInternalVariable(prop.asJavaString());
-        if (obj == null) obj = context.nil;
-
-        return obj;
-    }
 }

data/ext/psych/depend

@@ -1,3 +1,5 @@
+$(OBJS): $(YAML_H)
+
 $(OBJS): $(HDRS) $(ruby_headers) \
   $(hdrdir)/ruby/encoding.h \
   $(hdrdir)/ruby/oniguruma.h

data/ext/psych/extconf.rb

@@ -13,8 +13,10 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
   $VPATH << "$(srcdir)/yaml"
   $INCFLAGS << " -I$(srcdir)/yaml"
 
-  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}
+  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
 
+  header = 'yaml/yaml.h'
+  header = "{$(VPATH)}#{header}" if $nmake
   if have_macro("_WIN32")
     $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
   end
@@ -34,6 +36,8 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
   have_header 'config.h'
 end
 
-create_makefile 'psych'
+create_makefile 'psych' do |mk|
+  mk << "YAML_H = #{header}".strip << "\n"
+end
 
 # :startdoc:

data/ext/psych/psych.c

@@ -11,9 +11,9 @@ static VALUE libyaml_version(VALUE module)
 
     yaml_get_version(&major, &minor, &patch);
 
-    list[0] = INT2NUM((long)major);
-    list[1] = INT2NUM((long)minor);
-    list[2] = INT2NUM((long)patch);
+    list[0] = INT2NUM(major);
+    list[1] = INT2NUM(minor);
+    list[2] = INT2NUM(patch);
 
     return rb_ary_new4((long)3, list);
 }

data/ext/psych/psych_parser.c

@@ -1,7 +1,6 @@
 #include <psych.h>
 
 VALUE cPsychParser;
-VALUE ePsychSyntaxError;
 
 static ID id_read;
 static ID id_path;
@@ -28,7 +27,7 @@ static ID id_event_location;
 static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
 {
     VALUE io = (VALUE)data;
-    VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
+    VALUE string = rb_funcall(io, id_read, 1, SIZET2NUM(size));
 
     *read = 0;
 
@@ -81,15 +80,18 @@ static VALUE allocate(VALUE klass)
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 {
     size_t line, column;
+    VALUE ePsychSyntaxError;
 
     line = parser->context_mark.line + 1;
     column = parser->context_mark.column + 1;
 
+    ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
+
     return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
 	    path,
-	    INT2NUM(line),
-	    INT2NUM(column),
-	    INT2NUM(parser->problem_offset),
+	    SIZET2NUM(line),
+	    SIZET2NUM(column),
+	    SIZET2NUM(parser->problem_offset),
 	    parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
 	    parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
 }
@@ -254,7 +256,6 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     yaml_parser_t * parser;
     yaml_event_t event;
     int done = 0;
-    int tainted = 0;
     int state = 0;
     int parser_encoding = YAML_ANY_ENCODING;
     int encoding = rb_utf8_encindex();
@@ -273,13 +274,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     yaml_parser_delete(parser);
     yaml_parser_initialize(parser);
 
-    if (OBJ_TAINTED(yaml)) tainted = 1;
-
     if (rb_respond_to(yaml, id_read)) {
 	yaml = transcode_io(yaml, &parser_encoding);
 	yaml_parser_set_encoding(parser, parser_encoding);
 	yaml_parser_set_input(parser, io_reader, (void *)yaml);
-	if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
     } else {
 	StringValue(yaml);
 	yaml = transcode_string(yaml, &parser_encoding);
@@ -305,10 +303,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    rb_exc_raise(exception);
 	}
 
-	start_line = INT2NUM((long)event.start_mark.line);
-	start_column = INT2NUM((long)event.start_mark.column);
-	end_line = INT2NUM((long)event.end_mark.line);
-	end_column = INT2NUM((long)event.end_mark.column);
+	start_line = SIZET2NUM(event.start_mark.line);
+	start_column = SIZET2NUM(event.start_mark.column);
+	end_line = SIZET2NUM(event.end_mark.line);
+	end_column = SIZET2NUM(event.end_mark.column);
 
 	event_args[0] = handler;
 	event_args[1] = start_line;
@@ -323,7 +321,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		  VALUE args[2];
 
 		  args[0] = handler;
-		  args[1] = INT2NUM((long)event.data.stream_start.encoding);
+		  args[1] = INT2NUM(event.data.stream_start.encoding);
 		  rb_protect(protected_start_stream, (VALUE)args, &state);
 	      }
 	      break;
@@ -336,8 +334,8 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE version = event.data.document_start.version_directive ?
 		    rb_ary_new3(
 			(long)2,
-			INT2NUM((long)event.data.document_start.version_directive->major),
-			INT2NUM((long)event.data.document_start.version_directive->minor)
+			INT2NUM(event.data.document_start.version_directive->major),
+			INT2NUM(event.data.document_start.version_directive->minor)
 			) : rb_ary_new();
 
 		if(event.data.document_start.tag_directives.start) {
@@ -350,13 +348,11 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 			VALUE prefix = Qnil;
 			if(start->handle) {
 			    handle = rb_str_new2((const char *)start->handle);
-			    if (tainted) OBJ_TAINT(handle);
 			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
 			}
 
 			if(start->prefix) {
 			    prefix = rb_str_new2((const char *)start->prefix);
-			    if (tainted) OBJ_TAINT(prefix);
 			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
 			}
 
@@ -385,7 +381,6 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE alias = Qnil;
 		if(event.data.alias.anchor) {
 		    alias = rb_str_new2((const char *)event.data.alias.anchor);
-		    if (tainted) OBJ_TAINT(alias);
 		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
 		}
 
@@ -404,19 +399,16 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		    (const char *)event.data.scalar.value,
 		    (long)event.data.scalar.length
 		    );
-		if (tainted) OBJ_TAINT(val);
 
 		PSYCH_TRANSCODE(val, encoding, internal_enc);
 
 		if(event.data.scalar.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 		}
 
 		if(event.data.scalar.tag) {
 		    tag = rb_str_new2((const char *)event.data.scalar.tag);
-		    if (tainted) OBJ_TAINT(tag);
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 		}
 
@@ -426,7 +418,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		quoted_implicit =
 		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.scalar.style);
+		style = INT2NUM(event.data.scalar.style);
 
 		args[0] = handler;
 		args[1] = val;
@@ -446,21 +438,19 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE implicit, style;
 		if(event.data.sequence_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 		}
 
 		tag = Qnil;
 		if(event.data.sequence_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 		}
 
 		implicit =
 		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.sequence_start.style);
+		style = INT2NUM(event.data.sequence_start.style);
 
 		args[0] = handler;
 		args[1] = anchor;
@@ -482,20 +472,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		VALUE implicit, style;
 		if(event.data.mapping_start.anchor) {
 		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-		    if (tainted) OBJ_TAINT(anchor);
 		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
 		}
 
 		if(event.data.mapping_start.tag) {
 		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-		    if (tainted) OBJ_TAINT(tag);
 		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
 		}
 
 		implicit =
 		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
 
-		style = INT2NUM((long)event.data.mapping_start.style);
+		style = INT2NUM(event.data.mapping_start.style);
 
 		args[0] = handler;
 		args[1] = anchor;
@@ -539,9 +527,9 @@ static VALUE mark(VALUE self)
 
     TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
     mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
-    args[0] = INT2NUM(parser->mark.index);
-    args[1] = INT2NUM(parser->mark.line);
-    args[2] = INT2NUM(parser->mark.column);
+    args[0] = SIZET2NUM(parser->mark.index);
+    args[1] = SIZET2NUM(parser->mark.line);
+    args[2] = SIZET2NUM(parser->mark.column);
 
     return rb_class_new_instance(3, args, mark_klass);
 }
@@ -569,7 +557,6 @@ void Init_psych_parser(void)
     rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
 
     rb_require("psych/syntax_error");
-    ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
 
     rb_define_method(cPsychParser, "parse", parse, -1);
     rb_define_method(cPsychParser, "mark", mark, 0);

data/ext/psych/psych_yaml_tree.c

@@ -2,23 +2,11 @@
 
 VALUE cPsychVisitorsYamlTree;
 
-/*
- * call-seq: private_iv_get(target, prop)
- *
- * Get the private instance variable +prop+ from +target+
- */
-static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
-{
-    return rb_attr_get(target, rb_intern(StringValueCStr(prop)));
-}
-
 void Init_psych_yaml_tree(void)
 {
     VALUE psych     = rb_define_module("Psych");
     VALUE visitors  = rb_define_module_under(psych, "Visitors");
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
-
-    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
 }
 /* vim: set noet sws=4 sw=4: */

data/ext/psych/yaml/api.c

@@ -118,7 +118,12 @@ yaml_string_join(
 YAML_DECLARE(int)
 yaml_stack_extend(void **start, void **top, void **end)
 {
-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
+    void *new_start;
+
+    if ((char *)*end - (char *)*start >= INT_MAX / 2)
+	return 0;
+
+    new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
 
     if (!new_start) return 0;
 
@@ -618,10 +623,10 @@ yaml_token_delete(yaml_token_t *token)
  */
 
 static int
-yaml_check_utf8(yaml_char_t *start, size_t length)
+yaml_check_utf8(const yaml_char_t *start, size_t length)
 {
-    yaml_char_t *end = start+length;
-    yaml_char_t *pointer = start;
+    const yaml_char_t *end = start+length;
+    const yaml_char_t *pointer = start;
 
     while (pointer < end) {
         unsigned char octet;
@@ -789,7 +794,7 @@ yaml_document_end_event_initialize(yaml_event_t *event, int implicit)
  */
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
+yaml_alias_event_initialize(yaml_event_t *event, const yaml_char_t *anchor)
 {
     yaml_mark_t mark = { 0, 0, 0 };
     yaml_char_t *anchor_copy = NULL;
@@ -814,8 +819,8 @@ yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
 
 YAML_DECLARE(int)
 yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, int length,
         int plain_implicit, int quoted_implicit,
         yaml_scalar_style_t style)
 {
@@ -840,7 +845,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     }
 
     if (length < 0) {
-        length = strlen((char *)value);
+        length = (int)strlen((char *)value);
     }
 
     if (!yaml_check_utf8(value, length)) goto error;
@@ -868,7 +873,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_sequence_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -923,7 +928,7 @@ yaml_sequence_end_event_initialize(yaml_event_t *event)
 
 YAML_DECLARE(int)
 yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
+        const yaml_char_t *anchor, const yaml_char_t *tag, int implicit,
         yaml_mapping_style_t style)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -1117,13 +1122,8 @@ error:
 YAML_DECLARE(void)
 yaml_document_delete(yaml_document_t *document)
 {
-    struct {
-        yaml_error_type_t error;
-    } context;
     yaml_tag_directive_t *tag_directive;
 
-    context.error = YAML_NO_ERROR;  /* Eliminate a compliler warning. */
-
     assert(document);   /* Non-NULL document object is expected. */
 
     while (!STACK_EMPTY(&context, document->nodes)) {
@@ -1193,7 +1193,7 @@ yaml_document_get_root_node(yaml_document_t *document)
 
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
+        const yaml_char_t *tag, const yaml_char_t *value, int length,
         yaml_scalar_style_t style)
 {
     struct {
@@ -1216,7 +1216,7 @@ yaml_document_add_scalar(yaml_document_t *document,
     if (!tag_copy) goto error;
 
     if (length < 0) {
-        length = strlen((char *)value);
+        length = (int)strlen((char *)value);
     }
 
     if (!yaml_check_utf8(value, length)) goto error;
@@ -1228,7 +1228,7 @@ yaml_document_add_scalar(yaml_document_t *document,
     SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     yaml_free(tag_copy);
@@ -1243,7 +1243,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style)
+        const yaml_char_t *tag, yaml_sequence_style_t style)
 {
     struct {
         yaml_error_type_t error;
@@ -1273,7 +1273,7 @@ yaml_document_add_sequence(yaml_document_t *document,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     STACK_DEL(&context, items);
@@ -1288,7 +1288,7 @@ error:
 
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style)
+        const yaml_char_t *tag, yaml_mapping_style_t style)
 {
     struct {
         yaml_error_type_t error;
@@ -1318,7 +1318,7 @@ yaml_document_add_mapping(yaml_document_t *document,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    return (int)(document->nodes.top - document->nodes.start);
 
 error:
     STACK_DEL(&context, pairs);