Changeset 42

Timestamp:

02/14/06 19:30:33 (7 years ago)

Author:

xi

Message:

Fix some bugs in canonical examples.

Location:

branches/pyyaml3000/tests/data

Files:

• spec-05-06.canonical (modified) (1 diff)
• spec-05-14.canonical (modified) (1 diff)
• spec-06-07.canonical (modified) (1 diff)
• spec-07-08.canonical (modified) (1 diff)
• spec-08-01.canonical (modified) (1 diff)
• spec-08-09.canonical (modified) (1 diff)
• spec-08-13.canonical (modified) (1 diff)
• spec-08-15.canonical (modified) (1 diff)
• spec-09-15.canonical (modified) (1 diff)
• spec-09-21.error (moved) (moved from branches/pyyaml3000/tests/data/spec-09-21.canonical)
• spec-09-23.canonical (modified) (2 diffs)
• spec-09-24.canonical (modified) (2 diffs)
• spec-10-05.canonical (modified) (1 diff)
• spec-10-08.error (moved) (moved from branches/pyyaml3000/tests/data/spec-10-08.canonical)
• spec-10-12.canonical (modified) (1 diff)
• spec-10-15.canonical (modified) (2 diffs)

branches/pyyaml3000/tests/data/spec-05-06.canonical

@@ -3 +3 @@
 !!map {
   ? !!str "anchored"
-  : !local &A1 "value",
+  : &A1 !local "value",
   ? !!str "alias"
   : *A1,

branches/pyyaml3000/tests/data/spec-05-14.canonical

@@ -2 +2 @@
 ---
 "Fun with \x5C
- \x22 \x07 \x08 \x1B \0C
+ \x22 \x07 \x08 \x1B \x0C
  \x0A \x0D \x09 \x0B \x00
  \x20 \xA0 \x85 \u2028 \u2029

branches/pyyaml3000/tests/data/spec-06-07.canonical

@@ -1 +1 @@
 %YAML 1.1
 ---
-!!seq {
+!!seq [
   !!str "foo\nbar",
   !!str "foo\n\nbar"
-}
+]

branches/pyyaml3000/tests/data/spec-07-08.canonical

@@ -3 +3 @@
 !!seq [
   !<!foo> "bar",
-  !<tag:yaml.org,2002:str> "string"
+  !<tag:yaml.org,2002:str> "string",
   !<tag:ben-kiki.org,2000:type> "baz"
 ]

branches/pyyaml3000/tests/data/spec-08-01.canonical

@@ -4 +4 @@
   ? &A1 !!str "foo"
   : !!str "bar",
-  ? !!str &A2 "baz"
-  : *a1
+  ? &A2 !!str "baz"
+  : *A1
 }

branches/pyyaml3000/tests/data/spec-08-09.canonical

@@ -11 +11 @@
         : !!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"
 } } }

branches/pyyaml3000/tests/data/spec-08-13.canonical

@@ -4 +4 @@
   ? !!str "foo"
   : !!str "",
-  ? !!str "",
+  ? !!str ""
   : !!str "bar",
 }

branches/pyyaml3000/tests/data/spec-08-15.canonical

@@ -6 +6 @@
     ? !!str "foo"
     : !!str "",
-    ? !!str "",
+    ? !!str ""
     : !!str "bar",
   }

branches/pyyaml3000/tests/data/spec-09-15.canonical

@@ -4 +4 @@
   ? !!str "---"
   : !!str "foo",
-  ? !!str "...",
+  ? !!str "..."
   : !!str "bar"
 }

branches/pyyaml3000/tests/data/spec-09-23.canonical

@@ -1 +1 @@
 %YAML 1.1
 ---
-!!seq [
+!!map {
   ? !!str "strip"
   : !!str "# text",
@@ -8 +8 @@
   ? !!str "keep"
   : !!str "# text\L\n",
-]
+}

branches/pyyaml3000/tests/data/spec-09-24.canonical

@@ -1 +1 @@
 %YAML 1.1
 ---
-!!seq [
+!!map {
   ? !!str "strip"
   : !!str "",
@@ -8 +8 @@
   ? !!str "keep"
   : !!str "\n",
-]
+}

branches/pyyaml3000/tests/data/spec-10-05.canonical

@@ -7 +7 @@
     !!str "one",
     !!str "two",
-  ]
+  ],
   !!map {
     ? !!str "one"

branches/pyyaml3000/tests/data/spec-10-12.canonical

@@ -4 +4 @@
   ? !!str "block"
   : !!map {
-    ? !!str "key",
+    ? !!str "key"
     : !!str "value"
   }

branches/pyyaml3000/tests/data/spec-10-15.canonical

@@ -1 +1 @@
 %YAML 1.1
 ---
-!!seq {
+!!seq [
   !!map {
     ? !!str "sun"
-    : !!str "yellow",
+    : !!str "yellow"
   },
   !!map {
@@ -16 +16 @@
     }
   }
-}
+]