Changeset 274

Timestamp:

07/31/08 16:46:47 (5 years ago)

Author:

xi

Message:

Merged grammar fixes from the stable branch.

Location:

libyaml/trunk/src

Files:

• parser.c (modified) (7 diffs)
• scanner.c (modified) (6 diffs)

libyaml/trunk/src/parser.c

@@ -278 +278 @@
     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);
     }
 
@@ -354 +354 @@
         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;
         }
@@ -664 +664 @@
                         (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;
             }
@@ -734 +734 @@
         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);
     }
 }
@@ -844 +844 @@
         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);
     }
 }
@@ -938 +938 @@
                 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);
             }
         }
@@ -1090 +1090 @@
                 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);
             }
         }

libyaml/trunk/src/scanner.c

@@ -1057 +1057 @@
                 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);
             }
 
@@ -1127 +1127 @@
             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);
         }
     }
@@ -2057 +2057 @@
         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;
     }
@@ -2113 +2113 @@
         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;
     }
@@ -2470 +2470 @@
         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;
     }
@@ -2835 +2835 @@
         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;
     }