Changeset 261

Timestamp:

12/25/07 18:19:23 (4 years ago)

Author:

xi

Message:

API refactoring (Note: it breaks the build).

Location:

libyaml/trunk

Files:

• include/yaml.h (modified) (66 diffs)
• src/api.c (modified) (49 diffs)
• src/yaml_private.h (modified) (21 diffs)

libyaml/trunk/include/yaml.h

@@ -71 +71 @@
 
 /**
+ * @defgroup styles Error Handling
+ * @{
+ */
+
+/** Many bad things could happen with the parser and the emitter. */
+typedef enum yaml_error_type_e {
+    /** No error is produced. */
+    YAML_NO_ERROR,
+
+    /** Cannot allocate or reallocate a block of memory. */
+    YAML_MEMORY_ERROR,
+
+    /** Cannot read from the input stream. */
+    YAML_READER_ERROR,
+    /** Cannot decode the input stream. */
+    YAML_DECODER_ERROR,
+
+    /** Cannot scan a YAML token. */
+    YAML_SCANNER_ERROR,
+    /** Cannot parse a YAML production. */
+    YAML_PARSER_ERROR,
+    /** Cannot compose a YAML document. */
+    YAML_COMPOSER_ERROR,
+
+    /** Cannot write into the output stream. */
+    YAML_WRITER_ERROR,
+
+    /** Cannot emit a YAML event. */
+    YAML_EMITTER_ERROR,
+    /** Cannot serialize a YAML document. */
+    YAML_SERIALIZER_ERROR
+} yaml_error_type_t;
+
+/** The pointer position. */
+typedef struct yaml_mark_s {
+    /** The character number (starting from zero). */
+    size_t index;
+
+    /** The mark line (starting from zero). */
+    size_t line;
+
+    /** The mark column (starting from zero). */
+    size_t column;
+} yaml_mark_t;
+
+/** The error details. */
+typedef struct yaml_error_s {
+
+    /** The error type. */
+    yaml_error_type_t type;
+
+    /** The detailed error information. */
+    union {
+
+        /**
+         * A problem while reading the stream (@c YAML_READER_ERROR or
+         * @c YAML_DECODER_ERROR).
+         */
+        struct {
+            /** The problem description. */
+            const char *problem;
+            /** The stream offset. */
+            size_t offset;
+            /** The problematic octet or character (@c -1 if not applicable). */
+            int value;
+        } reading;
+
+        /**
+         * A problem while loading the stream (@c YAML_SCANNER_ERROR,
+         * @c YAML_PARSER_ERROR, or @c YAML_COMPOSER_ERROR).
+         */
+        struct {
+            /** The problem description. */
+            const char *problem;
+            /** The problem mark. */
+            yaml_mark_t problem_mark;
+            /** The context in which the problem occured
+             * (@c NULL if not applicable).
+             */
+            const char *context;
+            /** The context mark (if @c problem_mark is not @c NULL). **/
+            yaml_mark_t context_mark;
+        } loading;
+
+        /** A problem while writing into the stream (@c YAML_WRITER_ERROR). */
+        struct {
+            /** The problem description. */
+            const char *problem;
+            /** The stream offset. */
+            size_t offset;
+        } writing;
+
+        /** A problem while dumping into the stream (@c YAML_EMITTER_ERROR and
+         * @c YAML_SERIALIZER_ERROR).
+         */
+        struct {
+            /** The problem description. */
+            const char *problem;
+        } dumping;
+
+    } data;
+
+} yaml_error_t;
+
+
+/** @} */
+
+/**
  * @defgroup basic Basic Types
  * @{
@@ -107 +215 @@
 
 /** Line break types. */
-
 typedef enum yaml_break_e {
     /** Let the parser choose the break type. */
@@ -119 +226 @@
 } yaml_break_t;
 
-/** Many bad things could happen with the parser and emitter. */
-typedef enum yaml_error_type_e {
-    /** No error is produced. */
-    YAML_NO_ERROR,
-
-    /** Cannot allocate or reallocate a block of memory. */
-    YAML_MEMORY_ERROR,
-
-    /** Cannot read or decode the input stream. */
-    YAML_READER_ERROR,
-    /** Cannot scan the input stream. */
-    YAML_SCANNER_ERROR,
-    /** Cannot parse the input stream. */
-    YAML_PARSER_ERROR,
-    /** Cannot compose a YAML document. */
-    YAML_COMPOSER_ERROR,
-
-    /** Cannot write to the output stream. */
-    YAML_WRITER_ERROR,
-    /** Cannot emit a YAML stream. */
-    YAML_EMITTER_ERROR
-} yaml_error_type_t;
-
-/** The pointer position. */
-typedef struct yaml_mark_s {
-    /** The position index. */
-    size_t index;
-
-    /** The position line. */
-    size_t line;
-
-    /** The position column. */
-    size_t column;
-} yaml_mark_t;
-
 /** @} */
 
@@ -279 +351 @@
         } stream_start;
 
+        /** The version directive (for @c YAML_VERSION_DIRECTIVE_TOKEN). */
+        struct {
+            /** The major version number. */
+            int major;
+            /** The minor version number. */
+            int minor;
+        } version_directive;
+
+        /** The tag directive (for @c YAML_TAG_DIRECTIVE_TOKEN). */
+        struct {
+            /** The tag handle. */
+            yaml_char_t *handle;
+            /** The tag prefix. */
+            yaml_char_t *prefix;
+        } tag_directive;
+
         /** The alias (for @c YAML_ALIAS_TOKEN). */
         struct {
@@ -309 +397 @@
         } scalar;
 
-        /** The version directive (for @c YAML_VERSION_DIRECTIVE_TOKEN). */
-        struct {
-            /** The major version number. */
-            int major;
-            /** The minor version number. */
-            int minor;
-        } version_directive;
-
-        /** The tag directive (for @c YAML_TAG_DIRECTIVE_TOKEN). */
-        struct {
-            /** The tag handle. */
-            yaml_char_t *handle;
-            /** The tag prefix. */
-            yaml_char_t *prefix;
-        } tag_directive;
-
     } data;
 
@@ -335 +407 @@
 
 /**
+ * Allocate a new empty token object.
+ *
+ * @returns a new token object or @c NULL on error.
+ */
+
+YAML_DECLARE(yaml_token_t *)
+yaml_token_new(void);
+
+/**
+ * Delete and deallocate a token object.
+ *
+ * @param[in,out]   token   A token object.
+ */
+
+YAML_DECLARE(void)
+yaml_token_delete(yaml_token_t *token);
+
+/**
+ * Duplicate a token object.
+ *
+ * @param[in,out]   token   An empty token object.
+ * @param[in]       model   A token to copy.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_token_duplicate(yaml_token_t *token, yaml_token_t *model);
+
+/**
  * Free any memory allocated for a token object.
  *
@@ -341 +443 @@
 
 YAML_DECLARE(void)
-yaml_token_delete(yaml_token_t *token);
+yaml_token_destroy(yaml_token_t *token);
 
 /** @} */
@@ -403 +505 @@
             /** The list of tag directives. */
             struct {
-                /** The beginning of the tag directives list. */
-                yaml_tag_directive_t *start;
-                /** The end of the tag directives list. */
-                yaml_tag_directive_t *end;
+                /** The beginning of the list. */
+                yaml_tag_directive_t *list;
+                /** The length of the list. */
+                size_t length;
+                /** The capacity of the list. */
+                size_t capacity;
             } tag_directives;
 
             /** Is the document indicator implicit? */
-            int implicit;
+            int is_implicit;
         } document_start;
 
@@ -416 +520 @@
         struct {
             /** Is the document end indicator implicit? */
-            int implicit;
+            int is_implicit;
         } document_end;
 
@@ -436 +540 @@
             size_t length;
             /** Is the tag optional for the plain style? */
-            int plain_implicit;
+            int is_plain_implicit;
             /** Is the tag optional for any non-plain style? */
-            int quoted_implicit;
+            int is_quoted_implicit;
             /** The scalar style. */
             yaml_scalar_style_t style;
@@ -450 +554 @@
             yaml_char_t *tag;
             /** Is the tag optional? */
-            int implicit;
+            int is_implicit;
             /** The sequence style. */
             yaml_sequence_style_t style;
@@ -462 +566 @@
             yaml_char_t *tag;
             /** Is the tag optional? */
-            int implicit;
+            int is_implicit;
             /** The mapping style. */
             yaml_mapping_style_t style;
@@ -477 +581 @@
 
 /**
- * Create the STREAM-START event.
+ * Allocate a new empty event object.
+ *
+ * @returns a new event object or @c NULL on error.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_event_new(void);
+
+/**
+ * Delete and deallocate an event object.
+ *
+ * @param[in,out]   event   An event object.
+ */
+
+YAML_DECLARE(void)
+yaml_event_delete(yaml_event_t *event);
+
+/**
+ * Duplicate a event object.
+ *
+ * @param[in,out]   event   An empty event object.
+ * @param[in]       model   An event to copy.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_event_duplicate(yaml_event_t *event, yaml_event_t *model);
+
+/**
+ * Create a STREAM-START event.
+ *
+ * This function never fails.
  *
  * @param[out]      event       An empty event object.
@@ -486 +622 @@
 
 YAML_DECLARE(int)
-yaml_stream_start_event_initialize(yaml_event_t *event,
+yaml_event_create_stream_start(yaml_event_t *event,
         yaml_encoding_t encoding);
 
 /**
- * Create the STREAM-END event.
+ * Create a STREAM-END event.
+ *
+ * This function never fails.
  *
  * @param[out]      event       An empty event object.
@@ -498 +636 @@
 
 YAML_DECLARE(int)
-yaml_stream_end_event_initialize(yaml_event_t *event);
+yaml_event_create_stream_end(yaml_event_t *event);
 
 /**
  * Create the DOCUMENT-START event.
- *
- * The @a implicit argument is considered as a stylistic parameter and may be
- * ignored by the emitter.
  *
  * @param[out]      event                   An empty event object.
  * @param[in]       version_directive       The %YAML directive value or
  *                                          @c NULL.
- * @param[in]       tag_directives_start    The beginning of the %TAG
- *                                          directives list.
- * @param[in]       tag_directives_end      The end of the %TAG directives
- *                                          list.
- * @param[in]       implicit                If the document start indicator is
- *                                          implicit.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_start_event_initialize(yaml_event_t *event,
-        yaml_version_directive_t *version_directive,
-        yaml_tag_directive_t *tag_directives_start,
-        yaml_tag_directive_t *tag_directives_end,
-        int implicit);
+ * @param[in]       tag_directives_list     The beginning of the %TAG
+ *                                          directives list or @c NULL.  The
+ *                                          list ends with @c (NULL,NULL).
+ * @param[in]       is_implicit             Set if the document start
+ *                                          indicator is optional.  This
+ *                                          parameter is stylistic and may be
+ *                                          ignored by the parser.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_event_create_document_start(yaml_event_t *event,
+        const yaml_version_directive_t *version_directive,
+        const yaml_tag_directive_t *tag_directives,
+        int is_implicit);
 
 /**
  * Create the DOCUMENT-END event.
  *
- * The @a implicit argument is considered as a stylistic parameter and may be
- * ignored by the emitter.
- *
  * @param[out]      event       An empty event object.
- * @param[in]       implicit    If the document end indicator is implicit.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_end_event_initialize(yaml_event_t *event, int implicit);
+ * @param[in]       is_implicit Set if the document end indicator is optional.
+ *                              This parameter is stylistic and may be ignored
+ *                              by the parser.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_event_create_document_end(yaml_event_t *event, int is_implicit);
 
 /**
@@ -551 +685 @@
 
 YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
+yaml_event_create_alias(yaml_event_t *event, const yaml_char_t *anchor);
 
 /**
  * Create a SCALAR event.
  *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or one of the @a plain_implicit and
- * @a quoted_implicit flags must be set.
- *
- * @param[out]      event           An empty event object.
- * @param[in]       anchor          The scalar anchor or @c NULL.
- * @param[in]       tag             The scalar tag or @c NULL.
- * @param[in]       value           The scalar value.
- * @param[in]       length          The length of the scalar value.
- * @param[in]       plain_implicit  If the tag may be omitted for the plain
- *                                  style.
- * @param[in]       quoted_implicit If the tag may be omitted for any
- *                                  non-plain style.
- * @param[in]       style           The scalar style.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_scalar_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag,
-        yaml_char_t *value, int length,
-        int plain_implicit, int quoted_implicit,
+ * @param[out]      event                   An empty event object.
+ * @param[in]       anchor                  The scalar anchor or @c NULL.
+ * @param[in]       tag                     The scalar tag or @c NULL.  If
+ *                                          latter, one of the
+ *                                          @a is_plain_implicit and
+ *                                          @a is_quoted_implicit flags must
+ *                                          be set.
+ * @param[in]       value                   The scalar value.
+ * @param[in]       length                  The length of the scalar value.
+ * @param[in]       is_plain_implicit       Set if the tag may be omitted for
+ *                                          the plain style.
+ * @param[in]       is_quoted_implicit      Set if the tag may be omitted for
+ *                                          any non-plain style.
+ * @param[in]       style                   The scalar style.  This attribute
+ *                                          may be ignored by the emitter.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_event_create_scalar(yaml_event_t *event,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        const yaml_char_t *value, size_t length,
+        int is_plain_implicit, int is_quoted_implicit,
         yaml_scalar_style_t style);
 
 /**
  * Create a SEQUENCE-START event.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or the @a implicit flag must be set.
  *
  * @param[out]      event       An empty event object.
  * @param[in]       anchor      The sequence anchor or @c NULL.
- * @param[in]       tag         The sequence tag or @c NULL.
- * @param[in]       implicit    If the tag may be omitted.
- * @param[in]       style       The sequence style.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_sequence_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
-        yaml_sequence_style_t style);
+ * @param[in]       tag         The sequence tag or @c NULL.  If latter, the
+ *                              @a is_implicit flag must be set.
+ * @param[in]       is_implicit Set if the tag may be omitted.
+ * @param[in]       style       The sequence style.  This attribute may be
+ *                              ignored by the parser.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_event_create_sequence_start(yaml_event_t *event,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        int is_implicit, yaml_sequence_style_t style);
 
 /**
@@ -612 +744 @@
 
 YAML_DECLARE(int)
-yaml_sequence_end_event_initialize(yaml_event_t *event);
+yaml_event_create_sequence_end(yaml_event_t *event);
 
 /**
  * Create a MAPPING-START event.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or the @a implicit flag must be set.
  *
  * @param[out]      event       An empty event object.
  * @param[in]       anchor      The mapping anchor or @c NULL.
- * @param[in]       tag         The mapping tag or @c NULL.
- * @param[in]       implicit    If the tag may be omitted.
+ * @param[in]       tag         The mapping tag or @c NULL.  If latter, the
+ *                              @a is_implicit flag must be set.
+ * @param[in]       is_implicit Set if the tag may be omitted.
  * @param[in]       style       The mapping style.
  *
@@ -631 +760 @@
 
 YAML_DECLARE(int)
-yaml_mapping_start_event_initialize(yaml_event_t *event,
-        yaml_char_t *anchor, yaml_char_t *tag, int implicit,
-        yaml_mapping_style_t style);
+yaml_event_create_mapping_start(yaml_event_t *event,
+        const yaml_char_t *anchor, const yaml_char_t *tag,
+        int is_implicit, yaml_mapping_style_t style);
 
 /**
@@ -644 +773 @@
 
 YAML_DECLARE(int)
-yaml_mapping_end_event_initialize(yaml_event_t *event);
+yaml_event_create_mapping_end(yaml_event_t *event);
 
 /**
@@ -653 +782 @@
 
 YAML_DECLARE(void)
-yaml_event_delete(yaml_event_t *event);
+yaml_event_destroy(yaml_event_t *event);
 
 /** @} */
@@ -672 +801 @@
 /** The tag @c !!float for float values. */
 #define YAML_FLOAT_TAG      "tag:yaml.org,2002:float"
-/** The tag @c !!timestamp for date and time values. */
-#define YAML_TIMESTAMP_TAG  "tag:yaml.org,2002:timestamp"
 
 /** The tag @c !!seq is used to denote sequences. */
@@ -700 +827 @@
 } yaml_node_type_t;
 
+/** Arc types. */
+typedef enum yaml_arc_type_e {
+    /** An empty arc. */
+    YAML_NO_ARC,
+
+    /** An item of a sequence. */
+    YAML_SEQUENCE_ITEM_ARC,
+    /** A key of a mapping. */
+    YAML_MAPPING_KEY_ARC,
+    /** A value of a mapping. */
+    YAML_MAPPING_VALUE_ARC
+} yaml_arc_type_t;
+
 /** The forward definition of a document node structure. */
 typedef struct yaml_node_s yaml_node_t;
@@ -714 +854 @@
 } yaml_node_pair_t;
 
+/** An element of a path in a YAML document. */
+typedef struct yaml_arc_s {
+    /** The arc type. */
+    yaml_arc_type_t type;
+    /** The collection node. */
+    int node;
+    /** A pointer in the collection node. */
+    int item;
+} yaml_arc_t;
+
 /** The node structure. */
 struct yaml_node_s {
@@ -720 +870 @@
     yaml_node_type_t type;
 
+    /** The node anchor. */
+    yaml_char_t *anchor;
     /** The node tag. */
     yaml_char_t *tag;
@@ -738 +890 @@
         /** The sequence parameters (for @c YAML_SEQUENCE_NODE). */
         struct {
-            /** The stack of sequence items. */
+            /** The list of sequence items. */
             struct {
-                /** The beginning of the stack. */
-                yaml_node_item_t *start;
-                /** The end of the stack. */
-                yaml_node_item_t *end;
-                /** The top of the stack. */
-                yaml_node_item_t *top;
+                /** The beginning of the list. */
+                yaml_node_item_t *list;
+                /** The length of the list. */
+                size_t length;
+                /** The capacity of the list. */
+                size_t capacity;
             } items;
             /** The sequence style. */
@@ -753 +905 @@
         /** The mapping parameters (for @c YAML_MAPPING_NODE). */
         struct {
-            /** The stack of mapping pairs (key, value). */
+            /** The list of mapping pairs (key, value). */
             struct {
-                /** The beginning of the stack. */
-                yaml_node_pair_t *start;
-                /** The end of the stack. */
-                yaml_node_pair_t *end;
-                /** The top of the stack. */
-                yaml_node_pair_t *top;
+                /** The beginning of the list. */
+                yaml_node_pair_t *list;
+                /** The length of the list. */
+                size_t length;
+                /** The capacity of the list. */
+                size_t capacity;
             } pairs;
             /** The mapping style. */
@@ -775 +927 @@
 };
 
+/** The incomplete node structure. */
+typedef struct yaml_incomplete_node_s {
+
+    /** The node type. */
+    yaml_node_type_t type;
+
+    /** The path to the new node. */
+    struct {
+        /** The beginning of the list. */
+        yaml_arc_t *list;
+        /** The length of the list. */
+        size_t length;
+        /** The capacity of the list. */
+        size_t capacity;
+    } path;
+
+    /** The node data. */
+    union {
+
+        /** The scalar parameters (for @c YAML_SCALAR_NODE). */
+        struct {
+            /** The scalar value. */
+            yaml_char_t *value;
+            /** The length of the scalar value. */
+            size_t length;
+            /** Set if the scalar is plain. */
+            int is_plain;
+        } scalar;
+
+    } data;
+
+    /** The position of the node. */
+    yaml_mark_t mark;
+
+} yaml_incomplete_node_t;
+
 /** The document structure. */
 typedef struct yaml_document_s {
@@ -780 +968 @@
     /** The document nodes. */
     struct {
-        /** The beginning of the stack. */
-        yaml_node_t *start;
-        /** The end of the stack. */
-        yaml_node_t *end;
-        /** The top of the stack. */
-        yaml_node_t *top;
+        /** The beginning of the list. */
+        yaml_node_t *list;
+        /** The length of the list. */
+        size_t length;
+        /** The capacity of the list. */
+        size_t capacity;
     } nodes;
 
@@ -793 +981 @@
     /** The list of tag directives. */
     struct {
-        /** The beginning of the tag directives list. */
-        yaml_tag_directive_t *start;
-        /** The end of the tag directives list. */
-        yaml_tag_directive_t *end;
+        /** The beginning of the tag directive list. */
+        yaml_tag_directive_t *list;
+        /** The length of the tag directive list. */
+        size_t length;
+        /** The capacity of the tag directive list. */
+        size_t capacity;
     } tag_directives;
 
     /** Is the document start indicator implicit? */
-    int start_implicit;
+    int is_start_implicit;
     /** Is the document end indicator implicit? */
-    int end_implicit;
+    int is_end_implicit;
 
     /** The beginning of the document. */
@@ -811 +1001 @@
 } yaml_document_t;
 
+#if 0
+
+/**
+ * Allocate a new empty document object.
+ *
+ * @returns a new document object or @c NULL on error.
+ */
+
+YAML_DECLARE(yaml_document_t *)
+yaml_document_new(void);
+
+/**
+ * Delete and deallocatge a document object.
+ *
+ * @param[in,out]   document    A document object.
+ */
+
+YAML_DECLARE(void)
+yaml_document_delete(yaml_document_t *document);
+
+/**
+ * Duplicate a document object.
+ *
+ * @param[in,out]   document   An empty document object.
+ * @param[in]       model       A document to copy.
+ *
+ * @returns @c 1 if the function succeeded, @c 0 on error.
+ */
+
+YAML_DECLARE(int)
+yaml_document_duplicate(yaml_document_t *document, yaml_document_t *model);
+
 /**
  * Create a YAML document.
@@ -817 +1039 @@
  * @param[in]       version_directive       The %YAML directive value or
  *                                          @c NULL.
- * @param[in]       tag_directives_start    The beginning of the %TAG
- *                                          directives list.
- * @param[in]       tag_directives_end      The end of the %TAG directives
- *                                          list.
- * @param[in]       start_implicit          If the document start indicator is
+ * @param[in]       tag_directives          The list of the %TAG directives or
+ *                                          @c NULL.  The list must end with
+ *                                          the pair @c (NULL,NULL).
+ * @param[in]       is_start_implicit       If the document start indicator is
  *                                          implicit.
- * @param[in]       end_implicit            If the document end indicator is
+ * @param[in]       is_end_implicit         If the document end indicator is
  *                                          implicit.
  *
@@ -830 +1051 @@
 
 YAML_DECLARE(int)
-yaml_document_initialize(yaml_document_t *document,
+yaml_document_create(yaml_document_t *document,
         yaml_version_directive_t *version_directive,
-        yaml_tag_directive_t *tag_directives_start,
-        yaml_tag_directive_t *tag_directives_end,
-        int start_implicit, int end_implicit);
+        yaml_tag_directive_t *tag_directives,
+        int is_start_implicit, int is_end_implicit);
 
 /**
@@ -843 +1063 @@
 
 YAML_DECLARE(void)
-yaml_document_delete(yaml_document_t *document);
+yaml_document_destroy(yaml_document_t *document);
 
 /**
@@ -849 +1069 @@
  *
  * The pointer returned by this function is valid until any of the functions
- * modifying the documents are called.
+ * modifying the documents is called.
  *
  * @param[in]       document        A document object.
@@ -866 +1086 @@
  *
  * The pointer returned by this function is valid until any of the functions
- * modifying the documents are called.
+ * modifying the documents is called.
  *
  * An empty document produced by the parser signifies the end of a YAML
@@ -885 +1105 @@
  *
  * @param[in,out]   document        A document object.
+ * @param[in]       anchor          A preferred anchor for the node or @c NULL.
  * @param[in]       tag             The scalar tag.
  * @param[in]       value           The scalar value.
@@ -895 +1116 @@
 YAML_DECLARE(int)
 yaml_document_add_scalar(yaml_document_t *document,
-        yaml_char_t *tag, yaml_char_t *value, int length,
-        yaml_scalar_style_t style);
+        yaml_char_t *anchor, yaml_char_t *tag, yaml_char_t *value,
+        size_t length, yaml_scalar_style_t style);
 
 /**
@@ -904 +1125 @@
  *
  * @param[in,out]   document    A document object.
+ * @param[in]       anchor      A preferred anchor for the node or @c NULL.
  * @param[in]       tag         The sequence tag.
  * @param[in]       style       The sequence style.
@@ -912 +1134 @@
 YAML_DECLARE(int)
 yaml_document_add_sequence(yaml_document_t *document,
-        yaml_char_t *tag, yaml_sequence_style_t style);
+        yaml_char_t *anchor, yaml_char_t *tag, yaml_sequence_style_t style);
 
 /**
@@ -920 +1142 @@
  *
  * @param[in,out]   document    A document object.
+ * @param[in]       anchor      A preferred anchor for the node or @c NULL.
  * @param[in]       tag         The sequence tag.
  * @param[in]       style       The sequence style.
@@ -928 +1151 @@
 YAML_DECLARE(int)
 yaml_document_add_mapping(yaml_document_t *document,
-        yaml_char_t *tag, yaml_mapping_style_t style);
+        yaml_char_t *anchor, yaml_char_t *tag, yaml_mapping_style_t style);
 
 /**
@@ -959 +1182 @@
         int mapping, int key, int value);
 
-/** @} */
-
-/**
- * @defgroup parser Parser Definitions
+#endif
+
+/**
+ * @defgroup callbacks Callback Definitions
  * @{
  */
@@ -970 +1193 @@
  *
  * The read handler is called when the parser needs to read more bytes from the
- * source.  The handler should write not more than @a size bytes to the @a
- * buffer.  The number of written bytes should be set to the @a length variable.
+ * source.  The handler should read no more than @a size bytes and write them
+ * to the @a buffer.  The number of the read bytes should be returned using the
+ * @a size_read variable.  If the handler reaches the stream end, @a size_read
+ * must be set to @c 0.
  *
  * @param[in,out]   data        A pointer to an application data specified by
- *                              yaml_parser_set_input().
+ *                              @c yaml_parser_set_reader().
  * @param[out]      buffer      The buffer to write the data from the source.
- * @param[in]       size        The size of the buffer.
- * @param[out]      size_read   The actual number of bytes read from the source.
+ * @param[in]       capacity    The maximum number of bytes the buffer can hold.
+ * @param[out]      length      The actual number of bytes read from the source.
  *
  * @returns On success, the handler should return @c 1.  If the handler failed,
@@ -984 +1209 @@
  */
 
-typedef int yaml_read_handler_t(void *data, unsigned char *buffer, size_t size,
-        size_t *size_read);
-
-/**
- * This structure holds information about a potential simple key.
- */
-
-typedef struct yaml_simple_key_s {
-    /** Is a simple key possible? */
-    int possible;
-
-    /** Is a simple key required? */
-    int required;
-
-    /** The number of the token. */
-    size_t token_number;
-
-    /** The position mark. */
-    yaml_mark_t mark;
-} yaml_simple_key_t;
-
-/**
- * The states of the parser.
- */
-typedef enum yaml_parser_state_e {
-    /** Expect STREAM-START. */
-    YAML_PARSE_STREAM_START_STATE,
-    /** Expect the beginning of an implicit document. */
-    YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE,
-    /** Expect DOCUMENT-START. */
-    YAML_PARSE_DOCUMENT_START_STATE,
-    /** Expect the content of a document. */
-    YAML_PARSE_DOCUMENT_CONTENT_STATE,
-    /** Expect DOCUMENT-END. */
-    YAML_PARSE_DOCUMENT_END_STATE,
-    /** Expect a block node. */
-    YAML_PARSE_BLOCK_NODE_STATE,
-    /** Expect a block node or indentless sequence. */
-    YAML_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE,
-    /** Expect a flow node. */
-    YAML_PARSE_FLOW_NODE_STATE,
-    /** Expect the first entry of a block sequence. */
-    YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE,
-    /** Expect an entry of a block sequence. */
-    YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE,
-    /** Expect an entry of an indentless sequence. */
-    YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE,
-    /** Expect the first key of a block mapping. */
-    YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE,
-    /** Expect a block mapping key. */
-    YAML_PARSE_BLOCK_MAPPING_KEY_STATE,
-    /** Expect a block mapping value. */
-    YAML_PARSE_BLOCK_MAPPING_VALUE_STATE,
-    /** Expect the first entry of a flow sequence. */
-    YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE,
-    /** Expect an entry of a flow sequence. */
-    YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE,
-    /** Expect a key of an ordered mapping. */
-    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE,
-    /** Expect a value of an ordered mapping. */
-    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE,
-    /** Expect the and of an ordered mapping entry. */
-    YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE,
-    /** Expect the first key of a flow mapping. */
-    YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE,
-    /** Expect a key of a flow mapping. */
-    YAML_PARSE_FLOW_MAPPING_KEY_STATE,
-    /** Expect a value of a flow mapping. */
-    YAML_PARSE_FLOW_MAPPING_VALUE_STATE,
-    /** Expect an empty value of a flow mapping. */
-    YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE,
-    /** Expect nothing. */
-    YAML_PARSE_END_STATE
-} yaml_parser_state_t;
-
-/**
- * This structure holds aliases data.
- */
-
-typedef struct yaml_alias_data_s {
-    /** The anchor. */
-    yaml_char_t *anchor;
-    /** The node id. */
-    int index;
-    /** The anchor mark. */
-    yaml_mark_t mark;
-} yaml_alias_data_t;
-
-/**
- * The parser structure.
- *
- * All members are internal.  Manage the structure using the @c yaml_parser_
- * family of functions.
- */
-
-typedef struct yaml_parser_s {
-
-    /**
-     * @name Error handling
-     * @{
-     */
-
-    /** Error type. */
-    yaml_error_type_t error;
-    /** Error description. */
-    const char *problem;
-    /** The byte about which the problem occured. */
-    size_t problem_offset;
-    /** The problematic value (@c -1 is none). */
-    int problem_value;
-    /** The problem position. */
-    yaml_mark_t problem_mark;
-    /** The error context. */
-    const char *context;
-    /** The context position. */
-    yaml_mark_t context_mark;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Reader stuff
-     * @{
-     */
-
-    /** Read handler. */
-    yaml_read_handler_t *read_handler;
-
-    /** A pointer for passing to the read handler. */
-    void *read_handler_data;
-
-    /** Standard (string or file) input data. */
-    union {
-        /** String input data. */
-        struct {
-            /** The string start pointer. */
-            const unsigned char *start;
-            /** The string end pointer. */
-            const unsigned char *end;
-            /** The string current position. */
-            const unsigned char *current;
-        } string;
-
-        /** File input data. */
-        FILE *file;
-    } input;
-
-    /** EOF flag */
-    int eof;
-
-    /** The working buffer. */
-    struct {
-        /** The beginning of the buffer. */
-        yaml_char_t *start;
-        /** The end of the buffer. */
-        yaml_char_t *end;
-        /** The current position of the buffer. */
-        yaml_char_t *pointer;
-        /** The last filled position of the buffer. */
-        yaml_char_t *last;
-    } buffer;
-
-    /* The number of unread characters in the buffer. */
-    size_t unread;
-
-    /** The raw buffer. */
-    struct {
-        /** The beginning of the buffer. */
-        unsigned char *start;
-        /** The end of the buffer. */
-        unsigned char *end;
-        /** The current position of the buffer. */
-        unsigned char *pointer;
-        /** The last filled position of the buffer. */
-        unsigned char *last;
-    } raw_buffer;
-
-    /** The input encoding. */
-    yaml_encoding_t encoding;
-
-    /** The offset of the current position (in bytes). */
-    size_t offset;
-
-    /** The mark of the current position. */
-    yaml_mark_t mark;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Scanner stuff
-     * @{
-     */
-
-    /** Have we started to scan the input stream? */
-    int stream_start_produced;
-
-    /** Have we reached the end of the input stream? */
-    int stream_end_produced;
-
-    /** The number of unclosed '[' and '{' indicators. */
-    int flow_level;
-
-    /** The tokens queue. */
-    struct {
-        /** The beginning of the tokens queue. */
-        yaml_token_t *start;
-        /** The end of the tokens queue. */
-        yaml_token_t *end;
-        /** The head of the tokens queue. */
-        yaml_token_t *head;
-        /** The tail of the tokens queue. */
-        yaml_token_t *tail;
-    } tokens;
-
-    /** The number of tokens fetched from the queue. */
-    size_t tokens_parsed;
-
-    /* Does the tokens queue contain a token ready for dequeueing. */
-    int token_available;
-
-    /** The indentation levels stack. */
-    struct {
-        /** The beginning of the stack. */
-        int *start;
-        /** The end of the stack. */
-        int *end;
-        /** The top of the stack. */
-        int *top;
-    } indents;
-
-    /** The current indentation level. */
-    int indent;
-
-    /** May a simple key occur at the current position? */
-    int simple_key_allowed;
-
-    /** The stack of simple keys. */
-    struct {
-        /** The beginning of the stack. */
-        yaml_simple_key_t *start;
-        /** The end of the stack. */
-        yaml_simple_key_t *end;
-        /** The top of the stack. */
-        yaml_simple_key_t *top;
-    } simple_keys;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Parser stuff
-     * @{
-     */
-
-    /** The parser states stack. */
-    struct {
-        /** The beginning of the stack. */
-        yaml_parser_state_t *start;
-        /** The end of the stack. */
-        yaml_parser_state_t *end;
-        /** The top of the stack. */
-        yaml_parser_state_t *top;
-    } states;
-
-    /** The current parser state. */
-    yaml_parser_state_t state;
-
-    /** The stack of marks. */
-    struct {
-        /** The beginning of the stack. */
-        yaml_mark_t *start;
-        /** The end of the stack. */
-        yaml_mark_t *end;
-        /** The top of the stack. */
-        yaml_mark_t *top;
-    } marks;
-
-    /** The list of TAG directives. */
-    struct {
-        /** The beginning of the list. */
-        yaml_tag_directive_t *start;
-        /** The end of the list. */
-        yaml_tag_directive_t *end;
-        /** The top of the list. */
-        yaml_tag_directive_t *top;
-    } tag_directives;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Dumper stuff
-     * @{
-     */
-
-    /** The alias data. */
-    struct {
-        /** The beginning of the list. */
-        yaml_alias_data_t *start;
-        /** The end of the list. */
-        yaml_alias_data_t *end;
-        /** The top of the list. */
-        yaml_alias_data_t *top;
-    } aliases;
-
-    /** The currently parsed document. */
-    yaml_document_t *document;
-
-    /**
-     * @}
-     */
-
-} yaml_parser_t;
-
-/**
- * Initialize a parser.
+typedef int yaml_reader_t(void *data, unsigned char *buffer, size_t capacity,
+        size_t *length);
+
+/**
+ * The prototype of a write handler.
+ *
+ * The write handler is called when the emitter needs to flush the accumulated
+ * characters to the output.  The handler should write @a size bytes of the
+ * @a buffer to the output.
+ *
+ * @param[in,out]   data        A pointer to an application data specified by
+ *                              @c yaml_emitter_set_writer().
+ * @param[in]       buffer      The buffer with bytes to be written.
+ * @param[in]       length      The number of bytes to be written.
+ *
+ * @returns On success, the handler should return @c 1.  If the handler failed,
+ * it should return @c 0.
+ */
+
+typedef int yaml_writer_t(void *data, unsigned char *buffer, size_t length);
+
+/**
+ * The prototype of a tag resolver.
+ *
+ * The resolve handler is called when the parser encounters a new node without
+ * an explicit tag.  The handler should determine the correct tag of the node
+ * basing on the node kind, the path to the node from the document root and,
+ * in the case of the scalar node, the node value.  The handler is also called
+ * by the emitter to determine whether the node tag could be omitted.
+ *
+ * @param[in,out]   data        A pointer to an application data specified by
+ *                              @c yaml_parser_set_writter() or
+ *                              @c yaml_emitter_set_writer().
+ * @param[in]       node        Information about the new node.
+ * @param[out]      tag         The guessed node tag.
+ *
+ * @returns On success, the handler should return @c 1.  If the handler failed,
+ * it should return @c 0.
+ */
+
+typedef int yaml_resolver_t(void *data, yaml_incomplete_node_t *node,
+        yaml_char_t **tag);
+
+/** @} */
+
+/**
+ * @defgroup parser Parser Definitions
+ * @{
+ */
+
+/** The parser object. */
+typedef struct yaml_parser_s yaml_parser_t;
+
+/**
+ * Create a new parser object.
  *
  * This function creates a new parser object.  An application is responsible
- * for destroying the object using the yaml_parser_delete() function.
- *
- * @param[out]      parser  An empty parser object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_parser_initialize(yaml_parser_t *parser);
+ * for destroying the object using the @c yaml_parser_delete() function.
+ *
+ * @returns a new parser object or @c NULL on error.
+ */
+
+YAML_DECLARE(yaml_parser_t *)
+yaml_parser_new(void);
 
 /**
@@ -1325 +1282 @@
 YAML_DECLARE(void)
 yaml_parser_delete(yaml_parser_t *parser);
+
+/**
+ * Get a parser error.
+ *
+ * @param[in]   parser  A parser object.
+ * @param[out]  error   An error object.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_get_error(yaml_parser_t *parser, yaml_error_t *error);
 
 /**
@@ -1334 +1301 @@
  *
  * @param[in,out]   parser  A parser object.
- * @param[in]       input   A source data.
- * @param[in]       size    The length of the source data in bytes.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input_string(yaml_parser_t *parser,
-        const unsigned char *input, size_t size);
+ * @param[in]       buffer  A source data.
+ * @param[in]       length  The length of the source data in bytes.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_string_reader(yaml_parser_t *parser,
+        const unsigned char *buffer, size_t length);
 
 /**
@@ -1353 +1320 @@
 
 YAML_DECLARE(void)
-yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file);
+yaml_parser_set_file_reader(yaml_parser_t *parser, FILE *file);
 
 /**
@@ -1359 +1326 @@
  *
  * @param[in,out]   parser  A parser object.
- * @param[in]       handler A read handler.
+ * @param[in]       reader  A read handler.
  * @param[in]       data    Any application data for passing to the read
  *                          handler.
@@ -1365 +1332 @@
 
 YAML_DECLARE(void)
-yaml_parser_set_input(yaml_parser_t *parser,
-        yaml_read_handler_t *handler, void *data);
+yaml_parser_set_reader(yaml_parser_t *parser,
+        yaml_reader_t *reader, void *data);
+
+#if 0
+
+/**
+ * Set the standard resolve handler.
+ *
+ * The standard resolver recognize the following scalar kinds: !!null, !!bool,
+ * !!str, !!int and !!float.
+ *
+ * @param[in,out]   parser  A parser object.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_standard_resolver(yaml_parser_t *parser);
+
+/**
+ * Set the resolve handler.
+ *
+ * The standard resolver recognize the following scalar kinds: !!null, !!bool,
+ * !!str, !!int and !!float.
+ *
+ * @param[in,out]   parser      A parser object.
+ * @param[in]       resolver    A resolve handler.
+ * @param[in]       data        Any application data for passing to the resolve
+ *                              handler.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_set_resolver(yaml_parser_t *parser,
+        yaml_resolver_t *resolver, void *data);
+
+#endif
 
 /**
@@ -1387 +1386 @@
  *
  * An application is responsible for freeing any buffers associated with the
- * produced token object using the @c yaml_token_delete function.
- *
- * An application must not alternate the calls of yaml_parser_scan() with the
- * calls of yaml_parser_parse() or yaml_parser_load(). Doing this will break
- * the parser.
+ * produced token object using the @c yaml_token_delete() function.
+ *
+ * An application must not alternate the calls of @c yaml_parser_scan() with
+ * the calls of @c yaml_parser_parse() or @c yaml_parser_load(). Doing this
+ * will break the parser.
  *
  * @param[in,out]   parser      A parser object.
@@ -1411 +1410 @@
  *
  * An application is responsible for freeing any buffers associated with the
- * produced event object using the yaml_event_delete() function.
- *
- * An application must not alternate the calls of yaml_parser_parse() with the
- * calls of yaml_parser_scan() or yaml_parser_load(). Doing this will break the
- * parser.
+ * produced event object using the @c yaml_event_delete() function.
+ *
+ * An application must not alternate the calls of @c yaml_parser_parse() with
+ * the calls of @c yaml_parser_scan() or @c yaml_parser_load(). Doing this will
+ * break the parser.
  *
  * @param[in,out]   parser      A parser object.
@@ -1426 +1425 @@
 yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
 
+#if 0
+
 /**
  * Parse the input stream and produce the next YAML document.
@@ -1436 +1437 @@
  *
  * An application is responsible for freeing any data associated with the
- * produced document object using the yaml_document_delete() function.
- *
- * An application must not alternate the calls of yaml_parser_load() with the
- * calls of yaml_parser_scan() or yaml_parser_parse(). Doing this will break
- * the parser.
+ * produced document object using the @c yaml_document_delete() function.
+ *
+ * An application must not alternate the calls of @c yaml_parser_load() with
+ * the calls of @c yaml_parser_scan() or @c yaml_parser_parse(). Doing this
+ * will break the parser.
  *
  * @param[in,out]   parser      A parser object.
@@ -1451 +1452 @@
 yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document);
 
+#endif
+
 /** @} */
 
@@ -1458 +1461 @@
  */
 
-/**
- * The prototype of a write handler.
- *
- * The write handler is called when the emitter needs to flush the accumulated
- * characters to the output.  The handler should write @a size bytes of the
- * @a buffer to the output.
- *
- * @param[in,out]   data        A pointer to an application data specified by
- *                              yaml_emitter_set_output().
- * @param[in]       buffer      The buffer with bytes to be written.
- * @param[in]       size        The size of the buffer.
- *
- * @returns On success, the handler should return @c 1.  If the handler failed,
- * the returned value should be @c 0.
- */
-
-typedef int yaml_write_handler_t(void *data, unsigned char *buffer, size_t size);
-
-/** The emitter states. */
-typedef enum yaml_emitter_state_e {
-    /** Expect STREAM-START. */
-    YAML_EMIT_STREAM_START_STATE,
-    /** Expect the first DOCUMENT-START or STREAM-END. */
-    YAML_EMIT_FIRST_DOCUMENT_START_STATE,
-    /** Expect DOCUMENT-START or STREAM-END. */
-    YAML_EMIT_DOCUMENT_START_STATE,
-    /** Expect the content of a document. */
-    YAML_EMIT_DOCUMENT_CONTENT_STATE,
-    /** Expect DOCUMENT-END. */
-    YAML_EMIT_DOCUMENT_END_STATE,
-    /** Expect the first item of a flow sequence. */
-    YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE,
-    /** Expect an item of a flow sequence. */
-    YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE,
-    /** Expect the first key of a flow mapping. */
-    YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE,
-    /** Expect a key of a flow mapping. */
-    YAML_EMIT_FLOW_MAPPING_KEY_STATE,
-    /** Expect a value for a simple key of a flow mapping. */
-    YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE,
-    /** Expect a value of a flow mapping. */
-    YAML_EMIT_FLOW_MAPPING_VALUE_STATE,
-    /** Expect the first item of a block sequence. */
-    YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE,
-    /** Expect an item of a block sequence. */
-    YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE,
-    /** Expect the first key of a block mapping. */
-    YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE,
-    /** Expect the key of a block mapping. */
-    YAML_EMIT_BLOCK_MAPPING_KEY_STATE,
-    /** Expect a value for a simple key of a block mapping. */
-    YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE,
-    /** Expect a value of a block mapping. */
-    YAML_EMIT_BLOCK_MAPPING_VALUE_STATE,
-    /** Expect nothing. */
-    YAML_EMIT_END_STATE
-} yaml_emitter_state_t;
-
-/**
- * The emitter structure.
- *
- * All members are internal.  Manage the structure using the @c yaml_emitter_
- * family of functions.
- */
-
-typedef struct yaml_emitter_s {
-
-    /**
-     * @name Error handling
-     * @{
-     */
-
-    /** Error type. */
-    yaml_error_type_t error;
-    /** Error description. */
-    const char *problem;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Writer stuff
-     * @{
-     */
-
-    /** Write handler. */
-    yaml_write_handler_t *write_handler;
-
-    /** A pointer for passing to the white handler. */
-    void *write_handler_data;
-
-    /** Standard (string or file) output data. */
-    union {
-        /** String output data. */
-        struct {
-            /** The buffer pointer. */
-            unsigned char *buffer;
-            /** The buffer size. */
-            size_t size;
-            /** The number of written bytes. */
-            size_t *size_written;
-        } string;
-
-        /** File output data. */
-        FILE *file;
-    } output;
-
-    /** The working buffer. */
-    struct {
-        /** The beginning of the buffer. */
-        yaml_char_t *start;
-        /** The end of the buffer. */
-        yaml_char_t *end;
-        /** The current position of the buffer. */
-        yaml_char_t *pointer;
-        /** The last filled position of the buffer. */
-        yaml_char_t *last;
-    } buffer;
-
-    /** The raw buffer. */
-    struct {
-        /** The beginning of the buffer. */
-        unsigned char *start;
-        /** The end of the buffer. */
-        unsigned char *end;
-        /** The current position of the buffer. */
-        unsigned char *pointer;
-        /** The last filled position of the buffer. */
-        unsigned char *last;
-    } raw_buffer;
-
-    /** The stream encoding. */
-    yaml_encoding_t encoding;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Emitter stuff
-     * @{
-     */
-
-    /** If the output is in the canonical style? */
-    int canonical;
-    /** The number of indentation spaces. */
-    int best_indent;
-    /** The preferred width of the output lines. */
-    int best_width;
-    /** Allow unescaped non-ASCII characters? */
-    int unicode;
-    /** The preferred line break. */
-    yaml_break_t line_break;
-
-    /** The stack of states. */
-    struct {
-        /** The beginning of the stack. */
-        yaml_emitter_state_t *start;
-        /** The end of the stack. */
-        yaml_emitter_state_t *end;
-        /** The top of the stack. */
-        yaml_emitter_state_t *top;
-    } states;
-
-    /** The current emitter state. */
-    yaml_emitter_state_t state;
-
-    /** The event queue. */
-    struct {
-        /** The beginning of the event queue. */
-        yaml_event_t *start;
-        /** The end of the event queue. */
-        yaml_event_t *end;
-        /** The head of the event queue. */
-        yaml_event_t *head;
-        /** The tail of the event queue. */
-        yaml_event_t *tail;
-    } events;
-
-    /** The stack of indentation levels. */
-    struct {
-        /** The beginning of the stack. */
-        int *start;
-        /** The end of the stack. */
-        int *end;
-        /** The top of the stack. */
-        int *top;
-    } indents;
-
-    /** The list of tag directives. */
-    struct {
-        /** The beginning of the list. */
-        yaml_tag_directive_t *start;
-        /** The end of the list. */
-        yaml_tag_directive_t *end;
-        /** The top of the list. */
-        yaml_tag_directive_t *top;
-    } tag_directives;
-
-    /** The current indentation level. */
-    int indent;
-
-    /** The current flow level. */
-    int flow_level;
-
-    /** Is it the document root context? */
-    int root_context;
-    /** Is it a sequence context? */
-    int sequence_context;
-    /** Is it a mapping context? */
-    int mapping_context;
-    /** Is it a simple mapping key context? */
-    int simple_key_context;
-
-    /** The current line. */
-    int line;
-    /** The current column. */
-    int column;
-    /** If the last character was a whitespace? */
-    int whitespace;
-    /** If the last character was an indentation character (' ', '-', '?', ':')? */
-    int indention;
-
-    /** Anchor analysis. */
-    struct {
-        /** The anchor value. */
-        yaml_char_t *anchor;
-        /** The anchor length. */
-        size_t anchor_length;
-        /** Is it an alias? */
-        int alias;
-    } anchor_data;
-
-    /** Tag analysis. */
-    struct {
-        /** The tag handle. */
-        yaml_char_t *handle;
-        /** The tag handle length. */
-        size_t handle_length;
-        /** The tag suffix. */
-        yaml_char_t *suffix;
-        /** The tag suffix length. */
-        size_t suffix_length;
-    } tag_data;
-
-    /** Scalar analysis. */
-    struct {
-        /** The scalar value. */
-        yaml_char_t *value;
-        /** The scalar length. */
-        size_t length;
-        /** Does the scalar contain line breaks? */
-        int multiline;
-        /** Can the scalar be expessed in the flow plain style? */
-        int flow_plain_allowed;
-        /** Can the scalar be expressed in the block plain style? */
-        int block_plain_allowed;
-        /** Can the scalar be expressed in the single quoted style? */
-        int single_quoted_allowed;
-        /** Can the scalar be expressed in the literal or folded styles? */
-        int block_allowed;
-        /** The output style. */
-        yaml_scalar_style_t style;
-    } scalar_data;
-
-    /**
-     * @}
-     */
-
-    /**
-     * @name Dumper stuff
-     * @{
-     */
-
-    /** If the stream was already opened? */
-    int opened;
-    /** If the stream was already closed? */
-    int closed;
-
-    /** The information associated with the document nodes. */
-    struct {
-        /** The number of references. */
-        int references;
-        /** The anchor id. */
-        int anchor;
-        /** If the node has been emitted? */
-        int serialized;
-    } *anchors;
-
-    /** The last assigned anchor id. */
-    int last_anchor_id;
-
-    /** The currently emitted document. */
-    yaml_document_t *document;
-
-    /**
-     * @}
-     */
-
-} yaml_emitter_t;
-
-/**
- * Initialize an emitter.
+/** The emitter object. */
+typedef struct yaml_emitter_s yaml_emitter_t;
+
+/**
+ * Create a new emitter object.
  *
  * This function creates a new emitter object.  An application is responsible
- * for destroying the object using the yaml_emitter_delete() function.
- *
- * @param[out]      emitter     An empty parser object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_initialize(yaml_emitter_t *emitter);
+ * for destroying the object using the @c yaml_emitter_delete() function.
+ *
+ * @returns a new emitter object or @c NULL on error.
+ */
+
+YAML_DECLARE(yaml_emitter_t *)
+yaml_emitter_new(void);
 
 /**
@@ -1782 +1484 @@
 YAML_DECLARE(void)
 yaml_emitter_delete(yaml_emitter_t *emitter);
+
+/**
+ * Get an emitter error.
+ *
+ * @param[in]   emitter An emitter object.
+ * @param[out]  error   An error object.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_get_error(yaml_emitter_t *emitter, yaml_error_t *error);
 
 /**
@@ -1789 +1501 @@
  * size @a size.  The emitter will set @a size_written to the number of written
  * bytes.  If the buffer is smaller than required, the emitter produces the
- * YAML_WRITE_ERROR error.
+ * @c YAML_WRITE_ERROR error.
  *
  * @param[in,out]   emitter         An emitter object.
- * @param[in]       output          An output buffer.
- * @param[in]       size            The buffer size.
- * @param[in]       size_written    The pointer to save the number of written
+ * @param[in]       buffer          An output buffer.
+ * @param[in]       length          The pointer to save the number of written
  *                                  bytes.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output_string(yaml_emitter_t *emitter,
-        unsigned char *output, size_t size, size_t *size_written);
+ * @param[in]       capacity        The buffer size.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_string_writer(yaml_emitter_t *emitter,
+        unsigned char *buffer, size_t *length, size_t capacity);
 
 /**
@@ -1813 +1525 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file);
+yaml_emitter_set_file_writer(yaml_emitter_t *emitter, FILE *file);
 
 /**
@@ -1819 +1531 @@
  *
  * @param[in,out]   emitter     An emitter object.
- * @param[in]       handler     A write handler.
+ * @param[in]       writer      A write handler.
  * @param[in]       data        Any application data for passing to the write
  *                              handler.
@@ -1825 +1537 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_output(yaml_emitter_t *emitter,
-        yaml_write_handler_t *handler, void *data);
+yaml_emitter_set_writer(yaml_emitter_t *emitter,
+        yaml_writer_t *writer, void *data);
+
+#if 0
+
+/**
+ * Set the standard resolve handler.
+ *
+ * The standard resolver recognize the following scalar kinds: !!null, !!bool,
+ * !!str, !!int and !!float.
+ *
+ * @param[in,out]   emitter An emitter object.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_standard_resolver(yaml_emitter_t *emitter);
+
+/**
+ * Set the resolve handler.
+ *
+ * The standard resolver recognize the following scalar kinds: !!null, !!bool,
+ * !!str, !!int and !!float.
+ *
+ * @param[in,out]   emitter     An emitter object.
+ * @param[in]       resolver    A resolve handler.
+ * @param[in]       data        Any application data for passing to the resolve
+ *                              handler.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_resolver(yaml_emitter_t *emitter,
+        yaml_resolver_t *resolver, void *data);
+
+#endif
 
 /**
@@ -1842 +1586 @@
  * specification.
  *
- * @param[in,out]   emitter     An emitter object.
- * @param[in]       canonical   If the output is canonical.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical);
+ * @param[in,out]   emitter         An emitter object.
+ * @param[in]       is_canonical    If the output is canonical.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_canonical(yaml_emitter_t *emitter, int is_canonical);
 
 /**
@@ -1873 +1617 @@
  *
  * @param[in,out]   emitter     An emitter object.
- * @param[in]       unicode     If unescaped Unicode characters are allowed.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode);
+ * @param[in]       is_unicode  If unescaped Unicode characters are allowed.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_set_unicode(yaml_emitter_t *emitter, int is_unicode);
 
 /**
@@ -1906 +1650 @@
 yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event);
 
+#if 0
+
 /**
  * Start a YAML stream.
  *
- * This function should be used before yaml_emitter_dump() is called.
+ * This function should be used before the first @c yaml_emitter_dump() is
+ * called.
  *
  * @param[in,out]   emitter     An emitter object.
@@ -1922 +1669 @@
  * Finish a YAML stream.
  *
- * This function should be used after yaml_emitter_dump() is called.
+ * This function should be used after the last @c yaml_emitter_dump() is
+ * called.
  *
  * @param[in,out]   emitter     An emitter object.
@@ -1935 +1683 @@
  * Emit a YAML document.
  *
- * The documen object may be generated using the yaml_parser_load() function
- * or the yaml_document_initialize() function.  The emitter takes the
- * responsibility for the document object and destoys its content after
- * it is emitted. The document object is destroyedeven if the function fails.
+ * The document object may be generated using the @c yaml_parser_load()
+ * function or the @c yaml_document_initialize() function.  The emitter takes
+ * the responsibility for the document object and destoys its content after
+ * it is emitted. The document object is destroyed even if the function fails.
  *
  * @param[in,out]   emitter     An emitter object.
@@ -1949 +1697 @@
 yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document);
 
-/**
- * Flush the accumulated characters to the output.
+#endif
+
+/**
+ * Flush the accumulated characters to the output stream.
  *
  * @param[in,out]   emitter     An emitter object.

libyaml/trunk/src/api.c

@@ -72 +72 @@
 
 YAML_DECLARE(int)
-yaml_string_extend(yaml_char_t **start,
-        yaml_char_t **pointer, yaml_char_t **end)
-{
-    yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
-
-    if (!new_start) return 0;
-
-    memset(new_start + (*end - *start), 0, *end - *start);
-
-    *pointer = new_start + (*pointer - *start);
-    *end = new_start + (*end - *start)*2;
-    *start = new_start;
-
-    return 1;
-}
-
-/*
- * Append a string B to a string A.
+yaml_string_extend(yaml_char_t **buffer, size_t *capacity)
+{
+    yaml_char_t *new_buffer = yaml_realloc(*buffer, (*capacity)*2);
+
+    if (!new_buffer) return 0;
+
+    memset(new_buffer + *capacity, 0, *capacity);
+
+    *buffer = new_buffer;
+    *capacity *= 2;
+
+    return 1;
+}
+
+/*
+ * Append an adjunct string to a base string.
  */
 
 YAML_DECLARE(int)
 yaml_string_join(
-        yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
-        yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end)
-{
-    if (*b_start == *b_pointer)
+        yaml_char_t **base_buffer, size_t *base_pointer, size_t *base_capacity,
+        yaml_char_t *adj_buffer, size_t adj_pointer, size_t adj_capacity)
+{
+    if (!adj_pointer)
         return 1;
 
-    while (*a_end - *a_pointer <= *b_pointer - *b_start) {
-        if (!yaml_string_extend(a_start, a_pointer, a_end))
+    while (*base_capacity - *base_pointer <= adj_pointer) {
+        if (!yaml_string_extend(base_buffer, base_capacity))
             return 0;
     }
 
-    memcpy(*a_pointer, *b_start, *b_pointer - *b_start);
-    *a_pointer += *b_pointer - *b_start;
+    memcpy(*base_buffer+*base_pointer, adj_buffer, adj_pointer);
+    *base_pointer += adj_pointer;
 
     return 1;
@@ -116 +114 @@
 
 YAML_DECLARE(int)
-yaml_stack_extend(void **start, void **top, void **end)
-{
-    void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
-
-    if (!new_start) return 0;
-
-    *top = (char *)new_start + ((char *)*top - (char *)*start);
-    *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
-    *start = new_start;
+yaml_stack_extend(void **list, size_t size, size_t *length, size_t *capacity)
+{
+    void *new_list = yaml_realloc(*list, (*capacity)*size*2);
+
+    if (!new_list) return 0;
+
+    *list = new_list;
+    *capacity *= 2;
 
     return 1;
@@ -134 +131 @@
 
 YAML_DECLARE(int)
-yaml_queue_extend(void **start, void **head, void **tail, void **end)
+yaml_queue_extend(void **list, size_t size,
+        size_t *head, size_t *tail, size_t *capacity)
 {
     /* Check if we need to resize the queue. */
 
-    if (*start == *head && *tail == *end) {
-        void *new_start = yaml_realloc(*start,
-                ((char *)*end - (char *)*start)*2);
-
-        if (!new_start) return 0;
-
-        *head = (char *)new_start + ((char *)*head - (char *)*start);
-        *tail = (char *)new_start + ((char *)*tail - (char *)*start);
-        *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
-        *start = new_start;
+    if (*head == 0 && *tail == *capacity) {
+        void *new_list = yaml_realloc(*list, (*capacity)*size*2);
+
+        if (!new_list) return 0;
+
+        *list = new_list;
+        *capacity *= 2;
     }
 
     /* Check if we need to move the queue at the beginning of the buffer. */
 
-    if (*tail == *end) {
+    if (*tail == *capacity) {
         if (*head != *tail) {
-            memmove(*start, *head, (char *)*tail - (char *)*head);
+            memmove((char *)*list, (char *)*list + (*head)*size,
+                    (*tail-*head)*size);
         }
-        *tail = (char *)*tail - (char *)*head + (char *)*start;
-        *head = *start;
+        *tail -= *head;
+        *head = 0;
     }
 
@@ -168 +164 @@
  */
 
-YAML_DECLARE(int)
-yaml_parser_initialize(yaml_parser_t *parser)
-{
-    assert(parser);     /* Non-NULL parser object expected. */
+YAML_DECLARE(yaml_parser_t *)
+yaml_parser_new(void)
+{
+    yaml_parser_t *parser = yaml_malloc(sizeof(yaml_parser_t));
+
+    if (!parser)
+        return NULL;
 
     memset(parser, 0, sizeof(yaml_parser_t));
-    if (!BUFFER_INIT(parser, parser->raw_buffer, INPUT_RAW_BUFFER_SIZE))
+    if (!BUFFER_INIT(parser, parser->raw_input, RAW_INPUT_BUFFER_CAPACITY))
         goto error;
-    if (!BUFFER_INIT(parser, parser->buffer, INPUT_BUFFER_SIZE))
+    if (!BUFFER_INIT(parser, parser->input, INPUT_BUFFER_CAPACITY))
         goto error;
-    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE))
+    if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_CAPACITY))
         goto error;
-    if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_CAPACITY))
         goto error;
-    if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_CAPACITY))
         goto error;
-    if (!STACK_INIT(parser, parser->states, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->states, INITIAL_STACK_CAPACITY))
         goto error;
-    if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_CAPACITY))
         goto error;
-    if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_SIZE))
+    if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_CAPACITY))
         goto error;
 
-    return 1;
+    return parser;
 
 error:
-
-    BUFFER_DEL(parser, parser->raw_buffer);
-    BUFFER_DEL(parser, parser->buffer);
-    QUEUE_DEL(parser, parser->tokens);
-    STACK_DEL(parser, parser->indents);
-    STACK_DEL(parser, parser->simple_keys);
-    STACK_DEL(parser, parser->states);
-    STACK_DEL(parser, parser->marks);
-    STACK_DEL(parser, parser->tag_directives);
-
-    return 0;
+    yaml_parser_delete(parser);
+
+    return NULL;
 }
 
@@ -216 +207 @@
     assert(parser); /* Non-NULL parser object expected. */
 
-    BUFFER_DEL(parser, parser->raw_buffer);
-    BUFFER_DEL(parser, parser->buffer);
+    BUFFER_DEL(parser, parser->raw_input);
+    BUFFER_DEL(parser, parser->input);
     while (!QUEUE_EMPTY(parser, parser->tokens)) {
-        yaml_token_delete(&DEQUEUE(parser, parser->tokens));
+        yaml_token_destroy(&DEQUEUE(parser, parser->tokens));
     }
     QUEUE_DEL(parser, parser->tokens);
@@ -234 +225 @@
 
     memset(parser, 0, sizeof(yaml_parser_t));
-}
-
-/*
- * String read handler.
+    yaml_free(parser);
+}
+
+/*
+ * Get the current parser error.
+ */
+
+YAML_DECLARE(void)
+yaml_parser_get_error(yaml_parser_t *parser, yaml_error_t *error)
+{
+    assert(parser); /* Non-NULL parser object expected. */
+
+    *error = parser->error;
+}
+
+/*
+ * Standard string read handler.
  */
 
 static int
-yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
-        size_t *size_read)
-{
-    yaml_parser_t *parser = data;
-
-    if (parser->input.string.current == parser->input.string.end) {
-        *size_read = 0;
+yaml_string_reader(void *untyped_data, unsigned char *buffer, size_t capacity,
+        size_t *length)
+{
+    yaml_standard_reader_data_t *data = untyped_data;
+
+    if (data->string.pointer == data->string.capacity) {
+        *length = 0;
         return 1;
     }
 
-    if (size > (size_t)(parser->input.string.end
-                - parser->input.string.current)) {
-        size = parser->input.string.end - parser->input.string.current;
-    }
-
-    memcpy(buffer, parser->input.string.current, size);
-    parser->input.string.current += size;
-    *size_read = size;
-    return 1;
-}
-
-/*
- * File read handler.
+    if (capacity > (size_t)(data->string.capacity - data->string.pointer)) {
+        capacity = data->string.capacity - data->string.pointer;
+    }
+
+    memcpy(buffer, data->string.buffer + data->string.pointer, capacity);
+    data->string.pointer += capacity;
+    *length = capacity;
+    return 1;
+}
+
+/*
+ * Standard file read handler.
  */
 
 static int
-yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
-        size_t *size_read)
-{
-    yaml_parser_t *parser = data;
-
-    *size_read = fread(buffer, 1, size, parser->input.file);
-    return !ferror(parser->input.file);
+yaml_file_reader(void *untyped_data, unsigned char *buffer, size_t capacity,
+        size_t *length)
+{
+    yaml_standard_reader_data_t *data = untyped_data;
+
+    *length = fread(buffer, 1, capacity, data->file);
+    return !ferror(data->file);
 }
 
@@ -281 +284 @@
 
 YAML_DECLARE(void)
-yaml_parser_set_input_string(yaml_parser_t *parser,
-        const unsigned char *input, size_t size)
+yaml_parser_set_string_reader(yaml_parser_t *parser,
+        const unsigned char *buffer, size_t length)
 {
     assert(parser); /* Non-NULL parser object expected. */
-    assert(!parser->read_handler);  /* You can set the source only once. */
-    assert(input);  /* Non-NULL input string expected. */
-
-    parser->read_handler = yaml_string_read_handler;
-    parser->read_handler_data = parser;
-
-    parser->input.string.start = input;
-    parser->input.string.current = input;
-    parser->input.string.end = input+size;
+    assert(!parser->reader);    /* You can set the input handler only once. */
+    assert(buffer); /* Non-NULL input string expected. */
+
+    parser->reader = yaml_string_reader;
+    parser->reader_data = &(parser->standard_reader_data);
+
+    parser->standard_reader_data.string.buffer = (unsigned char *)buffer;
+    parser->standard_reader_data.string.pointer = 0;
+    parser->standard_reader_data.string.capacity = length;
 }
 
@@ -301 +304 @@
 
 YAML_DECLARE(void)
-yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file)
+yaml_parser_set_file_reader(yaml_parser_t *parser, FILE *file)
 {
     assert(parser); /* Non-NULL parser object expected. */
-    assert(!parser->read_handler);  /* You can set the source only once. */
+    assert(!parser->reader);    /* You can set the input handler only once. */
     assert(file);   /* Non-NULL file object expected. */
 
-    parser->read_handler = yaml_file_read_handler;
-    parser->read_handler_data = parser;
-
-    parser->input.file = file;
+    parser->reader = yaml_file_reader;
+    parser->reader_data = &(parser->standard_reader_data);
+
+    parser->standard_reader_data.file = file;
 }
 
@@ -318 +321 @@
 
 YAML_DECLARE(void)
-yaml_parser_set_input(yaml_parser_t *parser,
-        yaml_read_handler_t *handler, void *data)
+yaml_parser_set_reader(yaml_parser_t *parser,
+        yaml_reader_t *reader, void *data)
 {
     assert(parser); /* Non-NULL parser object expected. */
-    assert(!parser->read_handler);  /* You can set the source only once. */
-    assert(handler);    /* Non-NULL read handler expected. */
-
-    parser->read_handler = handler;
-    parser->read_handler_data = data;
+    assert(!parser->reader);    /* You can set the input handler only once. */
+    assert(reader); /* Non-NULL read handler expected. */
+
+    parser->reader = reader;
+    parser->reader_data = data;
 }
 
@@ -337 +340 @@
 {
     assert(parser); /* Non-NULL parser object expected. */
-    assert(!parser->encoding); /* Encoding is already set or detected. */
+    assert(!parser->encoding);  /* Encoding is already set or detected. */
 
     parser->encoding = encoding;
@@ -346 +349 @@
  */
 
-YAML_DECLARE(int)
-yaml_emitter_initialize(yaml_emitter_t *emitter)
+YAML_DECLARE(yaml_emitter_t *)
+yaml_emitter_new(void)
+{
+    yaml_emitter_t *emitter = yaml_malloc(sizeof(yaml_emitter_t));
+
+    if (!emitter)
+        return NULL;
+
+    memset(emitter, 0, sizeof(yaml_emitter_t));
+    if (!BUFFER_INIT(emitter, emitter->output, OUTPUT_BUFFER_CAPACITY))
+        goto error;
+    if (!BUFFER_INIT(emitter, emitter->raw_output, RAW_OUTPUT_BUFFER_CAPACITY))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_CAPACITY))
+        goto error;
+    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_CAPACITY))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_CAPACITY))
+        goto error;
+    if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_CAPACITY))
+        goto error;
+
+    return emitter;
+
+error:
+    yaml_emitter_delete(emitter);
+
+    return NULL;
+}
+
+/*
+ * Destroy an emitter object.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_delete(yaml_emitter_t *emitter)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
 
-    memset(emitter, 0, sizeof(yaml_emitter_t));
-    if (!BUFFER_INIT(emitter, emitter->buffer, OUTPUT_BUFFER_SIZE))
-        goto error;
-    if (!BUFFER_INIT(emitter, emitter->raw_buffer, OUTPUT_RAW_BUFFER_SIZE))
-        goto error;
-    if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_SIZE))
-        goto error;
-    if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE))
-        goto error;
-    if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_SIZE))
-        goto error;
-    if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_SIZE))
-        goto error;
-
-    return 1;
-
-error:
-
-    BUFFER_DEL(emitter, emitter->buffer);
-    BUFFER_DEL(emitter, emitter->raw_buffer);
-    STACK_DEL(emitter, emitter->states);
-    QUEUE_DEL(emitter, emitter->events);
-    STACK_DEL(emitter, emitter->indents);
-    STACK_DEL(emitter, emitter->tag_directives);
-
-    return 0;
-}
-
-/*
- * Destroy an emitter object.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_delete(yaml_emitter_t *emitter)
-{
-    assert(emitter);    /* Non-NULL emitter object expected. */
-
-    BUFFER_DEL(emitter, emitter->buffer);
-    BUFFER_DEL(emitter, emitter->raw_buffer);
+    BUFFER_DEL(emitter, emitter->output);
+    BUFFER_DEL(emitter, emitter->raw_output);
     STACK_DEL(emitter, emitter->states);
     while (!QUEUE_EMPTY(emitter, emitter->events)) {
@@ -405 +405 @@
 
     memset(emitter, 0, sizeof(yaml_emitter_t));
+    yaml_free(emitter);
+}
+
+/*
+ * Get the current emitter error.
+ */
+
+YAML_DECLARE(void)
+yaml_emitter_get_error(yaml_emitter_t *emitter, yaml_error_t *error)
+{
+    assert(emitter);    /* Non-NULL emitter object expected. */
+
+    *error = emitter->error;
 }
 
@@ -412 +425 @@
 
 static int
-yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
-{
-    yaml_emitter_t *emitter = data;
-
-    if (emitter->output.string.size + *emitter->output.string.size_written
-            < size) {
-        memcpy(emitter->output.string.buffer
-                + *emitter->output.string.size_written,
-                buffer,
-                emitter->output.string.size
-                - *emitter->output.string.size_written);
-        *emitter->output.string.size_written = emitter->output.string.size;
-        return 0;
-    }
-
-    memcpy(emitter->output.string.buffer
-            + *emitter->output.string.size_written, buffer, size);
-    *emitter->output.string.size_written += size;
-    return 1;
+yaml_string_writer(void *untyped_data, unsigned char *buffer, size_t length)
+{
+    yaml_standard_writer_data_t *data = untyped_data;
+    int result = 1;
+
+    if (data->string.capacity - data->string.pointer < length) {
+        length = data->string.capacity - data->string.pointer;
+        result = 0;
+    }
+
+    memcpy(data->string.buffer + data->string.pointer, buffer, length);
+    data->string.pointer += length;
+    *data->length += length;
+
+    return result;
 }
 
@@ -438 +447 @@
 
 static int
-yaml_file_write_handler(void *data, unsigned char *buffer, size_t size)
-{
-    yaml_emitter_t *emitter = data;
-
-    return (fwrite(buffer, 1, size, emitter->output.file) == size);
+yaml_file_writer(void *untyped_data, unsigned char *buffer, size_t length)
+{
+    yaml_standard_writer_data_t *data = untyped_data;
+
+    return (fwrite(buffer, 1, length, data->file) == length);
 }
 /*
@@ -449 +458 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_output_string(yaml_emitter_t *emitter,
-        unsigned char *output, size_t size, size_t *size_written)
+yaml_emitter_set_string_writer(yaml_emitter_t *emitter,
+        unsigned char *buffer, size_t *length, size_t capacity)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
-    assert(!emitter->write_handler);    /* You can set the output only once. */
-    assert(output);     /* Non-NULL output string expected. */
-
-    emitter->write_handler = yaml_string_write_handler;
-    emitter->write_handler_data = emitter;
-
-    emitter->output.string.buffer = output;
-    emitter->output.string.size = size;
-    emitter->output.string.size_written = size_written;
-    *size_written = 0;
+    assert(!emitter->writer);   /* You can set the output only once. */
+    assert(buffer);     /* Non-NULL output string expected. */
+
+    emitter->writer = yaml_string_writer;
+    emitter->writer_data = &(emitter->standard_writer_data);
+
+    emitter->standard_writer_data.string.buffer = buffer;
+    emitter->standard_writer_data.string.pointer = 0;
+    emitter->standard_writer_data.string.capacity = capacity;
+    emitter->standard_writer_data.length = length;
+
+    *length = 0;
 }
 
@@ -470 +481 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file)
+yaml_emitter_set_file_writer(yaml_emitter_t *emitter, FILE *file)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
-    assert(!emitter->write_handler);    /* You can set the output only once. */
+    assert(!emitter->writer);   /* You can set the output only once. */
     assert(file);       /* Non-NULL file object expected. */
 
-    emitter->write_handler = yaml_file_write_handler;
-    emitter->write_handler_data = emitter;
-
-    emitter->output.file = file;
+    emitter->writer = yaml_string_writer;
+    emitter->writer_data = &(emitter->standard_writer_data);
+
+    emitter->standard_writer_data.file = file;
 }
 
@@ -487 +498 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_output(yaml_emitter_t *emitter,
-        yaml_write_handler_t *handler, void *data)
+yaml_emitter_set_writer(yaml_emitter_t *emitter,
+        yaml_writer_t *writer, void *data)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
-    assert(!emitter->write_handler);    /* You can set the output only once. */
-    assert(handler);    /* Non-NULL handler object expected. */
-
-    emitter->write_handler = handler;
-    emitter->write_handler_data = data;
+    assert(!emitter->writer);   /* You can set the output only once. */
+    assert(writer); /* Non-NULL handler object expected. */
+
+    emitter->writer = writer;
+    emitter->writer_data = data;
 }
 
@@ -516 +527 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical)
+yaml_emitter_set_canonical(yaml_emitter_t *emitter, int is_canonical)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
 
-    emitter->canonical = (canonical != 0);
+    emitter->is_canonical = (is_canonical != 0);
 }
 
@@ -552 +563 @@
 
 YAML_DECLARE(void)
-yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode)
+yaml_emitter_set_unicode(yaml_emitter_t *emitter, int is_unicode)
 {
     assert(emitter);    /* Non-NULL emitter object expected. */
 
-    emitter->unicode = (unicode != 0);
+    emitter->is_unicode = (is_unicode != 0);
 }
 
@@ -572 +583 @@
 
 /*
+ * Allocate a token object.
+ */
+
+YAML_DECLARE(yaml_token_t *)
+yaml_token_new(void)
+{
+    yaml_token_t *token = yaml_malloc(sizeof(yaml_token_t));
+
+    if (!token)
+        return NULL;
+
+    memset(token, 0, sizeof(yaml_token_t));
+
+    return token;
+}
+
+/*
+ * Deallocate a token object.
+ */
+
+YAML_DECLARE(void)
+yaml_token_delete(yaml_token_t *token)
+{
+    assert(token);  /* Non-NULL token object expected. */
+
+    yaml_token_destroy(token);
+    yaml_free(token);
+}
+
+/*
+ * Duplicate a token object.
+ */
+
+YAML_DECLARE(int)
+yaml_token_duplicate(yaml_token_t *token, yaml_token_t *model)
+{
+    assert(token);  /* Non-NULL token object is expected. */
+    assert(model);  /* Non-NULL model token object is expected. */
+
+    memset(token, 0, sizeof(yaml_token_t));
+
+    token->type = model->type;
+    token->start_mark = model->start_mark;
+    token->end_mark = model->end_mark;
+
+    switch (token->type)
+    {
+        case YAML_STREAM_START_TOKEN:
+            token->data.stream_start.encoding =
+                model->data.stream_start.encoding;
+            break;
+
+        case YAML_VERSION_DIRECTIVE_TOKEN:
+            token->data.version_directive.major =
+                model->data.version_directive.major;
+            token->data.version_directive.minor =
+                model->data.version_directive.minor;
+            break;
+
+        case YAML_TAG_DIRECTIVE_TOKEN:
+            if (!(token->data.tag_directive.handle =
+                        yaml_strdup(model->data.tag_directive.handle)))
+                goto error;
+            if (!(token->data.tag_directive.prefix =
+                        yaml_strdup(model->data.tag_directive.prefix)))
+                goto error;
+            break;
+
+        case YAML_ALIAS_TOKEN:
+            if (!(token->data.alias.value =
+                        yaml_strdup(model->data.alias.value)))
+                goto error;
+            break;
+
+        case YAML_ANCHOR_TOKEN:
+            if (!(token->data.anchor.value =
+                        yaml_strdup(model->data.anchor.value)))
+                goto error;
+            break;
+
+        case YAML_TAG_TOKEN:
+            if (!(token->data.tag.handle = yaml_strdup(model->data.tag.handle)))
+                goto error;
+            if (!(token->data.tag.suffix = yaml_strdup(model->data.tag.suffix)))
+                goto error;
+            break;
+
+        case YAML_SCALAR_TOKEN:
+            if (!(token->data.scalar.value =
+                        yaml_malloc(model->data.scalar.length+1)))
+                goto error;
+            memcpy(token->data.scalar.value, model->data.scalar.value,
+                    model->data.scalar.length+1);
+            token->data.scalar.length = model->data.scalar.length;
+            break;
+
+        default:
+            break;
+    }
+
+    return 1;
+
+error:
+    yaml_token_destroy(token);
+
+    return 0;
+}
+
+/*
  * Destroy a token object.
  */
 
 YAML_DECLARE(void)
-yaml_token_delete(yaml_token_t *token)
+yaml_token_destroy(yaml_token_t *token)
 {
     assert(token);  /* Non-NULL token object expected. */
@@ -618 +738 @@
 
 static int
-yaml_check_utf8(yaml_char_t *start, size_t length)
-{
-    yaml_char_t *end = start+length;
-    yaml_char_t *pointer = start;
-
-    while (pointer < end) {
+yaml_valid_utf8(const yaml_char_t *buffer, size_t length)
+{
+    size_t pointer = 0;
+
+    while (pointer < length) {
         unsigned char octet;
         unsigned int width;
@@ -629 +748 @@
         size_t k;
 
-        octet = pointer[0];
+        octet = buffer[pointer];
         width = (octet & 0x80) == 0x00 ? 1 :
                 (octet & 0xE0) == 0xC0 ? 2 :
@@ -639 +758 @@
                 (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
         if (!width) return 0;
-        if (pointer+width > end) return 0;
+        if (pointer+width > length) return 0;
         for (k = 1; k < width; k ++) {
-            octet = pointer[k];
+            octet = buffer[pointer+k];
             if ((octet & 0xC0) != 0x80) return 0;
             value = (value << 6) + (octet & 0x3F);
@@ -657 +776 @@
 
 /*
+ * Allocate an event object.
+ */
+
+YAML_DECLARE(yaml_event_t *)
+yaml_event_new(void)
+{
+    yaml_event_t *event = yaml_malloc(sizeof(yaml_event_t));
+
+    if (!event)
+        return NULL;
+
+    memset(event, 0, sizeof(yaml_event_t));
+
+    return event;
+}
+
+/*
+ * Deallocate an event object.
+ */
+
+YAML_DECLARE(void)
+yaml_event_delete(yaml_event_t *event)
+{
+    assert(event);  /* Non-NULL event object expected. */
+
+    yaml_event_destroy(event);
+    yaml_free(event);
+}
+
+/*
+ * Duplicate an event object.
+ */
+
+YAML_DECLARE(int)
+yaml_event_duplicate(yaml_event_t *event, yaml_event_t *model)
+{
+    struct {
+        yaml_error_t error;
+    } self;
+
+    assert(event);  /* Non-NULL event object is expected. */
+    assert(model);  /* Non-NULL model event object is expected. */
+
+    memset(event, 0, sizeof(yaml_event_t));
+
+    event->type = model->type;
+    event->start_mark = model->start_mark;
+    event->end_mark = model->end_mark;
+
+    switch (event->type)
+    {
+        case YAML_STREAM_START_EVENT:
+            event->data.stream_start.encoding =
+                model->data.stream_start.encoding;
+            break;
+
+        case YAML_DOCUMENT_START_EVENT:
+            if (model->data.document_start.version_directive) {
+                if (!(event->data.document_start.version_directive =
+                            yaml_malloc(sizeof(yaml_version_directive_t))))
+                    goto error;
+                *event->data.document_start.version_directive =
+                    *model->data.document_start.version_directive;
+            }
+            if (model->data.document_start.tag_directives.length) {
+                yaml_tag_directive_t *tag_directives =
+                    model->data.document_start.tag_directives.list;
+                if (!STACK_INIT(&self, event->data.document_start.tag_directives,
+                            model->data.document_start.tag_directives.capacity))
+                    goto error;
+                while (event->data.document_start.tag_directives.length !=
+                        model->data.document_start.tag_directives.length) {
+                    yaml_tag_directive_t value;
+                    value.handle = yaml_strdup(tag_directives->handle);
+                    value.prefix = yaml_strdup(tag_directives->prefix);
+                    PUSH(&self, event->data.document_start.tag_directives, value);
+                    if (!value.handle || !value.prefix)
+                        goto error;
+                    tag_directives ++;
+                }
+            }
+            event->data.document_start.is_implicit =
+                model->data.document_start.is_implicit;
+            break;
+
+        case YAML_DOCUMENT_END_EVENT:
+            event->data.document_end.is_implicit =
+                model->data.document_end.is_implicit;
+
+        case YAML_ALIAS_EVENT:
+            if (!(event->data.alias.anchor =
+                        yaml_strdup(model->data.alias.anchor)))
+                goto error;
+            break;
+
+        case YAML_SCALAR_EVENT:
+            if (model->data.scalar.anchor &&
+                    !(event->data.scalar.anchor =
+                        yaml_strdup(model->data.scalar.anchor)))
+                goto error;
+            if (event->data.scalar.tag &&
+                    !(event->data.scalar.tag =
+                        yaml_strdup(model->data.scalar.tag)))
+                goto error;
+            if (!(event->data.scalar.value =
+                        yaml_malloc(model->data.scalar.length+1)))
+                goto error;
+            memcpy(event->data.scalar.value, model->data.scalar.value,
+                    model->data.scalar.length+1);
+            event->data.scalar.length = model->data.scalar.length;
+            event->data.scalar.is_plain_implicit =
+                model->data.scalar.is_plain_implicit;
+            event->data.scalar.is_quoted_implicit =
+                model->data.scalar.is_quoted_implicit;
+            event->data.scalar.style = model->data.scalar.style;
+            break;
+
+        case YAML_SEQUENCE_START_EVENT:
+            if (model->data.sequence_start.anchor &&
+                    !(event->data.sequence_start.anchor =
+                        yaml_strdup(model->data.sequence_start.anchor)))
+                goto error;
+            if (event->data.sequence_start.tag &&
+                    !(event->data.sequence_start.tag =
+                        yaml_strdup(model->data.sequence_start.tag)))
+                goto error;
+            event->data.sequence_start.is_implicit =
+                model->data.sequence_start.is_implicit;
+            event->data.sequence_start.style =
+                model->data.sequence_start.style;
+            break;
+
+        case YAML_MAPPING_START_EVENT:
+            if (model->data.mapping_start.anchor &&
+                    !(event->data.mapping_start.anchor =
+                        yaml_strdup(model->data.mapping_start.anchor)))
+                goto error;
+            if (event->data.mapping_start.tag &&
+                    !(event->data.mapping_start.tag =
+                        yaml_strdup(model->data.mapping_start.tag)))
+                goto error;
+            event->data.mapping_start.is_implicit =
+                model->data.mapping_start.is_implicit;
+            event->data.mapping_start.style =
+                model->data.mapping_start.style;
+            break;
+
+        default:
+            break;
+    }
+
+    return 1;
+
+error:
+    yaml_event_destroy(event);
+
+    return 0;
+}
+
+/*
  * Create STREAM-START.
  */
 
 YAML_DECLARE(int)
-yaml_stream_start_event_initialize(yaml_event_t *event,
+yaml_event_create_stream_start(yaml_event_t *event,
         yaml_encoding_t encoding)
 {
@@ -678 +957 @@
 
 YAML_DECLARE(int)
-yaml_stream_end_event_initialize(yaml_event_t *event)
+yaml_event_create_stream_end(yaml_event_t *event)
 {
     yaml_mark_t mark = { 0, 0, 0 };
@@ -694 +973 @@
 
 YAML_DECLARE(int)
-yaml_document_start_event_initialize(yaml_event_t *event,
-        yaml_version_directive_t *version_directive,
-        yaml_tag_directive_t *tag_directives_start,
-        yaml_tag_directive_t *tag_directives_end,
-        int implicit)
+yaml_event_create_document_start(yaml_event_t *event,
+        const yaml_version_directive_t *version_directive,
+        const yaml_tag_directive_t *tag_directives,
+        int is_implicit)
 {
     struct {
-        yaml_error_type_t error;
-    } context;
+        yaml_error_t error;
+    } self;
     yaml_mark_t mark = { 0, 0, 0 };
     yaml_version_directive_t *version_directive_copy = NULL;
     struct {
-        yaml_tag_directive_t *start;
-        yaml_tag_directive_t *end;
-        yaml_tag_directive_t *top;
-    } tag_directives_copy = { NULL, NULL, NULL };
-    yaml_tag_directive_t value = { NULL, NULL };
+        yaml_tag_directive_t *list;
+        size_t length;
+        size_t capacity;
+    } tag_directives_copy = { NULL, 0, 0 };
 
     assert(event);          /* Non-NULL event object is expected. */
-    assert((tag_directives_start && tag_directives_end) ||
-            (tag_directives_start == tag_directives_end));
-                            /* Valid tag directives are expected. */
 
     if (version_directive) {
         version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
         if (!version_directive_copy) goto error;
-        version_directive_copy->major = version_directive->major;
-        version_directive_copy->minor = version_directive->minor;
-    }
-
-    if (tag_directives_start != tag_directives_end) {
-        yaml_tag_directive_t *tag_directive;
-        if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
+        *version_directive_copy = *version_directive;
+    }
+
+    if (tag_directives && (tag_directives->handle || tag_directives->prefix)) {
+        if (!STACK_INIT(&self, tag_directives_copy, INITIAL_STACK_CAPACITY))
             goto error;
-        for (tag_directive = tag_directives_start;
-                tag_directive != tag_directives_end; tag_directive ++) {
-            assert(tag_directive->handle);
-            assert(tag_directive->prefix);
-            if (!yaml_check_utf8(tag_directive->handle,
-                        strlen((char *)tag_directive->handle)))
-                goto error;
-            if (!yaml_check_utf8(tag_directive->prefix,
-                        strlen((char *)tag_directive->prefix)))
-              &nb