Some header cleanups in the lexer, symtable is now not initialized in…

… main anymore
psde · Jan 16, 2013 · 299d15e · 299d15e
1 parent ade6ac8
commit 299d15e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
@@ -1,6 +1,13 @@
-//#define LEXER_DEBUG
+#include "BufferReader.hpp"
+#include "Symtable.hpp"
+#include "String.hpp"
+
 #include "Lexer.hpp"
 
+#ifdef _DEBUG
+#define LEXER_DEBUG
+#endif
+
 String LexerStateStrings[] =
 {
  "STATE_ERROR",
@@ -28,10 +35,10 @@ String LexerStateStrings[] =
  "STATE_NOSTATE"
 };
 
-Lexer::Lexer(BufferReader *buffer, Symtable *symtable)
+Lexer::Lexer(BufferReader *buffer)
 {
  this->buffer = buffer;
- this->symtable = symtable;
+ this->symtable = new Symtable(4096);
  this->setup();
 
  this->pos.line = 1;

diff --git a/src/Lexer.hpp b/src/Lexer.hpp
@@ -2,12 +2,10 @@
 #define LEXER_HPP
 
 #include <ctype.h>
-#include "Symtable.hpp"
 #include "Token.hpp"
-#include "BufferReader.hpp"
-#include "String.hpp"
 
-//#define LEXER_DEBUG
+class BufferReader;
+class Symtable;
 
 class Position
 {
@@ -73,7 +71,7 @@ class Lexer
  bool isComment();
 
 public:
- Lexer(BufferReader *buffer, Symtable *symtable);
+ Lexer(BufferReader *buffer);
 
  Token nextToken();
 };

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,7 +1,6 @@
-// Debug stuff...
 #define NO_DIRECT_IO // Use this if developing on crypto fs
 
-#define VERSION "0.1"
+#define VERSION "0.2"
 
 #ifndef __GNUC__ 
  #error "You need GCC to compile this." 
@@ -10,7 +9,6 @@
 #include <iostream>
 #include <iomanip>
 
-// TODO: Beautfiy this
 #include "String.hpp"
 #include "BufferReader.hpp"
 #include "BufferWriter.hpp"
@@ -54,10 +52,8 @@ int main(int argc, char *argv[])
  {
  std::cout << "Using stdout for code output." << std::endl;
  }
-
- Symtable *symtable = new Symtable(1024);
 
- Lexer *lex = new Lexer(buf, symtable);
+ Lexer *lex = new Lexer(buf);
 
  Parser *parser = new Parser(lex);
 
@@ -71,7 +67,6 @@ int main(int argc, char *argv[])
  {
  std::cout << "failed." << std::endl;
  std::cout << err.what() << std::endl;
- std::cout << "Exiting." << std::endl;
  return 1;
  }
  std::cout << "done." << std::endl;
@@ -142,8 +137,6 @@ int main(int argc, char *argv[])
 
  delete buf;
  delete lex;
- delete symtable;
 
- std::cout << "Finished." << std::endl;
  return 0;
 }