Merged grammar fixes from the stable branch.

git-svn-id: http://svn.pyyaml.org/libyaml/trunk@274 18f92427-320e-0410-9341-c67f048884a3

2 files changed, 13 insertions, 13 deletions

diff --git a/src/parser.c b/src/parser.c
index 53f8029..2f1e0c8 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -277,7 +277,7 @@ yaml_parser_parse_stream_start(yaml_parser_t *parser, yaml_event_t *event)
 
     if (token->type != YAML_STREAM_START_TOKEN) {
         return PARSER_ERROR_INIT(parser,
-                "did not found expected <stream-start>", token->start_mark);
+                "did not find expected <stream-start>", token->start_mark);
     }
 
     parser->state = YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE;
@@ -353,7 +353,7 @@ yaml_parser_parse_document_start(yaml_parser_t *parser, yaml_event_t *event,
         if (!token) goto error;
         if (token->type != YAML_DOCUMENT_START_TOKEN) {
             PARSER_ERROR_INIT(parser,
-                    "did not found expected <document start>", token->start_mark);
+                    "did not find expected <document start>", token->start_mark);
             goto error;
         }
         if (!PUSH(parser, parser->states, YAML_PARSE_DOCUMENT_END_STATE))
@@ -663,7 +663,7 @@ yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
                 PARSER_ERROR_WITH_CONTEXT_INIT(parser,
                         (block ? "while parsing a block node"
                          : "while parsing a flow node"), start_mark,
-                        "did not found expected node content", token->start_mark);
+                        "did not find expected node content", token->start_mark);
                 goto error;
             }
         }
@@ -733,7 +733,7 @@ yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
     {
         return PARSER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while parsing a block collection", POP(parser, parser->marks),
-                "did not found expected '-' indicator", token->start_mark);
+                "did not find expected '-' indicator", token->start_mark);
     }
 }
 
@@ -843,7 +843,7 @@ yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
     {
         return PARSER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while parsing a block mapping", POP(parser, parser->marks),
-                "did not found expected key", token->start_mark);
+                "did not find expected key", token->start_mark);
     }
 }
 
@@ -937,7 +937,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
             else {
                 return PARSER_ERROR_WITH_CONTEXT_INIT(parser,
                         "while parsing a flow sequence", POP(parser, parser->marks),
-                        "did not found expected ',' or ']'", token->start_mark);
+                        "did not find expected ',' or ']'", token->start_mark);
             }
         }
 
@@ -1089,7 +1089,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
             else {
                 return PARSER_ERROR_WITH_CONTEXT_INIT(parser,
                         "while parsing a flow mapping", POP(parser, parser->marks),
-                        "did not found expected ',' or '}'", token->start_mark);
+                        "did not find expected ',' or '}'", token->start_mark);
             }
         }
 
diff --git a/src/scanner.c b/src/scanner.c
index ece1c58..6013e2b 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1056,7 +1056,7 @@ yaml_parser_stale_simple_keys(yaml_parser_t *parser)
             if (simple_key->is_required) {
                 return SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                         "while scanning a simple key", simple_key->mark,
-                        "could not found expected ':'", parser->mark);
+                        "could not find expected ':'", parser->mark);
             }
 
             simple_key->is_possible = 0;
@@ -1126,7 +1126,7 @@ yaml_parser_remove_simple_key(yaml_parser_t *parser)
         if (simple_key->is_required) {
             return SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                     "while scanning a simple key", simple_key->mark,
-                    "could not found expected ':'", parser->mark);
+                    "could not find expected ':'", parser->mark);
         }
     }
 
@@ -2056,7 +2056,7 @@ yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token)
     if (!IS_BREAKZ(parser->input)) {
         SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while scanning a directive", start_mark,
-                "did not found expected comment or line break", parser->mark);
+                "did not find expected comment or line break", parser->mark);
         goto error;
     }
 
@@ -2112,7 +2112,7 @@ yaml_parser_scan_directive_name(yaml_parser_t *parser,
     if (!string.pointer) {
         SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while scanning a directive", start_mark,
-                "cannot found expected directive name", parser->mark);
+                "could not find expected directive name", parser->mark);
         goto error;
     }
 
@@ -2469,7 +2469,7 @@ yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
     if (!IS_BLANKZ(parser->input)) {
         SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while scanning a tag", start_mark,
-                "did not found expected whitespace or line break", parser->mark);
+                "did not find expected whitespace or line break", parser->mark);
         goto error;
     }
 
@@ -2834,7 +2834,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
     if (!IS_BREAKZ(parser->input)) {
         SCANNER_ERROR_WITH_CONTEXT_INIT(parser,
                 "while scanning a block scalar", start_mark,
-                "did not found expected comment or line break", parser->mark);
+                "did not find expected comment or line break", parser->mark);
         goto error;
     }