The TafReader is more general and much nicer, and about to actually construct

nodes, that part will be exciting.  I also fixed some stuff and added some new
functions to List, it now has first() and last() which work just like std::list
front() and back(), I may add compatibility functions later...

1 files changed, 7 insertions, 5 deletions

diff --git a/src/tafreader.h b/src/tafreader.h
index 127b571..4da800c 100644
--- a/src/tafreader.h
+++ b/src/tafreader.h
@@ -2,20 +2,23 @@
 #define BU_TAF_READER_H
 
 #include <stdint.h>
-#include "bu/tafdocument.h"
+#include "bu/tafnode.h"
 #include "bu/stream.h"
+#include "bu/fstring.h"
 
 namespace Bu
 {
         /**
          *
          */
-        class TafReader : public Bu::TafDocument
+        class TafReader
         {
         public:
                 TafReader( Bu::Stream &sIn );
                 virtual ~TafReader();
 
+                Bu::TafNode *readNode();
+
         private:
                 void node();
                 void nodeContent();
@@ -23,10 +26,9 @@ namespace Bu
                 void ws();
                 bool isws();
                 void next();
-                FString readStr();
+                Bu::FString readStr();
                 char c;
-                Stream &sIn;
-
+                Bu::Stream &sIn;
         };
 }