if (simple_key->required) {
return yaml_parser_set_scanner_error(parser,
"while scanning a simple key", simple_key->mark,
- "could not found expected ':'");
+ "could not find expected ':'");
}
simple_key->possible = 0;
*/
int required = (!parser->flow_level
- && parser->indent == parser->mark.column);
+ && parser->indent == (int)parser->mark.column);
/*
* A simple key is required only when it is the first token in the current
if (parser->simple_key_allowed)
{
- yaml_simple_key_t simple_key = { 1, required,
- parser->tokens_parsed + parser->tokens.tail - parser->tokens.head,
- parser->mark };
+ yaml_simple_key_t simple_key;
+ simple_key.possible = 1;
+ simple_key.required = required;
+ simple_key.token_number =
+ parser->tokens_parsed + parser->tokens.tail - parser->tokens.head;
+ simple_key.mark = parser->mark;
if (!yaml_parser_remove_simple_key(parser)) return 0;
if (simple_key->required) {
return yaml_parser_set_scanner_error(parser,
"while scanning a simple key", simple_key->mark,
- "could not found expected ':'");
+ "could not find expected ':'");
}
}
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 --;
- POP(parser, parser->simple_keys);
+ dummy_key = POP(parser, parser->simple_keys);
}
return 1;
if (!IS_BREAKZ(parser->buffer)) {
yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "did not found expected comment or line break");
+ start_mark, "did not find expected comment or line break");
goto error;
}
if (string.start == string.pointer) {
yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "cannot found expected directive name");
+ start_mark, "could not find expected directive name");
goto error;
}
if (!IS_BLANKZ(parser->buffer)) {
yaml_parser_set_scanner_error(parser, "while scanning a tag",
- start_mark, "did not found expected whitespace or line break");
+ start_mark, "did not find expected whitespace or line break");
goto error;
}
/* Resize the string to include the head. */
- while (string.end - string.start <= length) {
+ while (string.end - string.start <= (int)length) {
if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
parser->error = YAML_MEMORY_ERROR;
goto error;
if (!IS_BREAKZ(parser->buffer)) {
yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
- start_mark, "did not found expected comment or line break");
+ start_mark, "did not find expected comment or line break");
goto error;
}
if (!CACHE(parser, 1)) goto error;
- while (parser->mark.column == indent && !IS_Z(parser->buffer))
+ while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
{
/*
* We are at the beginning of a non-empty line.
if (!CACHE(parser, 1)) return 0;
- while ((!*indent || parser->mark.column < *indent)
+ while ((!*indent || (int)parser->mark.column < *indent)
&& IS_SPACE(parser->buffer)) {
SKIP(parser);
if (!CACHE(parser, 1)) return 0;
}
- if (parser->mark.column > max_indent)
- max_indent = parser->mark.column;
+ if ((int)parser->mark.column > max_indent)
+ max_indent = (int)parser->mark.column;
/* Check for a tab character messing the intendation. */
- if ((!*indent || parser->mark.column < *indent)
+ if ((!*indent || (int)parser->mark.column < *indent)
&& IS_TAB(parser->buffer)) {
return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
start_mark, "found a tab character where an intendation space is expected");
else if (!single && CHECK(parser->buffer, '\\'))
{
- int code_length = 0;
+ size_t code_length = 0;
if (!STRING_EXTEND(parser, string)) goto error;
if (code_length)
{
unsigned int value = 0;
- int k;
+ size_t k;
/* Scan the character value. */
{
/* Check for tab character that abuse intendation. */
- if (leading_blanks && parser->mark.column < indent
+ 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 intendation");
/* Check intendation level. */
- if (!parser->flow_level && parser->mark.column < indent)
+ if (!parser->flow_level && (int)parser->mark.column < indent)
break;
}