Changeset 274 for libyaml/trunk/src


Ignore:
Timestamp:
07/31/08 16:46:47 (6 years ago)
Author:
xi
Message:

Merged grammar fixes from the stable branch.

Location:
libyaml/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libyaml/trunk/src/parser.c

    r264 r274  
    278278    if (token->type != YAML_STREAM_START_TOKEN) { 
    279279        return PARSER_ERROR_INIT(parser, 
    280                 "did not found expected <stream-start>", token->start_mark); 
     280                "did not find expected <stream-start>", token->start_mark); 
    281281    } 
    282282 
     
    354354        if (token->type != YAML_DOCUMENT_START_TOKEN) { 
    355355            PARSER_ERROR_INIT(parser, 
    356                     "did not found expected <document start>", token->start_mark); 
     356                    "did not find expected <document start>", token->start_mark); 
    357357            goto error; 
    358358        } 
     
    664664                        (block ? "while parsing a block node" 
    665665                         : "while parsing a flow node"), start_mark, 
    666                         "did not found expected node content", token->start_mark); 
     666                        "did not find expected node content", token->start_mark); 
    667667                goto error; 
    668668            } 
     
    734734        return PARSER_ERROR_WITH_CONTEXT_INIT(parser, 
    735735                "while parsing a block collection", POP(parser, parser->marks), 
    736                 "did not found expected '-' indicator", token->start_mark); 
     736                "did not find expected '-' indicator", token->start_mark); 
    737737    } 
    738738} 
     
    844844        return PARSER_ERROR_WITH_CONTEXT_INIT(parser, 
    845845                "while parsing a block mapping", POP(parser, parser->marks), 
    846                 "did not found expected key", token->start_mark); 
     846                "did not find expected key", token->start_mark); 
    847847    } 
    848848} 
     
    938938                return PARSER_ERROR_WITH_CONTEXT_INIT(parser, 
    939939                        "while parsing a flow sequence", POP(parser, parser->marks), 
    940                         "did not found expected ',' or ']'", token->start_mark); 
     940                        "did not find expected ',' or ']'", token->start_mark); 
    941941            } 
    942942        } 
     
    10901090                return PARSER_ERROR_WITH_CONTEXT_INIT(parser, 
    10911091                        "while parsing a flow mapping", POP(parser, parser->marks), 
    1092                         "did not found expected ',' or '}'", token->start_mark); 
     1092                        "did not find expected ',' or '}'", token->start_mark); 
    10931093            } 
    10941094        } 
  • libyaml/trunk/src/scanner.c

    r265 r274  
    10571057                return SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    10581058                        "while scanning a simple key", simple_key->mark, 
    1059                         "could not found expected ':'", parser->mark); 
     1059                        "could not find expected ':'", parser->mark); 
    10601060            } 
    10611061 
     
    11271127            return SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    11281128                    "while scanning a simple key", simple_key->mark, 
    1129                     "could not found expected ':'", parser->mark); 
     1129                    "could not find expected ':'", parser->mark); 
    11301130        } 
    11311131    } 
     
    20572057        SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    20582058                "while scanning a directive", start_mark, 
    2059                 "did not found expected comment or line break", parser->mark); 
     2059                "did not find expected comment or line break", parser->mark); 
    20602060        goto error; 
    20612061    } 
     
    21132113        SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    21142114                "while scanning a directive", start_mark, 
    2115                 "cannot found expected directive name", parser->mark); 
     2115                "could not find expected directive name", parser->mark); 
    21162116        goto error; 
    21172117    } 
     
    24702470        SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    24712471                "while scanning a tag", start_mark, 
    2472                 "did not found expected whitespace or line break", parser->mark); 
     2472                "did not find expected whitespace or line break", parser->mark); 
    24732473        goto error; 
    24742474    } 
     
    28352835        SCANNER_ERROR_WITH_CONTEXT_INIT(parser, 
    28362836                "while scanning a block scalar", start_mark, 
    2837                 "did not found expected comment or line break", parser->mark); 
     2837                "did not find expected comment or line break", parser->mark); 
    28382838        goto error; 
    28392839    } 
Note: See TracChangeset for help on using the changeset viewer.