Changeset 203

Timestamp:

07/07/06 15:34:25 (2 years ago)

Author:

xi

Message:

Complete the Parser (it requires refactoring though) and fix some bugs.

Files:

• libyaml/trunk/src/api.c (modified) (5 diffs)
• libyaml/trunk/src/parser.c (modified) (16 diffs)
• libyaml/trunk/src/scanner.c (modified) (1 diff)

libyaml/trunk/src/api.c

@@ -127 +127 @@
-    parser->state = YAML_PARSE_STREAM_START_STATE;
-
+    /* Allocate the stack of marks. */
+
+    parser->marks = yaml_malloc(YAML_DEFAULT_SIZE*sizeof(yaml_mark_t));
+    if (!parser->marks) goto error;
+    memset(parser->marks, 0, YAML_DEFAULT_SIZE*sizeof(yaml_mark_t));
+
+    parser->marks_size = YAML_DEFAULT_SIZE;
+
-    /* Allocate the list of TAG directives. */
-
@@ -146 +154 @@
-
-    yaml_free(parser->tag_directives);
+    yaml_free(parser->marks);
-    yaml_free(parser->states);
-    yaml_free(parser->simple_keys);
@@ -167 +176 @@
-    assert(parser); /* Non-NULL parser object expected. */
-
-
+
+
-    yaml_free(parser->states);
-    yaml_free(parser->simple_keys);
@@ -697 +707 @@
-    {
-        case YAML_DOCUMENT_START_EVENT:
-
+/*
-            if (event->data.document_start.tag_directives) {
-                yaml_tag_directive_t **tag_directive;
@@ -707 +717 @@
-                }
-                yaml_free(event->data.document_start.tag_directives);
-
+*/
-            break;
-

libyaml/trunk/src/parser.c

@@ -80 +80 @@
-
-static int
+yaml_parser_append_tag_directive(yaml_parser_t *parser,
+        yaml_tag_directive_t *tag_directive);
+
+static int
-yaml_parser_append_state(yaml_parser_t *parser, yaml_parser_state_t state);
-
@@ -217 +221 @@
-
-    return 0;
+}
+
+/*
+ * Double a list.
+ */
+
+static int
+yaml_parser_resize_list(yaml_parser_t *parser, void **buffer, size_t *size,
+        size_t item_size)
+{
+    void *new_buffer = yaml_realloc(*buffer, item_size*(*size)*2);
+
+    if (!new_buffer) {
+        parser->error = YAML_MEMORY_ERROR;
+        return 0;
+    }
+
+    memset(new_buffer+item_size*(*size), 0, item_size*(*size));
+
+    *buffer = new_buffer;
+    *size *= 2;
+
+    return 1;
+}
+
+/*
+ * Push a tag directive to the directive list.
+ */
+
+static int
+yaml_parser_append_tag_directive(yaml_parser_t *parser,
+        yaml_tag_directive_t *tag_directive)
+{
+    if (parser->tag_directives_length == parser->tag_directives_size-1) {
+        if (!yaml_parser_resize_list(parser, (void **)&parser->tag_directives,
+                    &parser->tag_directives_size, sizeof(yaml_tag_directive_t)))
+            return 0;
+    }
+
+    parser->tag_directives[parser->tag_directives_length++] = tag_directive;
+    parser->tag_directives[parser->tag_directives_length] = NULL;
+    return 1;
-}
-
@@ -397 +443 @@
-                parser->version_directive, parser->tag_directives, 1,
-                token->start_mark, token->start_mark);
-
+
+
+
+
-        return event;
-    }
@@ -424 +473 @@
-                parser->version_directive, parser->tag_directives, 0,
-                start_mark, end_mark);
-
+
+
+
+
-        return event;
-    }
@@ -436 +488 @@
-        event = yaml_stream_end_event_new(token->start_mark, token->end_mark);
-        yaml_token_delete(token);
+        if (!event) {
+            parser->error = YAML_MEMORY_ERROR;
+            return NULL;
+        }
-        return event;
-    }
@@ -496 +552 @@
-    }
-
+    parser->version_directive = NULL;
+    parser->tag_directives = NULL;
+    parser->tag_directives = yaml_malloc(YAML_DEFAULT_SIZE*sizeof(yaml_tag_directive_t *));
+    if (!parser->tag_directives) {
+        parser->error = YAML_MEMORY_ERROR;
+        return NULL;
+    }
+    memset(parser->tag_directives, 0, YAML_DEFAULT_SIZE*sizeof(yaml_tag_directive_t *));
+    parser->tag_directives_size = YAML_DEFAULT_SIZE;
+    parser->tag_directives_length = 0;
+
+
+
-    event = yaml_document_end_event_new(implicit, start_mark, end_mark);
-    if (!event) {
@@ -501 +570 @@
-        return NULL;
-    }
+    parser->state = YAML_PARSE_DOCUMENT_START_STATE;
+
-    return event;
-}
@@ -551 +622 @@
-    if (token->type == YAML_ALIAS_TOKEN)
-    {
+        parser->state = parser->states[--parser->states_length];
-        token = yaml_parser_get_token(parser);
-        event = yaml_alias_event_new(token->data.alias.value,
@@ -627 +699 @@
-                            goto error;
-                        }
-handle
+prefix
-                        memcpy(tag+prefix_len, tag_suffix, suffix_len);
-                        tag[prefix_len+suffix_len] = '\0';
@@ -636 +708 @@
-                    }
-                }
-
+!
-                    yaml_parser_set_parser_error_context(parser,
-                            "while parsing a node", start_mark,
@@ -652 +724 @@
-                    YAML_BLOCK_SEQUENCE_STYLE, start_mark, end_mark);
-            if (!event) goto error;
+            return event;
-        }
-        else {
@@ -660 +733 @@
-                end_mark = token->end_mark;
-                if ((token->data.scalar.style == YAML_PLAIN_SCALAR_STYLE && !tag)
-strcmp((char *)tag, "!") == 0
+(tag && strcmp((char *)tag, "!") == 0)
-                    plain_implicit = 1;
-                }
@@ -725 +798 @@
-                }
-                value[0] = '\0';
+                parser->state = parser->states[--parser->states_length];
-                event = yaml_scalar_event_new(anchor, tag, value, 0,
-                        implicit, 0, YAML_PLAIN_SCALAR_STYLE,
@@ -800 +874 @@
-    {
-        parser->state = parser->states[--parser->states_length];
+        parser->marks_length --;
-        event = yaml_sequence_end_event_new(token->start_mark, token->end_mark);
-        yaml_token_delete(token);
@@ -917 +992 @@
-    {
-        parser->state = parser->states[--parser->states_length];
-
+
+
-        yaml_token_delete(token);
-        if (!event) {
@@ -984 +1060 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

libyaml/trunk/src/scanner.c

@@ -2740 +2740 @@
-    if (!yaml_parser_scan_version_directive_number(parser, start_mark, minor))
-        return 0;
+
+    return 1;
-}
-