Changeset 264 for libyaml/trunk/src/parser.c

Timestamp:

12/27/07 12:14:01 (5 years ago)

Author:

xi

Message:

Another round of API update.

File:

• libyaml/trunk/src/parser.c (modified) (7 diffs)

libyaml/trunk/src/parser.c

@@ -48 +48 @@
 #define PEEK_TOKEN(parser)                                                      \
     ((parser->is_token_available || yaml_parser_fetch_more_tokens(parser)) ?    \
-        parser->tokens.list + parser->tokens.head : NULL)
+        QUEUE_ITER(parser, parser->tokens, 0) : NULL)
 
 /*
@@ -58 +58 @@
      parser->tokens_parsed ++,                                                  \
      parser->is_stream_end_produced =                                           \
-        (parser->tokens.list[parser->tokens.head].type == YAML_STREAM_END_TOKEN),   \
+        (QUEUE_ITER(parser, parser->tokens, 0)->type == YAML_STREAM_END_TOKEN), \
      parser->tokens.head ++)
 
@@ -66 +66 @@
 
 YAML_DECLARE(int)
-yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
+yaml_parser_parse_event(yaml_parser_t *parser, yaml_event_t *event);
 
 /*
@@ -156 +156 @@
 
 YAML_DECLARE(int)
-yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event)
+yaml_parser_parse_event(yaml_parser_t *parser, yaml_event_t *event)
 {
     assert(parser);     /* Non-NULL parser object is expected. */
@@ -256 +256 @@
 
         default:
-            assert(1);      /* Invalid state. */
+            assert(0);      /* Invalid state. */
     }
 
@@ -563 +563 @@
                 int idx;
                 for (idx = 0; idx < parser->tag_directives.length; idx++) {
-                    yaml_tag_directive_t *tag_directive = parser->tag_directives.list + idx;
+                    yaml_tag_directive_t *tag_directive =
+                        STACK_ITER(parser, parser->tag_directives, idx);
                     if (strcmp((char *)tag_directive->handle, (char *)tag_handle) == 0) {
                         size_t prefix_len = strlen((char *)tag_directive->prefix);
@@ -1311 +1312 @@
 
     for (idx = 0; idx < parser->tag_directives.length; idx++) {
-        yaml_tag_directive_t *tag_directive = parser->tag_directives.list + idx;
+        yaml_tag_directive_t *tag_directive =
+            STACK_ITER(parser, parser->tag_directives, idx);
         if (strcmp((char *)value.handle, (char *)tag_directive->handle) == 0) {
             if (allow_duplicates)