5 files changed, 16 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e02d023..900dda5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,9 @@ project(minni CXX)
 
 set(SRC
   src/filehandler.cc
+  src/lexer.cc
   src/list.cc
   src/main.cc
-  src/scanner.cc
   src/token.cc
 )
 
diff --git a/include/scanner.h b/include/lexer.h
index e3ffe73..19b8a97 100644
--- a/include/scanner.h
+++ b/include/lexer.h
@@ -1,13 +1,13 @@
 #ifndef __SCANNER_H
 #define __SCANNER_H
 
-class Scanner
+class Lexer
 {
 private:
   char *script;
 
 public:
-  Scanner(char *script);
+  Lexer(char *script);
   void scan_tokens(void);
 };
 
diff --git a/src/lexer.cc b/src/lexer.cc
new file mode 100644
index 0000000..086200e
--- /dev/null
+++ b/src/lexer.cc
@@ -0,0 +1,11 @@
+#include <lexer.h>
+#include <stdio.h>
+
+Lexer::Lexer(char *script) : script(script) {}
+
+void
+Lexer::scan_tokens(void)
+{
+  (void) script;
+  printf("%s\n", script);
+}
diff --git a/src/main.cc b/src/main.cc
index 6b767c1..294e7d8 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 #include <filehandler.h>
+#include <lexer.h>
 #include <list.h>
-#include <scanner.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <token.h>
@@ -27,32 +27,13 @@ main(int argc, char **argv)
     return 1;
   }
 
-  Scanner s(buffer);
+  Lexer s(buffer);
   s.scan_tokens();
 
   Token t(EOFF, "EOF", 221);
   printf("%s\n", t.to_string());
   t.clean();
 
-  List l(sizeof(int));
-
-  int i = 12;
-  int z = 13;
-  l.add(&i);
-  l.add(&i);
-  l.add(&z);
-
-  int *y = (int *) l.get(0);
-  printf("%d\n", *y);
-
-  y = (int *) l.get(1);
-  printf("%d\n", *y);
-
-  y = (int *) l.get(2);
-  printf("%d\n", *y);
-
-  l.clean();
-
   f.close();
   return 0;
 }
diff --git a/src/scanner.cc b/src/scanner.cc
deleted file mode 100644
index cff7676..0000000
--- a/src/scanner.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <scanner.h>
-#include <stdio.h>
-
-Scanner::Scanner(char *script) : script(script) {}
-
-void
-Scanner::scan_tokens(void)
-{
-  (void) script;
-  printf("%s\n", script);
-}