From 229d804d94e5a7d9e4be7731e0995bcd6e618610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tina=20M=C3=BCller?= Date: Sun, 19 Apr 2020 13:19:43 +0200 Subject: 0.2.4 dist files --- CMakeLists.txt | 2 +- Changes | 9 +++++ Makefile.am | 12 +++++- Makefile.in | 12 +++++- configure | 26 ++++++------- configure.ac | 4 +- doc/html/annotated.html | 2 +- doc/html/classes.html | 2 +- doc/html/files.html | 2 +- doc/html/functions.html | 2 +- doc/html/functions_b.html | 2 +- doc/html/functions_c.html | 2 +- doc/html/functions_d.html | 2 +- doc/html/functions_e.html | 2 +- doc/html/functions_f.html | 2 +- doc/html/functions_h.html | 2 +- doc/html/functions_i.html | 2 +- doc/html/functions_k.html | 2 +- doc/html/functions_l.html | 2 +- doc/html/functions_m.html | 2 +- doc/html/functions_n.html | 2 +- doc/html/functions_o.html | 2 +- doc/html/functions_p.html | 2 +- doc/html/functions_q.html | 2 +- doc/html/functions_r.html | 2 +- doc/html/functions_s.html | 2 +- doc/html/functions_t.html | 2 +- doc/html/functions_u.html | 2 +- doc/html/functions_v.html | 2 +- doc/html/functions_vars.html | 2 +- doc/html/functions_vars_b.html | 2 +- doc/html/functions_vars_c.html | 2 +- doc/html/functions_vars_d.html | 2 +- doc/html/functions_vars_e.html | 2 +- doc/html/functions_vars_f.html | 2 +- doc/html/functions_vars_h.html | 2 +- doc/html/functions_vars_i.html | 2 +- doc/html/functions_vars_k.html | 2 +- doc/html/functions_vars_l.html | 2 +- doc/html/functions_vars_m.html | 2 +- doc/html/functions_vars_n.html | 2 +- doc/html/functions_vars_o.html | 2 +- doc/html/functions_vars_p.html | 2 +- doc/html/functions_vars_q.html | 2 +- doc/html/functions_vars_r.html | 2 +- doc/html/functions_vars_s.html | 2 +- doc/html/functions_vars_t.html | 2 +- doc/html/functions_vars_u.html | 2 +- doc/html/functions_vars_v.html | 2 +- doc/html/functions_vars_w.html | 2 +- doc/html/functions_w.html | 2 +- doc/html/globals.html | 2 +- doc/html/globals_defs.html | 2 +- doc/html/globals_enum.html | 2 +- doc/html/globals_eval.html | 2 +- doc/html/globals_func.html | 2 +- doc/html/globals_type.html | 2 +- doc/html/group__basic.html | 2 +- doc/html/group__emitter.html | 2 +- doc/html/group__events.html | 2 +- doc/html/group__export.html | 2 +- doc/html/group__nodes.html | 2 +- doc/html/group__parser.html | 2 +- doc/html/group__styles.html | 2 +- doc/html/group__tokens.html | 2 +- doc/html/group__version.html | 2 +- doc/html/index.html | 2 +- doc/html/modules.html | 2 +- doc/html/structyaml__alias__data__s.html | 2 +- doc/html/structyaml__anchors__s.html | 2 +- doc/html/structyaml__document__s.html | 2 +- doc/html/structyaml__emitter__s.html | 2 +- doc/html/structyaml__event__s.html | 2 +- doc/html/structyaml__mark__s.html | 2 +- doc/html/structyaml__node__pair__s.html | 2 +- doc/html/structyaml__node__s.html | 2 +- doc/html/structyaml__parser__s.html | 2 +- doc/html/structyaml__simple__key__s.html | 2 +- doc/html/structyaml__tag__directive__s.html | 2 +- doc/html/structyaml__token__s.html | 2 +- doc/html/structyaml__version__directive__s.html | 2 +- doc/html/yaml_8h.html | 2 +- src/emitter.c | 21 ++++++++--- tests/run-emitter-test-suite.c | 50 +++++++++++++++++++++---- 84 files changed, 180 insertions(+), 108 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72a7f12..a9d7d93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project (yaml C) set (YAML_VERSION_MAJOR 0) set (YAML_VERSION_MINOR 2) -set (YAML_VERSION_PATCH 3) +set (YAML_VERSION_PATCH 4) set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}") option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF) diff --git a/Changes b/Changes index a2b40d1..ae6f436 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,12 @@ +0.2.4 2020-04-19 + + - https://github.com/yaml/libyaml/pull/143 + Add packaging/docker-dist to Makefile.am + + - https://github.com/yaml/libyaml/pull/174 + Fix logic for document end before directive + + 0.2.3 2020-04-11 - https://github.com/yaml/libyaml/pull/130 diff --git a/Makefile.am b/Makefile.am index b21549a..95f2faa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ maintainer-clean-local: -find ${builddir} -name Makefile.in -exec rm -f '{}' ';' distclean-local: - rm -fr tests/run-test-suite + rm -fr tests/run-test-suite packaging -git worktree prune .PHONY: bootstrap @@ -34,3 +34,13 @@ tests/run-test-suite: -git branch --track run-test-suite origin/run-test-suite -git worktree prune git worktree add $@ run-test-suite + +packaging: + -git branch --track $@ origin/$@ + git worktree add --force $@ $@ + +docker-dist: packaging + make -C $. # @@ -589,8 +589,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='yaml' PACKAGE_TARNAME='yaml' -PACKAGE_VERSION='0.2.3' -PACKAGE_STRING='yaml 0.2.3' +PACKAGE_VERSION='0.2.4' +PACKAGE_STRING='yaml 0.2.4' PACKAGE_BUGREPORT='https://github.com/yaml/libyaml/issues/new' PACKAGE_URL='' @@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yaml 0.2.3 to adapt to many kinds of systems. +\`configure' configures yaml 0.2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1400,7 +1400,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yaml 0.2.3:";; + short | recursive ) echo "Configuration of yaml 0.2.4:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yaml configure 0.2.3 +yaml configure 0.2.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1933,7 +1933,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yaml $as_me 0.2.3, which was +It was created by yaml $as_me 0.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2798,7 +2798,7 @@ fi # Define the identity of the package. PACKAGE='yaml' - VERSION='0.2.3' + VERSION='0.2.4' cat >>confdefs.h <<_ACEOF @@ -2900,16 +2900,16 @@ $as_echo "#define YAML_VERSION_MAJOR 0" >>confdefs.h $as_echo "#define YAML_VERSION_MINOR 2" >>confdefs.h -$as_echo "#define YAML_VERSION_PATCH 3" >>confdefs.h +$as_echo "#define YAML_VERSION_PATCH 4" >>confdefs.h -$as_echo "#define YAML_VERSION_STRING \"0.2.3\"" >>confdefs.h +$as_echo "#define YAML_VERSION_STRING \"0.2.4\"" >>confdefs.h # Define substitutions for the libtool version numbers. YAML_LT_RELEASE=0 YAML_LT_CURRENT=2 -YAML_LT_REVISION=7 +YAML_LT_REVISION=8 YAML_LT_AGE=0 @@ -12878,7 +12878,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yaml $as_me 0.2.3, which was +This file was extended by yaml $as_me 0.2.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12944,7 +12944,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yaml config.status 0.2.3 +yaml config.status 0.2.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f64ba13..818fdac 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # Define the package version numbers and the bug reporting link. m4_define([YAML_MAJOR], 0) m4_define([YAML_MINOR], 2) -m4_define([YAML_PATCH], 3) +m4_define([YAML_PATCH], 4) m4_define([YAML_BUGS], [https://github.com/yaml/libyaml/issues/new]) # Define the libtool version numbers; check the Autobook, Section 11.4. @@ -19,7 +19,7 @@ m4_define([YAML_BUGS], [https://github.com/yaml/libyaml/issues/new]) # YAML_AGE = 0 m4_define([YAML_RELEASE], 0) m4_define([YAML_CURRENT], 2) -m4_define([YAML_REVISION], 7) +m4_define([YAML_REVISION], 8) m4_define([YAML_AGE], 0) # Initialize autoconf & automake. diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 8a176c8..a98f877 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/classes.html b/doc/html/classes.html index 8cd858b..95a0e94 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/files.html b/doc/html/files.html index f581d71..e71c946 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions.html b/doc/html/functions.html index 4329dcf..3ad4de8 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_b.html b/doc/html/functions_b.html index 38631ae..0fadd37 100644 --- a/doc/html/functions_b.html +++ b/doc/html/functions_b.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_c.html b/doc/html/functions_c.html index b3bcfb4..eae0b7c 100644 --- a/doc/html/functions_c.html +++ b/doc/html/functions_c.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_d.html b/doc/html/functions_d.html index a70d9c7..3b783b1 100644 --- a/doc/html/functions_d.html +++ b/doc/html/functions_d.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_e.html b/doc/html/functions_e.html index 97367ef..cfded6e 100644 --- a/doc/html/functions_e.html +++ b/doc/html/functions_e.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_f.html b/doc/html/functions_f.html index 3f0bc25..271a968 100644 --- a/doc/html/functions_f.html +++ b/doc/html/functions_f.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_h.html b/doc/html/functions_h.html index 8f7af92..89b374a 100644 --- a/doc/html/functions_h.html +++ b/doc/html/functions_h.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_i.html b/doc/html/functions_i.html index 8495797..8e0f5a6 100644 --- a/doc/html/functions_i.html +++ b/doc/html/functions_i.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_k.html b/doc/html/functions_k.html index 100d18c..9199015 100644 --- a/doc/html/functions_k.html +++ b/doc/html/functions_k.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_l.html b/doc/html/functions_l.html index 8825345..51225e0 100644 --- a/doc/html/functions_l.html +++ b/doc/html/functions_l.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_m.html b/doc/html/functions_m.html index 1816c95..e305f1c 100644 --- a/doc/html/functions_m.html +++ b/doc/html/functions_m.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_n.html b/doc/html/functions_n.html index afc6e92..2997e9d 100644 --- a/doc/html/functions_n.html +++ b/doc/html/functions_n.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_o.html b/doc/html/functions_o.html index 8f964ba..f0b70e2 100644 --- a/doc/html/functions_o.html +++ b/doc/html/functions_o.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_p.html b/doc/html/functions_p.html index b31ad79..521bf3b 100644 --- a/doc/html/functions_p.html +++ b/doc/html/functions_p.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_q.html b/doc/html/functions_q.html index 002ab5d..05a064b 100644 --- a/doc/html/functions_q.html +++ b/doc/html/functions_q.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_r.html b/doc/html/functions_r.html index cac7c0d..33e26c3 100644 --- a/doc/html/functions_r.html +++ b/doc/html/functions_r.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_s.html b/doc/html/functions_s.html index 0c9a507..0af28a3 100644 --- a/doc/html/functions_s.html +++ b/doc/html/functions_s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_t.html b/doc/html/functions_t.html index dab3165..92cfce0 100644 --- a/doc/html/functions_t.html +++ b/doc/html/functions_t.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_u.html b/doc/html/functions_u.html index 890db1f..f7ecd96 100644 --- a/doc/html/functions_u.html +++ b/doc/html/functions_u.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_v.html b/doc/html/functions_v.html index 0ad9bc8..9a2f4a3 100644 --- a/doc/html/functions_v.html +++ b/doc/html/functions_v.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index a9554b6..3a16746 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_b.html b/doc/html/functions_vars_b.html index 21d923b..f5179f7 100644 --- a/doc/html/functions_vars_b.html +++ b/doc/html/functions_vars_b.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_c.html b/doc/html/functions_vars_c.html index c752fb0..6d3c303 100644 --- a/doc/html/functions_vars_c.html +++ b/doc/html/functions_vars_c.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_d.html b/doc/html/functions_vars_d.html index fc2ca31..e13ac18 100644 --- a/doc/html/functions_vars_d.html +++ b/doc/html/functions_vars_d.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_e.html b/doc/html/functions_vars_e.html index 678df48..d743277 100644 --- a/doc/html/functions_vars_e.html +++ b/doc/html/functions_vars_e.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_f.html b/doc/html/functions_vars_f.html index 7dd1679..e70cd25 100644 --- a/doc/html/functions_vars_f.html +++ b/doc/html/functions_vars_f.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_h.html b/doc/html/functions_vars_h.html index 9ec80f1..b73ce52 100644 --- a/doc/html/functions_vars_h.html +++ b/doc/html/functions_vars_h.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_i.html b/doc/html/functions_vars_i.html index 044461b..18ee374 100644 --- a/doc/html/functions_vars_i.html +++ b/doc/html/functions_vars_i.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_k.html b/doc/html/functions_vars_k.html index 053e9a7..712a02c 100644 --- a/doc/html/functions_vars_k.html +++ b/doc/html/functions_vars_k.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_l.html b/doc/html/functions_vars_l.html index a67249d..87c3942 100644 --- a/doc/html/functions_vars_l.html +++ b/doc/html/functions_vars_l.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_m.html b/doc/html/functions_vars_m.html index 49c7c9d..bc39ac8 100644 --- a/doc/html/functions_vars_m.html +++ b/doc/html/functions_vars_m.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_n.html b/doc/html/functions_vars_n.html index b39b5d1..bbcf103 100644 --- a/doc/html/functions_vars_n.html +++ b/doc/html/functions_vars_n.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_o.html b/doc/html/functions_vars_o.html index 5a13b36..9af89d5 100644 --- a/doc/html/functions_vars_o.html +++ b/doc/html/functions_vars_o.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_p.html b/doc/html/functions_vars_p.html index bcfe6d0..489e5d1 100644 --- a/doc/html/functions_vars_p.html +++ b/doc/html/functions_vars_p.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_q.html b/doc/html/functions_vars_q.html index ecc6486..6e5e2b9 100644 --- a/doc/html/functions_vars_q.html +++ b/doc/html/functions_vars_q.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_r.html b/doc/html/functions_vars_r.html index 1656abf..f823d03 100644 --- a/doc/html/functions_vars_r.html +++ b/doc/html/functions_vars_r.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_s.html b/doc/html/functions_vars_s.html index c3ef2f1..9cddeff 100644 --- a/doc/html/functions_vars_s.html +++ b/doc/html/functions_vars_s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_t.html b/doc/html/functions_vars_t.html index 3ecbabb..e6bed7a 100644 --- a/doc/html/functions_vars_t.html +++ b/doc/html/functions_vars_t.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_u.html b/doc/html/functions_vars_u.html index cef11e6..366b31b 100644 --- a/doc/html/functions_vars_u.html +++ b/doc/html/functions_vars_u.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_v.html b/doc/html/functions_vars_v.html index ed87851..83582e7 100644 --- a/doc/html/functions_vars_v.html +++ b/doc/html/functions_vars_v.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_vars_w.html b/doc/html/functions_vars_w.html index 211c19e..b2afead 100644 --- a/doc/html/functions_vars_w.html +++ b/doc/html/functions_vars_w.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/functions_w.html b/doc/html/functions_w.html index 6b04daf..0c6be7d 100644 --- a/doc/html/functions_w.html +++ b/doc/html/functions_w.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals.html b/doc/html/globals.html index 5ed2e30..05ad65e 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals_defs.html b/doc/html/globals_defs.html index 2d98502..66f7a6c 100644 --- a/doc/html/globals_defs.html +++ b/doc/html/globals_defs.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals_enum.html b/doc/html/globals_enum.html index c4899e4..6de20ba 100644 --- a/doc/html/globals_enum.html +++ b/doc/html/globals_enum.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals_eval.html b/doc/html/globals_eval.html index 2821b40..2224d71 100644 --- a/doc/html/globals_eval.html +++ b/doc/html/globals_eval.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals_func.html b/doc/html/globals_func.html index 7c91cf0..e4075c3 100644 --- a/doc/html/globals_func.html +++ b/doc/html/globals_func.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/globals_type.html b/doc/html/globals_type.html index 6f67cb3..c52f27a 100644 --- a/doc/html/globals_type.html +++ b/doc/html/globals_type.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__basic.html b/doc/html/group__basic.html index 86221b9..4129a78 100644 --- a/doc/html/group__basic.html +++ b/doc/html/group__basic.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__emitter.html b/doc/html/group__emitter.html index 5cc0c94..40f5dd7 100644 --- a/doc/html/group__emitter.html +++ b/doc/html/group__emitter.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__events.html b/doc/html/group__events.html index dae9b59..76ddae7 100644 --- a/doc/html/group__events.html +++ b/doc/html/group__events.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__export.html b/doc/html/group__export.html index 876da57..28748ea 100644 --- a/doc/html/group__export.html +++ b/doc/html/group__export.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__nodes.html b/doc/html/group__nodes.html index 01d0d24..3b0d46d 100644 --- a/doc/html/group__nodes.html +++ b/doc/html/group__nodes.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__parser.html b/doc/html/group__parser.html index 594821b..02f0088 100644 --- a/doc/html/group__parser.html +++ b/doc/html/group__parser.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__styles.html b/doc/html/group__styles.html index df26271..a33b8c7 100644 --- a/doc/html/group__styles.html +++ b/doc/html/group__styles.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__tokens.html b/doc/html/group__tokens.html index 162a4cf..01654ac 100644 --- a/doc/html/group__tokens.html +++ b/doc/html/group__tokens.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/group__version.html b/doc/html/group__version.html index a97edb5..f8cd530 100644 --- a/doc/html/group__version.html +++ b/doc/html/group__version.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/index.html b/doc/html/index.html index d183a14..8b5f82d 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/modules.html b/doc/html/modules.html index 711c59f..21d5548 100644 --- a/doc/html/modules.html +++ b/doc/html/modules.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__alias__data__s.html b/doc/html/structyaml__alias__data__s.html index d2cd672..b980789 100644 --- a/doc/html/structyaml__alias__data__s.html +++ b/doc/html/structyaml__alias__data__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__anchors__s.html b/doc/html/structyaml__anchors__s.html index 3d20df5..5b1fce7 100644 --- a/doc/html/structyaml__anchors__s.html +++ b/doc/html/structyaml__anchors__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__document__s.html b/doc/html/structyaml__document__s.html index 6d11f31..ea69e22 100644 --- a/doc/html/structyaml__document__s.html +++ b/doc/html/structyaml__document__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__emitter__s.html b/doc/html/structyaml__emitter__s.html index c290f23..461e1b8 100644 --- a/doc/html/structyaml__emitter__s.html +++ b/doc/html/structyaml__emitter__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__event__s.html b/doc/html/structyaml__event__s.html index 8105489..9799cc1 100644 --- a/doc/html/structyaml__event__s.html +++ b/doc/html/structyaml__event__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__mark__s.html b/doc/html/structyaml__mark__s.html index 0615e98..622d6e0 100644 --- a/doc/html/structyaml__mark__s.html +++ b/doc/html/structyaml__mark__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__node__pair__s.html b/doc/html/structyaml__node__pair__s.html index a8c4158..b6d66cc 100644 --- a/doc/html/structyaml__node__pair__s.html +++ b/doc/html/structyaml__node__pair__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__node__s.html b/doc/html/structyaml__node__s.html index 91785fe..71a6ad6 100644 --- a/doc/html/structyaml__node__s.html +++ b/doc/html/structyaml__node__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__parser__s.html b/doc/html/structyaml__parser__s.html index 2dfffc2..5063d65 100644 --- a/doc/html/structyaml__parser__s.html +++ b/doc/html/structyaml__parser__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__simple__key__s.html b/doc/html/structyaml__simple__key__s.html index 440e3d3..0dfaa6d 100644 --- a/doc/html/structyaml__simple__key__s.html +++ b/doc/html/structyaml__simple__key__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__tag__directive__s.html b/doc/html/structyaml__tag__directive__s.html index 984ba79..1aa6054 100644 --- a/doc/html/structyaml__tag__directive__s.html +++ b/doc/html/structyaml__tag__directive__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__token__s.html b/doc/html/structyaml__token__s.html index 2f8a5ed..08e0692 100644 --- a/doc/html/structyaml__token__s.html +++ b/doc/html/structyaml__token__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/structyaml__version__directive__s.html b/doc/html/structyaml__version__directive__s.html index e63fadf..383ab48 100644 --- a/doc/html/structyaml__version__directive__s.html +++ b/doc/html/structyaml__version__directive__s.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/doc/html/yaml_8h.html b/doc/html/yaml_8h.html index bf358bf..1e4a9fb 100644 --- a/doc/html/yaml_8h.html +++ b/doc/html/yaml_8h.html @@ -19,7 +19,7 @@
yaml -  0.2.3 +  0.2.4
diff --git a/src/emitter.c b/src/emitter.c index a22c6b1..7dd8331 100644 --- a/src/emitter.c +++ b/src/emitter.c @@ -495,6 +495,7 @@ static int yaml_emitter_emit_stream_start(yaml_emitter_t *emitter, yaml_event_t *event) { + emitter->open_ended = 0; if (event->type == YAML_STREAM_START_EVENT) { if (!emitter->encoding) { @@ -594,17 +595,23 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, { if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) return 0; - emitter->open_ended = 0; if (!yaml_emitter_write_indent(emitter)) return 0; } + emitter->open_ended = 0; if (event->data.document_start.version_directive) { implicit = 0; if (!yaml_emitter_write_indicator(emitter, "%YAML", 1, 0, 0)) return 0; - if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0)) - return 0; + if (event->data.document_start.version_directive->minor == 1) { + if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0)) + return 0; + } + else { + if (!yaml_emitter_write_indicator(emitter, "1.2", 1, 0, 0)) + return 0; + } if (!yaml_emitter_write_indent(emitter)) return 0; } @@ -656,7 +663,7 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, * This can happen if a block scalar with trailing empty lines * is at the end of the stream */ - if (emitter->open_ended) + if (emitter->open_ended == 2) { if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) return 0; @@ -709,6 +716,8 @@ yaml_emitter_emit_document_end(yaml_emitter_t *emitter, if (!yaml_emitter_write_indent(emitter)) return 0; } + else if (!emitter->open_ended) + emitter->open_ended = 1; if (!yaml_emitter_flush(emitter)) return 0; @@ -2216,7 +2225,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter, else if (string.start == string.pointer) { chomp_hint = "+"; - emitter->open_ended = 1; + emitter->open_ended = 2; } else { @@ -2226,7 +2235,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter, if (IS_BREAK(string)) { chomp_hint = "+"; - emitter->open_ended = 1; + emitter->open_ended = 2; } } } diff --git a/tests/run-emitter-test-suite.c b/tests/run-emitter-test-suite.c index f24bb09..9730b2b 100644 --- a/tests/run-emitter-test-suite.c +++ b/tests/run-emitter-test-suite.c @@ -3,30 +3,58 @@ #include #include #include +#include "../src/yaml_private.h" int get_line(FILE * input, char *line); char *get_anchor(char sigil, char *line, char *anchor); char *get_tag(char *line, char *tag); void get_value(char *line, char *value, int *style); +int usage(int ret); int main(int argc, char *argv[]) { FILE *input; yaml_emitter_t emitter; yaml_event_t event; + yaml_version_directive_t *version_directive = NULL; int canonical = 0; int unicode = 0; char line[1024]; + int foundfile = 0; + int i = 0; + int minor = 0; + + for (i = 1; i < argc; i++) { + if (strncmp(argv[i], "--help", 6) == 0) + return usage(0); + if (strncmp(argv[i], "-h", 2) == 0) + return usage(0); + if (strncmp(argv[i], "--directive", 11) == 0) { + if (i+1 == argc) + return usage(1); + i++; + if (strncmp(argv[i], "1.1", 3) == 0) + minor = 1; + else if (strncmp(argv[i], "1.2", 3) == 0) + minor = 2; + else + return usage(1); + } + else if (!foundfile) { + input = fopen(argv[i], "rb"); + foundfile = 1; + } - if (argc == 1) - input = stdin; - else if (argc == 2) - input = fopen(argv[1], "rb"); - else { - fprintf(stderr, "Usage: libyaml-emitter []\n"); - return 1; } + if (minor) { + version_directive = YAML_MALLOC_STATIC(yaml_version_directive_t); + version_directive->major = 1; + version_directive->minor = minor; + } + if (!foundfile) + input = stdin; + assert(input); if (!yaml_emitter_initialize(&emitter)) { @@ -37,6 +65,7 @@ int main(int argc, char *argv[]) yaml_emitter_set_canonical(&emitter, canonical); yaml_emitter_set_unicode(&emitter, unicode); + while (get_line(input, line)) { int ok; char anchor[256]; @@ -51,7 +80,7 @@ int main(int argc, char *argv[]) } else if (strncmp(line, "+DOC", 4) == 0) { implicit = strncmp(line, "+DOC ---", 8) != 0; - ok = yaml_document_start_event_initialize(&event, NULL, NULL, NULL, implicit); + ok = yaml_document_start_event_initialize(&event, version_directive, NULL, NULL, implicit); } else if (strncmp(line, "-DOC", 4) == 0) { implicit = strncmp(line, "-DOC ...", 8) != 0; @@ -229,3 +258,8 @@ void get_value(char *line, char *value, int *style) } value[i] = '\0'; } + +int usage(int ret) { + fprintf(stderr, "Usage: run-emitter-test-suite [--directive (1.1|1.2)] []\n"); + return ret; +} -- cgit v1.2.1