Fix some bugs in canonical examples.

git-svn-id: http://svn.pyyaml.org/branches/pyyaml3000@42 18f92427-320e-0410-9341-c67f048884a3

16 files changed, 23 insertions, 23 deletions

diff --git a/tests/data/spec-05-06.canonical b/tests/data/spec-05-06.canonical
index bdf4123..4f30c11 100644
--- a/tests/data/spec-05-06.canonical
+++ b/tests/data/spec-05-06.canonical
@@ -2,7 +2,7 @@
 ---
 !!map {
   ? !!str "anchored"
-  : !local &A1 "value",
+  : &A1 !local "value",
   ? !!str "alias"
   : *A1,
 }
diff --git a/tests/data/spec-05-14.canonical b/tests/data/spec-05-14.canonical
index d30e994..4bff01c 100644
--- a/tests/data/spec-05-14.canonical
+++ b/tests/data/spec-05-14.canonical
@@ -1,7 +1,7 @@
 %YAML 1.1
 ---
 "Fun with \x5C
- \x22 \x07 \x08 \x1B \0C
+ \x22 \x07 \x08 \x1B \x0C
  \x0A \x0D \x09 \x0B \x00
  \x20 \xA0 \x85 \u2028 \u2029
  A A A"
diff --git a/tests/data/spec-06-07.canonical b/tests/data/spec-06-07.canonical
index 5d3cab6..11357e4 100644
--- a/tests/data/spec-06-07.canonical
+++ b/tests/data/spec-06-07.canonical
@@ -1,6 +1,6 @@
 %YAML 1.1
 ---
-!!seq {
+!!seq [
   !!str "foo\nbar",
   !!str "foo\n\nbar"
-}
+]
diff --git a/tests/data/spec-07-08.canonical b/tests/data/spec-07-08.canonical
index 5e88c74..703aa7b 100644
--- a/tests/data/spec-07-08.canonical
+++ b/tests/data/spec-07-08.canonical
@@ -2,6 +2,6 @@
 ---
 !!seq [
   !<!foo> "bar",
-  !<tag:yaml.org,2002:str> "string"
+  !<tag:yaml.org,2002:str> "string",
   !<tag:ben-kiki.org,2000:type> "baz"
 ]
diff --git a/tests/data/spec-08-01.canonical b/tests/data/spec-08-01.canonical
index 5361dc5..69e4161 100644
--- a/tests/data/spec-08-01.canonical
+++ b/tests/data/spec-08-01.canonical
@@ -3,6 +3,6 @@
 !!map {
   ? &A1 !!str "foo"
   : !!str "bar",
-  ? !!str &A2 "baz"
-  : *a1
+  ? &A2 !!str "baz"
+  : *A1
 }
diff --git a/tests/data/spec-08-09.canonical b/tests/data/spec-08-09.canonical
index 501cc04..3805daf 100644
--- a/tests/data/spec-08-09.canonical
+++ b/tests/data/spec-08-09.canonical
@@ -10,12 +10,12 @@
         ? !!str "double"
         : !!str "some text"
   } },
-  ? !!str "collections": : !!map {
+  ? !!str "collections" : !!map {
     ? !!str "sequence" : !!seq [
-      ? !!str "entry",
-      : !!map {
+      !!str "entry",
+      !!map {
         ? !!str "key" : !!str "value"
     } ],
-    ? !!str "mapping": : !!map {
+    ? !!str "mapping" : !!map {
       ? !!str "key" : !!str "value"
 } } }
diff --git a/tests/data/spec-08-13.canonical b/tests/data/spec-08-13.canonical
index 62d9f22..0a6e782 100644
--- a/tests/data/spec-08-13.canonical
+++ b/tests/data/spec-08-13.canonical
@@ -3,6 +3,6 @@
 !!map {
   ? !!str "foo"
   : !!str "",
-  ? !!str "",
+  ? !!str ""
   : !!str "bar",
 }
diff --git a/tests/data/spec-08-15.canonical b/tests/data/spec-08-15.canonical
index 114c667..2706dae 100644
--- a/tests/data/spec-08-15.canonical
+++ b/tests/data/spec-08-15.canonical
@@ -5,7 +5,7 @@
   !!map {
     ? !!str "foo"
     : !!str "",
-    ? !!str "",
+    ? !!str ""
     : !!str "bar",
   }
 ]
diff --git a/tests/data/spec-09-15.canonical b/tests/data/spec-09-15.canonical
index 20f60ed..df02040 100644
--- a/tests/data/spec-09-15.canonical
+++ b/tests/data/spec-09-15.canonical
@@ -3,7 +3,7 @@
 !!map {
   ? !!str "---"
   : !!str "foo",
-  ? !!str "...",
+  ? !!str "..."
   : !!str "bar"
 }
 %YAML 1.1
diff --git a/tests/data/spec-09-21.canonical b/tests/data/spec-09-21.error
index 1379ca5..1379ca5 100644
--- a/tests/data/spec-09-21.canonical
+++ b/tests/data/spec-09-21.error
diff --git a/tests/data/spec-09-23.canonical b/tests/data/spec-09-23.canonical
index ef248ea..c4444ca 100644
--- a/tests/data/spec-09-23.canonical
+++ b/tests/data/spec-09-23.canonical
@@ -1,10 +1,10 @@
 %YAML 1.1
 ---
-!!seq [
+!!map {
   ? !!str "strip"
   : !!str "# text",
   ? !!str "clip"
   : !!str "# text\n",
   ? !!str "keep"
   : !!str "# text\L\n",
-]
+}
diff --git a/tests/data/spec-09-24.canonical b/tests/data/spec-09-24.canonical
index 4ce926a..45a99b0 100644
--- a/tests/data/spec-09-24.canonical
+++ b/tests/data/spec-09-24.canonical
@@ -1,10 +1,10 @@
 %YAML 1.1
 ---
-!!seq [
+!!map {
   ? !!str "strip"
   : !!str "",
   ? !!str "clip"
   : !!str "",
   ? !!str "keep"
   : !!str "\n",
-]
+}
diff --git a/tests/data/spec-10-05.canonical b/tests/data/spec-10-05.canonical
index a872ba2..6fc6458 100644
--- a/tests/data/spec-10-05.canonical
+++ b/tests/data/spec-10-05.canonical
@@ -6,7 +6,7 @@
   !!seq [
     !!str "one",
     !!str "two",
-  ]
+  ],
   !!map {
     ? !!str "one"
     : !!str "two",
diff --git a/tests/data/spec-10-08.canonical b/tests/data/spec-10-08.error
index 3979e1f..3979e1f 100644
--- a/tests/data/spec-10-08.canonical
+++ b/tests/data/spec-10-08.error
diff --git a/tests/data/spec-10-12.canonical b/tests/data/spec-10-12.canonical
index 4197597..a95dd40 100644
--- a/tests/data/spec-10-12.canonical
+++ b/tests/data/spec-10-12.canonical
@@ -3,7 +3,7 @@
 !!map {
   ? !!str "block"
   : !!map {
-    ? !!str "key",
+    ? !!str "key"
     : !!str "value"
   }
 }
diff --git a/tests/data/spec-10-15.canonical b/tests/data/spec-10-15.canonical
index ffcffaf..85fbbd0 100644
--- a/tests/data/spec-10-15.canonical
+++ b/tests/data/spec-10-15.canonical
@@ -1,9 +1,9 @@
 %YAML 1.1
 ---
-!!seq {
+!!seq [
   !!map {
     ? !!str "sun"
-    : !!str "yellow",
+    : !!str "yellow"
   },
   !!map {
     ? !!map {
@@ -15,4 +15,4 @@
       : !!str "white"
     }
   }
-}
+]