diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 15:30:03 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 15:30:03 +0000 |
commit | f16590ba1de60b8834d46a4979d4a60894fceef4 (patch) | |
tree | 9b8277f6f58be4392f3d1681fb669f1b9a986d58 /ext | |
parent | 5974191113ade01641a3799192f5cb0f12fe1e9d (diff) |
* ext/psych/yaml: update libyaml to 0.1.7.
* ext/psych/psych.gemspec: bump version to 2.1.0.1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/psych/psych.gemspec | 2 | ||||
-rw-r--r-- | ext/psych/yaml/api.c | 57 | ||||
-rw-r--r-- | ext/psych/yaml/config.h | 12 | ||||
-rw-r--r-- | ext/psych/yaml/emitter.c | 16 | ||||
-rw-r--r-- | ext/psych/yaml/loader.c | 21 | ||||
-rw-r--r-- | ext/psych/yaml/parser.c | 12 | ||||
-rw-r--r-- | ext/psych/yaml/scanner.c | 12 | ||||
-rw-r--r-- | ext/psych/yaml/yaml_private.h | 4 |
8 files changed, 50 insertions, 86 deletions
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec index 11e22d7a18..c50ce592a9 100644 --- a/ext/psych/psych.gemspec +++ b/ext/psych/psych.gemspec @@ -4,7 +4,7 @@ Gem::Specification.new do |s| s.name = "psych" - s.version = "2.1.0" + s.version = "2.1.0.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.require_paths = ["lib"] diff --git a/ext/psych/yaml/api.c b/ext/psych/yaml/api.c index e0b9d979cc..b1a8da0bda 100644 --- a/ext/psych/yaml/api.c +++ b/ext/psych/yaml/api.c @@ -395,7 +395,7 @@ yaml_emitter_delete(yaml_emitter_t *emitter) } QUEUE_DEL(emitter, emitter->events); STACK_DEL(emitter, emitter->indents); - while (!STACK_EMPTY(emitter, emitter->tag_directives)) { + while (!STACK_EMPTY(empty, emitter->tag_directives)) { yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives); yaml_free(tag_directive.handle); yaml_free(tag_directive.prefix); @@ -415,7 +415,7 @@ yaml_string_write_handler(void *data, unsigned char *buffer, size_t size) { yaml_emitter_t *emitter = data; - if (emitter->output.string.size + *emitter->output.string.size_written + if (emitter->output.string.size - *emitter->output.string.size_written < size) { memcpy(emitter->output.string.buffer + *emitter->output.string.size_written, @@ -822,7 +822,6 @@ yaml_scalar_event_initialize(yaml_event_t *event, yaml_char_t *anchor_copy = NULL; yaml_char_t *tag_copy = NULL; yaml_char_t *value_copy = NULL; - size_t value_length; assert(event); /* Non-NULL event object is expected. */ assert(value); /* Non-NULL anchor is expected. */ @@ -840,19 +839,16 @@ yaml_scalar_event_initialize(yaml_event_t *event, } if (length < 0) { - value_length = strlen((char *)value); - } - else { - value_length = (size_t)length; + length = strlen((char *)value); } - if (!yaml_check_utf8(value, value_length)) goto error; - value_copy = yaml_malloc(value_length+1); + if (!yaml_check_utf8(value, length)) goto error; + value_copy = yaml_malloc(length+1); if (!value_copy) goto error; - memcpy(value_copy, value, value_length); - value_copy[value_length] = '\0'; + memcpy(value_copy, value, length); + value_copy[length] = '\0'; - SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, value_length, + SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, length, plain_implicit, quoted_implicit, style, mark, mark); return 1; @@ -1206,8 +1202,6 @@ yaml_document_add_scalar(yaml_document_t *document, yaml_char_t *tag_copy = NULL; yaml_char_t *value_copy = NULL; yaml_node_t node; - size_t value_length; - ptrdiff_t ret; assert(document); /* Non-NULL document object is expected. */ assert(value); /* Non-NULL value is expected. */ @@ -1221,26 +1215,19 @@ yaml_document_add_scalar(yaml_document_t *document, if (!tag_copy) goto error; if (length < 0) { - value_length = strlen((char *)value); - } - else { - value_length = (size_t)length; + length = strlen((char *)value); } - if (!yaml_check_utf8(value, value_length)) goto error; - value_copy = yaml_malloc(value_length+1); + if (!yaml_check_utf8(value, length)) goto error; + value_copy = yaml_malloc(length+1); if (!value_copy) goto error; - memcpy(value_copy, value, value_length); - value_copy[value_length] = '\0'; + memcpy(value_copy, value, length); + value_copy[length] = '\0'; - SCALAR_NODE_INIT(node, tag_copy, value_copy, value_length, style, mark, mark); + SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark); if (!PUSH(&context, document->nodes, node)) goto error; - ret = document->nodes.top - document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (ret > INT_MAX) goto error; -#endif - return (int)ret; + return document->nodes.top - document->nodes.start; error: yaml_free(tag_copy); @@ -1268,7 +1255,6 @@ yaml_document_add_sequence(yaml_document_t *document, yaml_node_item_t *top; } items = { NULL, NULL, NULL }; yaml_node_t node; - ptrdiff_t ret; assert(document); /* Non-NULL document object is expected. */ @@ -1286,11 +1272,7 @@ yaml_document_add_sequence(yaml_document_t *document, style, mark, mark); if (!PUSH(&context, document->nodes, node)) goto error; - ret = document->nodes.top - document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (ret > INT_MAX) goto error; -#endif - return (int)ret; + return document->nodes.top - document->nodes.start; error: STACK_DEL(&context, items); @@ -1318,7 +1300,6 @@ yaml_document_add_mapping(yaml_document_t *document, yaml_node_pair_t *top; } pairs = { NULL, NULL, NULL }; yaml_node_t node; - ptrdiff_t ret; assert(document); /* Non-NULL document object is expected. */ @@ -1336,11 +1317,7 @@ yaml_document_add_mapping(yaml_document_t *document, style, mark, mark); if (!PUSH(&context, document->nodes, node)) goto error; - ret = document->nodes.top - document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (ret > INT_MAX) goto error; -#endif - return (int)ret; + return document->nodes.top - document->nodes.start; error: STACK_DEL(&context, pairs); diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h index f54c27d339..79e8501f4f 100644 --- a/ext/psych/yaml/config.h +++ b/ext/psych/yaml/config.h @@ -1,10 +1,10 @@ #define PACKAGE_NAME "yaml" #define PACKAGE_TARNAME "yaml" -#define PACKAGE_VERSION "0.1.6" -#define PACKAGE_STRING "yaml 0.1.6" -#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml" -#define PACKAGE_URL "" +#define PACKAGE_VERSION "0.1.7" +#define PACKAGE_STRING "yaml 0.1.7" +#define PACKAGE_BUGREPORT "https://github.com/yaml/libyaml/issues" +#define PACKAGE_URL "https://github.com/yaml/libyaml" #define YAML_VERSION_MAJOR 0 #define YAML_VERSION_MINOR 1 -#define YAML_VERSION_PATCH 6 -#define YAML_VERSION_STRING "0.1.6" +#define YAML_VERSION_PATCH 7 +#define YAML_VERSION_STRING "0.1.7" diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c index bf84fafc51..5adcbdeb32 100644 --- a/ext/psych/yaml/emitter.c +++ b/ext/psych/yaml/emitter.c @@ -53,7 +53,7 @@ #define WRITE_BREAK(emitter,string) \ (FLUSH(emitter) \ && (CHECK(string,'\n') ? \ - ((void)PUT_BREAK(emitter), \ + (PUT_BREAK(emitter), \ string.pointer ++, \ 1) : \ (COPY(emitter->buffer,string), \ @@ -221,7 +221,7 @@ yaml_emitter_write_indent(yaml_emitter_t *emitter); static int yaml_emitter_write_indicator(yaml_emitter_t *emitter, - const char *indicator, int need_whitespace, + char *indicator, int need_whitespace, int is_whitespace, int is_indention); static int @@ -1493,7 +1493,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, int break_space = 0; int space_break = 0; - int preceeded_by_whitespace = 0; + int preceded_by_whitespace = 0; int followed_by_whitespace = 0; int previous_space = 0; int previous_break = 0; @@ -1524,7 +1524,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, flow_indicators = 1; } - preceeded_by_whitespace = 1; + preceded_by_whitespace = 1; followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string)); while (string.pointer != string.end) @@ -1570,7 +1570,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, } } - if (CHECK(string, '#') && preceeded_by_whitespace) { + if (CHECK(string, '#') && preceded_by_whitespace) { flow_indicators = 1; block_indicators = 1; } @@ -1619,7 +1619,7 @@ yaml_emitter_analyze_scalar(yaml_emitter_t *emitter, previous_break = 0; } - preceeded_by_whitespace = IS_BLANKZ(string); + preceded_by_whitespace = IS_BLANKZ(string); MOVE(string); if (string.pointer != string.end) { followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string)); @@ -1784,7 +1784,7 @@ yaml_emitter_write_indent(yaml_emitter_t *emitter) static int yaml_emitter_write_indicator(yaml_emitter_t *emitter, - const char *indicator, int need_whitespace, + char *indicator, int need_whitespace, int is_whitespace, int is_indention) { size_t indicator_length; @@ -2178,7 +2178,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter, yaml_string_t string) { char indent_hint[2]; - const char *chomp_hint = NULL; + char *chomp_hint = NULL; if (IS_SPACE(string) || IS_BREAK(string)) { diff --git a/ext/psych/yaml/loader.c b/ext/psych/yaml/loader.c index def67933e7..3ba99f087e 100644 --- a/ext/psych/yaml/loader.c +++ b/ext/psych/yaml/loader.c @@ -283,7 +283,6 @@ static int yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event) { yaml_node_t node; - ptrdiff_t node_index; int index; yaml_char_t *tag = first_event->data.scalar.tag; @@ -301,11 +300,7 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event) if (!PUSH(parser, parser->document->nodes, node)) goto error; - node_index = parser->document->nodes.top - parser->document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (node_index > INT_MAX) goto error; -#endif - index = (int)node_index; + index = parser->document->nodes.top - parser->document->nodes.start; if (!yaml_parser_register_anchor(parser, index, first_event->data.scalar.anchor)) return 0; @@ -334,7 +329,6 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event) yaml_node_item_t *top; } items = { NULL, NULL, NULL }; int index, item_index; - ptrdiff_t node_index; yaml_char_t *tag = first_event->data.sequence_start.tag; if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error; @@ -353,11 +347,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event) if (!PUSH(parser, parser->document->nodes, node)) goto error; - node_index = parser->document->nodes.top - parser->document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (node_index > INT_MAX) goto error; -#endif - index = (int)node_index; + index = parser->document->nodes.top - parser->document->nodes.start; if (!yaml_parser_register_anchor(parser, index, first_event->data.sequence_start.anchor)) return 0; @@ -401,7 +391,6 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event) yaml_node_pair_t *top; } pairs = { NULL, NULL, NULL }; int index; - ptrdiff_t node_index; yaml_node_pair_t pair; yaml_char_t *tag = first_event->data.mapping_start.tag; @@ -421,11 +410,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event) if (!PUSH(parser, parser->document->nodes, node)) goto error; - node_index = parser->document->nodes.top - parser->document->nodes.start; -#if PTRDIFF_MAX > INT_MAX - if (node_index > INT_MAX) goto error; -#endif - index = (int)node_index; + index = parser->document->nodes.top - parser->document->nodes.start; if (!yaml_parser_register_anchor(parser, index, first_event->data.mapping_start.anchor)) return 0; diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c index 32671b252c..dc5430b09f 100644 --- a/ext/psych/yaml/parser.c +++ b/ext/psych/yaml/parser.c @@ -759,8 +759,9 @@ yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser, else if (token->type == YAML_BLOCK_END_TOKEN) { + yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */ parser->state = POP(parser, parser->states); - (void)POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -868,8 +869,9 @@ yaml_parser_parse_block_mapping_key(yaml_parser_t *parser, else if (token->type == YAML_BLOCK_END_TOKEN) { + yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */ parser->state = POP(parser, parser->states); - (void)POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -950,6 +952,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser, yaml_event_t *event, int first) { yaml_token_t *token; + yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */ if (first) { token = PEEK_TOKEN(parser); @@ -994,7 +997,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser, } parser->state = POP(parser, parser->states); - (void)POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; @@ -1101,6 +1104,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser, yaml_event_t *event, int first) { yaml_token_t *token; + yaml_mark_t dummy_mark; /* Used to eliminate a compiler warning. */ if (first) { token = PEEK_TOKEN(parser); @@ -1154,7 +1158,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser, } parser->state = POP(parser, parser->states); - (void)POP(parser, parser->marks); + dummy_mark = POP(parser, parser->marks); MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark); SKIP_TOKEN(parser); return 1; diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c index 5e4875d7f9..3ef90dc66b 100644 --- a/ext/psych/yaml/scanner.c +++ b/ext/psych/yaml/scanner.c @@ -1186,9 +1186,11 @@ yaml_parser_increase_flow_level(yaml_parser_t *parser) static int yaml_parser_decrease_flow_level(yaml_parser_t *parser) { + yaml_simple_key_t dummy_key; /* Used to eliminate a compiler warning. */ + if (parser->flow_level) { parser->flow_level --; - (void)POP(parser, parser->simple_keys); + dummy_key = POP(parser, parser->simple_keys); } return 1; @@ -1222,14 +1224,12 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column, if (!PUSH(parser, parser->indents, parser->indent)) return 0; -#if PTRDIFF_MAX > INT_MAX if (column > INT_MAX) { parser->error = YAML_MEMORY_ERROR; return 0; } -#endif - parser->indent = (int)column; + parser->indent = column; /* Create a token and insert it into the queue. */ @@ -3504,12 +3504,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token) { if (IS_BLANK(parser->buffer)) { - /* Check for tab character that abuse indentation. */ + /* Check for tab characters that abuse indentation. */ if (leading_blanks && (int)parser->mark.column < indent && IS_TAB(parser->buffer)) { yaml_parser_set_scanner_error(parser, "while scanning a plain scalar", - start_mark, "found a tab character that violate indentation"); + start_mark, "found a tab character that violates indentation"); goto error; } diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h index 944499c94e..ce262d3086 100644 --- a/ext/psych/yaml/yaml_private.h +++ b/ext/psych/yaml/yaml_private.h @@ -436,8 +436,7 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end); (stack).start = (stack).top = (stack).end = 0) #define STACK_EMPTY(context,stack) \ - ((void)(context), \ - ((stack).start == (stack).top)) + ((stack).start == (stack).top) #define STACK_LIMIT(context,stack,size) \ ((stack).top - (stack).start < (size) ? \ @@ -661,4 +660,3 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end); (node).data.mapping.pairs.end = (node_pairs_end), \ (node).data.mapping.pairs.top = (node_pairs_start), \ (node).data.mapping.style = (node_style)) - |