Ugh, Yaml has a <<: merge key. facepalm: true

2014-08-14 17:02:28 -04:00
parent 6895e1276b
commit 00e8b59144
12 changed files with 39 additions and 138 deletions
@@ -1,6 +0,0 @@
-a: 
-  extends: b
-  x: 50
-b:
-  extends: a
-  x: 150
@@ -1,9 +0,0 @@
-a: 
-  extends: c
-  x: 50
-b:
-  extends: a
-  x: 150
-c: 
-  extends: b
-  y: 250
@@ -1,14 +1,13 @@
-aunt: 
+aunt: &aunt
  a: 101
  b: 102
  c: 103
-uncle: 
+uncle: &uncle
  x: 104
  y: 105
  b: 106
 child:
-  extends: 
-    - uncle
-    - aunt
+  <<: *uncle
+  <<: *aunt
  a: 107
  x: 108
@@ -1,10 +1,10 @@
-frame: 
+frame: &frame
  x: 38
  y: 38
-title:
-  extends: frame
+title: &title
+  <<: *frame
  y: 50
  width: 100
-subtitle:
-  extends: title
+subtitle: 
+  <<: *title
  y: 150
@@ -1,7 +0,0 @@
-title:
-  extends: frame
-  y: 50
-  width: 100
-frame: 
-  x: 38
-  y: 38
@@ -1,3 +0,0 @@
-a: 
-  extends: a
-  x: 50
@@ -1,7 +1,7 @@
-frame: 
+frame: &frame
  x: 38
  y: 38
 title:
-  extends: frame
+  <<: *frame
  y: 50
  width: 100
@@ -1,12 +1,12 @@
-frame: 
+frame: &frame
  x: 38
  y: 38
 title:
-  extends: frame
+  <<: *frame
  y: 50
  width: 100
 title2:
-  extends: frame
+  <<: *frame
  x: 75
  y: 150
  width: 150