Merge commit '6e19bb560d474736d45f5be011ff0830c7019991' as 'spasm'

1 files changed, 35 insertions, 0 deletions

diff --git a/spasm/src/asm/tokenizer.hpp b/spasm/src/asm/tokenizer.hpp
new file mode 100644
index 0000000..1155db7
--- /dev/null
+++ b/spasm/src/asm/tokenizer.hpp
@@ -0,0 +1,35 @@
+#ifndef TOKENIZER_HPP
+#define TOKENIZER_HPP
+
+#include <iostream>
+#include <memory>
+#include <queue>
+
+#include "lexer.hpp"
+#include "token.hpp"
+
+namespace SpasmImpl
+{
+namespace ASM
+{
+namespace Lexer
+{
+class Tokenizer : public TokenStream
+{
+   public:
+    Tokenizer(std::istream&);
+
+    virtual void push_token(const Token&);
+    Token next_token();
+
+   private:
+    std::unique_ptr<Lexer> _lexer;
+    std::queue<Token> _tokens;
+    bool end_input;
+};  // class Tokenizer
+}  // namespace Lexer
+
+}  // namespace ASM
+}  // namespace SpasmImpl
+
+#endif