Index: branches/pyyaml3000/lib/yaml/tokens.py
===================================================================
--- branches/pyyaml3000/lib/yaml/tokens.py	(revision 46)
+++ branches/pyyaml3000/lib/yaml/tokens.py	(revision 47)
@@ -6,7 +6,8 @@
 
 class DirectiveToken(Token):
-    pass
+    code = '<directive>'
 
 class YAMLDirectiveToken(DirectiveToken):
+    code = '<%YAML directive>'
     def __init__(self, major_version, minor_version, start_marker, end_marker):
         self.major_version = major_version
@@ -16,7 +17,8 @@
 
 class TagDirectiveToken(DirectiveToken):
-    pass
+    code = '<%TAG directive>'
 
 class ReservedDirectiveToken(DirectiveToken):
+    code = '<unknown directive>'
     def __init__(self, name, start_marker, end_marker):
         self.name = name
@@ -25,43 +27,44 @@
 
 class DocumentStartToken(Token):
-    pass
+    code = '<document start>'
 
 class DocumentEndToken(Token):
-    pass
+    code = '<document end>'
 
-class EndToken(Token):
-    pass
+class StreamEndToken(Token):
+    code = '<stream end>'
 
 class BlockSequenceStartToken(Token):
-    pass
+    code = '<block sequence start>'
 
 class BlockMappingStartToken(Token):
-    pass
+    code = '<block mapping end>'
 
 class BlockEndToken(Token):
-    pass
+    code = '<block end>'
 
 class FlowSequenceStartToken(Token):
-    pass
+    code = '['
 
 class FlowMappingStartToken(Token):
-    pass
+    code = '{'
 
 class FlowSequenceEndToken(Token):
-    pass
+    code = ']'
 
 class FlowMappingEndToken(Token):
-    pass
+    code = '}'
 
 class KeyToken(Token):
-    pass
+    code = '?'
 
 class ValueToken(Token):
-    pass
+    code = ':'
 
 class EntryToken(Token):
-    pass
+    code = '- or ,'
 
 class AliasToken(Token):
+    code = '<alias>'
     def __init__(self, value, start_marker, end_marker):
         self.value = value
@@ -70,4 +73,5 @@
 
 class AnchorToken(Token):
+    code = '<anchor>'
     def __init__(self, value, start_marker, end_marker):
         self.value = value
@@ -76,4 +80,5 @@
 
 class TagToken(Token):
+    code = '<tag>'
     def __init__(self, value, start_marker, end_marker):
         self.value = value
@@ -82,4 +87,5 @@
 
 class ScalarToken(Token):
+    code = '<scalar>'
     def __init__(self, value, plain, start_marker, end_marker):
         self.value = value