Changes between Version 9 and Version 10 of LibYAML

Timestamp:

07/19/06 14:09:56 (7 years ago)

Author:

xi

Comment:

Update the API synopsis.

LibYAML

@@ -99 +99 @@
    * `encoding` - the document encoding; `utf-8|utf-16-le|utf-16-be`.
  * `DOCUMENT-START`
-   * `version` - the version specified with the `%YAML` directive; the only valid value is `1.1`; may be `NULL`.
-   * `tag` - a set of tag handles and the corresponding tag prefixes specified with the `%TAG` directive;
+   * `version_directive` - the version specified with the `%YAML` directive; the only valid value is `1.1`; may be `NULL`.
+   * `tag_directives` - a set of tag handles and the corresponding tag prefixes specified with the `%TAG` directive;
      tag handles should match `!|!!|![0-9a-zA-Z_-]+!` while tag prefixes should be prefixes of valid local
      or global tags; may be `NULL`.
@@ -127 +127 @@
 {{{
 #!c
-#include <yaml/yaml.h>
-
-yaml_parser_t *parser;
-yaml_event_t *event;
+#include <yaml.h>
+
+yaml_parser_t parser;
+yaml_event_t event;
 
 /* Create the Parser object. */
-parser = yaml_parser_new();
+yaml_parser_initialize(&parser);
 
 /* Set a string input. */
@@ -139 +139 @@
 size_t length = strlen(input);
 
-yaml_parser_set_string_input(parser, input, length);
+yaml_parser_set_string_input(&parser, input, length);
 
 /* Set a file input. */
 FILE *input = fopen("...", "rb");
 
-yaml_parser_set_file_input(parser, input);
+yaml_parser_set_file_input(&parser, input);
 
 /* Set a generic reader. */
@@ -156 +156 @@
 }
 
-yaml_parser_set_input(parser, read_handler, ext);
+yaml_parser_set_input(&parser, read_handler, ext);
 
 /* Read the event sequence. */
 do {
+    int result;
+
     /* Get the next event. */
-    event = yaml_parser_parse(parser);
-
-    if (!event) goto error;
+    result = yaml_parser_parse(&parser, &event);
+
+    if (!result) goto error;
 
     /*
@@ -171 +173 @@
     */
 
-    /* The application is responsible for destroing the event object. */
-    yaml_event_delete(event);
-
-} while(event->type != YAML_STREAM_END_EVENT);
+    /* The application is responsible for destroying the event object. */
+    yaml_event_delete(&event);
+
+} while(event.type != YAML_STREAM_END_EVENT);
 
 /* Destroy the Parser object. */
-yaml_parser_delete(parser);
+yaml_parser_delete(&parser);
 
 /* On error. */
-error:
+error: /* FIXME */
 
 /* Error type: YAML_READER_ERROR, YAML_SCANNER_ERROR, YAML_PARSER_ERROR. */
@@ -214 +216 @@
 {{{
 #!c
-#include <yaml/yaml.h>
-
-yaml_emitter_t *emitter;
-yaml_event_t *event;
+#include <yaml.h>
+
+yaml_emitter_t emitter;
 
 /* Create the Emitter object. */
-emitter = yaml_emitter_new();
+yaml_emitter_initialize(&emitter);
 
 /* Set a file output. */
 FILE *output = fopen("...", "wb");
 
-yaml_emitter_set_file_output(emitter, output);
+yaml_emitter_set_file_output(&emitter, output);
 
 /* Set a generic writer. */
@@ -238 +239 @@
 }
 
-yaml_emitter_set_output(emitter, write_handler, ext);
-
-/* Create the STREAM-START event. */
-event = yaml_event_new_stream_start(YAML_UTF8_ENCODING);
-
-/* Emit the event. The application is no longer responsible for the event object. */
-int result = yaml_emitter_emit(emitter, event);
+yaml_emitter_set_output(&emitter, write_handler, ext);
+
+/* Emit the STREAM-START event. */
+int result = yaml_emitter_emit_stream_start(&emitter, YAML_UTF8_ENCODING);
 
 if (!result) goto error;
@@ -254 +252 @@
 */
 
-/* Create and emit the STREAM-END event. */
-if (!yaml_emitter_emit(emitter, yaml_event_new_event_end())) goto error;
+/* EMIT the STREAM-END event. */
+if (!yaml_emitter_emit_stream_end(&emitter) goto error;
 
 /* Destroy the Emitter object. */
-yaml_emitter_delete(emitter);
+yaml_emitter_delete(&emitter);
 
 /* On error. */
-error:
+error: /* FIXME */
 
 /* Error type: YAML_WRITER_ERROR, YAML_EMITTER_ERROR. */