Index: branches/pyyaml3000/lib/yaml/__init__.py
===================================================================
--- branches/pyyaml3000/lib/yaml/__init__.py	(revision 51)
+++ branches/pyyaml3000/lib/yaml/__init__.py	(revision 53)
@@ -1,6 +1,9 @@
 
+from error import YAMLError
 from reader import Reader
 from scanner import Scanner
 from parser import Parser
+from composer import Composer
+from resolver import Resolver
 
 from tokens import *
@@ -18,2 +21,31 @@
     return iter(parser)
 
+def compose(data, Reader=Reader, Scanner=Scanner, Parser=Parser,
+        Composer=Composer):
+    reader = Reader(data)
+    scanner = Scanner(reader)
+    parser = Parser(scanner)
+    composer = Composer(parser)
+    return iter(composer)
+
+def compose_document(*args, **kwds):
+    try:
+        return compose(*args, **kwds).next()
+    except StopIteration:
+        return None
+
+def resolve(data, Reader=Reader, Scanner=Scanner, Parser=Parser,
+        Composer=Composer, Resolver=Resolver):
+    reader = Reader(data)
+    scanner = Scanner(reader)
+    parser = Parser(scanner)
+    composer = Composer(parser)
+    resolver = Resolver(composer)
+    return iter(resolver)
+
+def resolve_document(*args, **kwds):
+    try:
+        return resolve(*args, **kwds).next()
+    except StopIteration:
+        return None
+