Index: pyyaml/trunk/tests/data/mappings.events
===================================================================
--- pyyaml/branches/working-on-emitter/tests/data/mappings.events	(revision 129)
+++ pyyaml/trunk/tests/data/mappings.events	(revision 130)
@@ -2,42 +2,42 @@
 
 - !DocumentStart
-- !Mapping
+- !MappingStart
 - !Scalar { implicit: true, value: 'key' }
 - !Scalar { implicit: true, value: 'value' }
 - !Scalar { implicit: true, value: 'empty mapping' }
-- !Mapping
-- !CollectionEnd
+- !MappingStart
+- !MappingEnd
 - !Scalar { implicit: true, value: 'empty mapping with tag' }
-- !Mapping { tag: '!mytag' }
-- !CollectionEnd
+- !MappingStart { tag: '!mytag' }
+- !MappingEnd
 - !Scalar { implicit: true, value: 'block mapping' }
-- !Mapping
-- !Mapping
+- !MappingStart
+- !MappingStart
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
-- !CollectionEnd
-- !Mapping
+- !MappingEnd
+- !MappingStart
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
-- !CollectionEnd
-- !CollectionEnd
+- !MappingEnd
+- !MappingEnd
 - !Scalar { implicit: true, value: 'flow mapping' }
-- !Mapping { flow: true }
+- !MappingStart { flow: true }
 - !Scalar { implicit: true, value: 'key' }
 - !Scalar { implicit: true, value: 'value' }
-- !Mapping
+- !MappingStart
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
-- !CollectionEnd
-- !Mapping
+- !MappingEnd
+- !MappingStart
 - !Scalar { implicit: true, value: 'complex' }
 - !Scalar { implicit: true, value: 'key' }
-- !CollectionEnd
-- !CollectionEnd
-- !CollectionEnd
+- !MappingEnd
+- !MappingEnd
+- !MappingEnd
 - !DocumentEnd