Updated lexer class to support combining lexers together

diff --git a/tests/test_experimental.cpp b/tests/test_experimental.cpp
index 25d7b9979976a9e7f356aafa9fbd45c3ae72006f..79bb20b20fd9f3552870661edd830076e2905eb5 100644 (file)
--- a/tests/test_experimental.cpp
+++ b/tests/test_experimental.cpp
@@ -49,14 +49,21 @@ class CharBuffer : public IBuffer
         }
 };
 
+//-----------------------------------------------------------------------------
+// Lexer Class
+//-----------------------------------------------------------------------------
 class Lexer
 {
+    protected:
+        Lexer* lex_sibling;
+        Lexer* lex_child;
     public:
-        Lexer()
+        // Construction/Destruction
+        Lexer() : lex_sibling(0), lex_child(0)
         {
         }
 
-        Lexer(Lexer& lxr)
+        Lexer(const Lexer& lxr) : lex_sibling(0), lex_child(0)
         {
         }
 
@@ -64,38 +71,66 @@ class Lexer
         {
         }
 
-        Lexer* clone()
+        // Accessors
+        Lexer* sibling()
+        {
+            return lex_sibling;
+        }
+
+        void sibling(Lexer* lxr)
+        {
+            lex_sibling = lxr;
+        }
+
+        Lexer* child()
+        {
+            return lex_child;
+        }
+
+        void child(Lexer* lxr)
+        {
+            lex_sibling = lxr;
+        }
+
+        // Action methods
+        Lexer* clone() const
         {
             return new Lexer(*this);
         }
 
-        Token operator() (CharBuffer& input)
+        void addSibling(Lexer* lxr)
         {
-            return Token();
         }
 
-        Lexer& operator= (const Lexer& rhs)
+        void addChild(Lexer* lxr)
         {
-            return *this;
+        }
+
+        // Operators
+        Token operator() (CharBuffer& input)
+        {
+            std::cout << this << " ";
+            if( NULL != sibling() )
+            {
+                (*sibling())( input );
+            }
+            std::cout << std::endl;
+            return Token();
         }
 
         Lexer& operator+ (const Lexer& rhs)
         {
+            addSibling( rhs.clone() );
             return *this;
         }
 
         Lexer& operator| (const Lexer& rhs)
         {
+            addChild( rhs.clone() );
             return *this;
         }
 };
 
-class Parser
-{
-    public:
-        //AST* operator() (CharBuffer& input) = 0;
-};
-
 //-----------------------------------------------------------------------------
 // Begin Unit Tests
 //-----------------------------------------------------------------------------
@@ -108,9 +143,7 @@ namespace {
         std::ifstream file;
         file.open( "input.txt" );
         CharBuffer input( file );
-        Lexer lexer;
-        lexer = (Lexer() + Lexer())
-              | (Lexer() + Lexer() + Lexer());
+        Lexer& lexer = (Lexer() + Lexer() + Lexer());
         lexer( input );
     }
 }