Changeset 272

Timestamp:

07/31/08 16:24:39 (4 years ago)

Author:

xi

Message:

Tagged the 0.1.1 release (better later than never).

Location:

libyaml

Files:

• tags/0.1.1 (copied) (copied from libyaml/branches/stable)
• tags/0.1.1/configure.ac (copied) (copied from libyaml/branches/stable/configure.ac)
• trunk/src/dumper.c (modified) (8 diffs)
• trunk/src/yaml_private.h (modified) (2 diffs)

libyaml/trunk/src/dumper.c

@@ -1 +1 @@
 
 #include "yaml_private.h"
-
-#if 0
 
 /*
@@ -67 +65 @@
     yaml_mark_t mark = { 0, 0, 0 };
 
-    assert(emitter);            /* Non-NULL emitter object is required. */
-    assert(!emitter->opened);   /* Emitter should not be opened yet. */
+    assert(emitter);                /* Non-NULL emitter object is required. */
+    assert(!emitter->is_opened);    /* Emitter should not be opened yet. */
 
     STREAM_START_EVENT_INIT(event, YAML_ANY_ENCODING, mark, mark);
@@ -76 +74 @@
     }
 
-    emitter->opened = 1;
+    emitter->is_opened = 1;
 
     return 1;
@@ -92 +90 @@
 
     assert(emitter);            /* Non-NULL emitter object is required. */
-    assert(emitter->opened);    /* Emitter should be opened. */
-
-    if (emitter->closed) return 1;
+    assert(emitter->is_opened); /* Emitter should be opened. */
+
+    if (emitter->is_closed) return 1;
 
     STREAM_END_EVENT_INIT(event, mark, mark);
@@ -102 +100 @@
     }
 
-    emitter->closed = 1;
+    emitter->is_closed = 1;
 
     return 1;
@@ -122 +120 @@
     emitter->document = document;
 
-    if (!emitter->opened) {
+    if (!emitter->is_opened) {
         if (!yaml_emitter_open(emitter)) goto error;
     }
 
-    if (STACK_EMPTY(emitter, document->nodes)) {
+    if (document->type == YAML_DOCUMENT)
+    {
+        assert(emitter->is_opened); /* Emitter should be opened. */
+
+        if (STACK_EMPTY(emitter, emitter->nodes)) {
+            SERIALIZER_ERROR_INIT(emitter, "root node is not specified");
+            goto error;
+        }
+
+        emitter->anchors = yaml_malloc(sizeof(*(emitter->anchors))
+                * (document->nodes.length));
+        if (!emitter->anchors) goto error;
+        memset(emitter->anchors, 0, sizeof(*(emitter->anchors))
+                * (document->nodes.length));
+
+        DOCUMENT_START_EVENT_INIT(event, document->version_directive,
+                document->tag_directives.list, document->tag_directives.length,
+                document->tag_directives.capacity,
+                document->start_implicit, mark, mark);
+        if (!yaml_emitter_emit(emitter, &event)) goto error;
+
+        yaml_emitter_anchor_node(emitter, 0);
+        if (!yaml_emitter_dump_node(emitter, 0)) goto error;
+
+        DOCUMENT_END_EVENT_INIT(event, document->end_implicit, mark, mark);
+        if (!yaml_emitter_emit(emitter, &event)) goto error;
+    }
+
+    if (!document->type) {
         if (!yaml_emitter_close(emitter)) goto error;
-        yaml_emitter_delete_document_and_anchors(emitter);
-        return 1;
-    }
-
-    assert(emitter->opened);    /* Emitter should be opened. */
-
-    emitter->anchors = yaml_malloc(sizeof(*(emitter->anchors))
-            * (document->nodes.top - document->nodes.start));
-    if (!emitter->anchors) goto error;
-    memset(emitter->anchors, 0, sizeof(*(emitter->anchors))
-            * (document->nodes.top - document->nodes.start));
-
-    DOCUMENT_START_EVENT_INIT(event, document->version_directive,
-            document->tag_directives.start, document->tag_directives.end,
-            document->start_implicit, mark, mark);
-    if (!yaml_emitter_emit(emitter, &event)) goto error;
-
-    yaml_emitter_anchor_node(emitter, 1);
-    if (!yaml_emitter_dump_node(emitter, 1)) goto error;
-
-    DOCUMENT_END_EVENT_INIT(event, document->end_implicit, mark, mark);
-    if (!yaml_emitter_emit(emitter, &event)) goto error;
+    }
 
     yaml_emitter_delete_document_and_anchors(emitter);
@@ -244 +249 @@
  */
 
-#define ANCHOR_TEMPLATE         "id%03d"
+#define ANCHOR_TEMPLATE         "_%03d"
 #define ANCHOR_TEMPLATE_LENGTH  16
 
@@ -395 +400 @@
 }
 
-#endif
-

libyaml/trunk/src/yaml_private.h

@@ -1229 +1229 @@
 
 /*
+ * The information of a node being emitted.
+ */
+
+struct typedef yaml_node_data_s {
+    /* The node id. */
+    int id;
+    /* The collection iterator. */
+    int index;
+} yaml_node_data_t;
+
+/*
  * The structure that holds data used by the file and string readers.
  */
@@ -1241 +1252 @@
 
 /*
- * The internals emitter structure.
+ * The internal emitter structure.
  */