Changeset 199

Timestamp:

07/03/06 09:34:57 (2 years ago)

Author:

xi

Message:

Add event constructors and destructors.

Files:

• libyaml/trunk/include/yaml/yaml.h (modified) (4 diffs)
• libyaml/trunk/src/api.c (modified) (5 diffs)
• libyaml/trunk/src/reader.c (modified) (1 diff)

libyaml/trunk/include/yaml/yaml.h

@@ -78 +78 @@
-typedef unsigned char yaml_char_t;
-
+/** The version directive data. */
+typedef struct {
+    /** The major version number. */
+    int major;
+    /** The minor version number. */
+    int minor;
+} yaml_version_directive_t;
+
+/** The tag directive data. */
+typedef struct {
+    /** The tag handle. */
+    yaml_char_t *handle;
+    /** The tag prefix. */
+    yaml_char_t *prefix;
+} yaml_tag_directive_t;
+
-/** The stream encoding. */
-typedef enum {
@@ -195 +211 @@
-    union {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /** The tag (for @c YAML_TAG_TOKEN). */
@@ -420 +448 @@
-/** @} */
-
-
-
+
+
+
+
+
+
-typedef enum {
-    YAML_STREAM_START_EVENT,
@@ -439 +471 @@
-} yaml_event_type_t;
-
+/** The event structure. */
-typedef struct {
+
+    /** The event type. */
-    yaml_event_type_t type;
+
+    /** The event data. */
-    union {
-
+
+
+
+
-            yaml_encoding_t encoding;
-        } stream_start;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-            int implicit;
-        } document_start;
-
+
+
+
+
-            int implicit;
-        } document_end;
-
-
+
+
+
+
+
-        } alias;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            size_t length;
+            /** Is the tag optional for the plain style? */
-            int plain_implicit;
+            /** Is the tag optional for any non-plain style? */
-            int quoted_implicit;
+            /** The scalar style. */
-            yaml_scalar_style_t style;
-        } scalar;
-
-
-
+
+
+
+
+
+
+
+
-            int implicit;
+            /** The sequence style. */
-            yaml_sequence_style_t style;
-        } sequence_start;
-
-
-
+
+
+
+
+
+
+
+
-            int implicit;
+            /** The mapping style. */
-            yaml_mapping_style_t style;
-        } mapping_start;
+
-    } data;
+
+    /** The beginning of the token. */
-    yaml_mark_t start_mark;
+
+    /** The end of the token. */
-    yaml_mark_t end_mark;
-} yaml_event_t;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**

libyaml/trunk/src/api.c

@@ -277 +277 @@
-    if (!token) return NULL;
-
-
+stream_start.
-
-    return token;
@@ -348 +348 @@
-    if (!token) return NULL;
-
-nchor
+lias.value
-
-    return token;
@@ -366 +366 @@
-    if (!token) return NULL;
-
-
+.value
-
-    return token;
@@ -428 +428 @@
-
-        case YAML_ALIAS_TOKEN:
+            yaml_free(token->data.alias.value);
+            break;
+
-        case YAML_ANCHOR_TOKEN:
-
+.value
-            break;
-
@@ -447 +450 @@
-}
-
+/*
+ * Create an event.
+ */
+
+static yaml_event_t *
+yaml_event_new(yaml_event_type_t type,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_malloc(sizeof(yaml_event_t));
+
+    if (!event) return NULL;
+
+    memset(event, 0, sizeof(yaml_event_t));
+
+    event->type = type;
+    event->start_mark = start_mark;
+    event->end_mark = end_mark;
+
+    return event;
+}
+
+/*
+ * Create a STREAM-START event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_stream_start_event_new(yaml_encoding_t encoding,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_STREAM_START_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.stream_start.encoding = encoding;
+
+    return event;
+}
+
+/*
+ * Create a STREAM-END event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_stream_end_event_new(yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    return yaml_event_new(YAML_STREAM_END_EVENT, start_mark, end_mark);
+}
+
+/*
+ * Create a DOCUMENT-START event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_document_start_event_new(yaml_version_directive_t *version_directive,
+        yaml_tag_directive_t **tag_directives, int implicit,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_DOCUMENT_START_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.document_start.version_directive = version_directive;
+    event->data.document_start.tag_directives = tag_directives;
+    event->data.document_start.implicit = implicit;
+
+    return event;
+}
+
+/*
+ * Create a DOCUMENT-END event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_document_end_event_new(int implicit,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_DOCUMENT_END_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.document_end.implicit = implicit;
+
+    return event;
+}
+
+/*
+ * Create an ALIAS event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_alias_event_new(yaml_char_t *anchor,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_ALIAS_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.alias.anchor = anchor;
+
+    return event;
+}
+
+/*
+ * Create a SCALAR event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_scalar_event_new(yaml_char_t *anchor, yaml_char_t *tag,
+        yaml_char_t *value, size_t length,
+        int plain_implicit, int quoted_implicit,
+        yaml_scalar_style_t style,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_SCALAR_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.scalar.anchor = anchor;
+    event->data.scalar.tag = tag;
+    event->data.scalar.value = value;
+    event->data.scalar.length = length;
+    event->data.scalar.plain_implicit = plain_implicit;
+    event->data.scalar.quoted_implicit = quoted_implicit;
+    event->data.scalar.style = style;
+
+    return event;
+}
+
+/*
+ * Create a SEQUENCE-START event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_sequence_start_new(yaml_char_t *anchor, yaml_char_t *tag,
+        int implicit, yaml_sequence_style_t style,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_SEQUENCE_START_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.sequence_start.anchor = anchor;
+    event->data.sequence_start.tag = tag;
+    event->data.sequence_start.implicit = implicit;
+    event->data.sequence_start.style = style;
+
+    return event;
+}
+
+/*
+ * Create a SEQUENCE-END event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_sequence_end_event_new(yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    return yaml_event_new(YAML_SEQUENCE_END_EVENT, start_mark, end_mark);
+}
+
+/*
+ * Create a MAPPING-START event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_mapping_start_new(yaml_char_t *anchor, yaml_char_t *tag,
+        int implicit, yaml_mapping_style_t style,
+        yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    yaml_event_t *event = yaml_event_new(YAML_MAPPING_START_EVENT,
+            start_mark, end_mark);
+
+    if (!event) return NULL;
+
+    event->data.mapping_start.anchor = anchor;
+    event->data.mapping_start.tag = tag;
+    event->data.mapping_start.implicit = implicit;
+    event->data.mapping_start.style = style;
+
+    return event;
+}
+
+/*
+ * Create a MAPPING-END event.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_mapping_end_event_new(yaml_mark_t start_mark, yaml_mark_t end_mark)
+{
+    return yaml_event_new(YAML_MAPPING_END_EVENT, start_mark, end_mark);
+}
+
+/*
+ * Destroy an event object.
+ */
+
+YAML_DECLARE(void)
+yaml_event_delete(yaml_event_t *event)
+{
+    assert(event);  /* Non-NULL event object expected. */
+
+    switch (event->type)
+    {
+        case YAML_DOCUMENT_START_EVENT:
+            yaml_free(event->data.document_start.version_directive);
+            if (event->data.document_start.tag_directives) {
+                yaml_tag_directive_t **tag_directive;
+                for (tag_directive = event->data.document_start.tag_directives;
+                        *tag_directive; tag_directive++) {
+                    yaml_free((*tag_directive)->handle);
+                    yaml_free((*tag_directive)->prefix);
+                    yaml_free(*tag_directive);
+                }
+                yaml_free(event->data.document_start.tag_directives);
+            }
+            break;
+
+        case YAML_ALIAS_EVENT:
+            yaml_free(event->data.alias.anchor);
+            break;
+
+        case YAML_SCALAR_EVENT:
+            yaml_free(event->data.scalar.anchor);
+            yaml_free(event->data.scalar.tag);
+            yaml_free(event->data.scalar.value);
+            break;
+
+        case YAML_SEQUENCE_START_EVENT:
+            yaml_free(event->data.sequence_start.anchor);
+            yaml_free(event->data.sequence_start.tag);
+            break;
+
+        case YAML_MAPPING_START_EVENT:
+            yaml_free(event->data.mapping_start.anchor);
+            yaml_free(event->data.mapping_start.tag);
+            break;
+    }
+
+    memset(event, 0, sizeof(yaml_event_t));
+
+    yaml_free(event);
+}
+

libyaml/trunk/src/reader.c

@@ -149 +149 @@
-        memmove(parser->buffer, parser->pointer, size);
-        parser->pointer = parser->buffer;
--=
+= parser->buffer +
-    }
-    else if (parser->pointer == parser->buffer_end) {