Has something changes.

aq-org · Apr 3, 2024 · a785cab · a785cab
1 parent 8c6db3a
commit a785cab
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 208 deletions.
diff --git a/compiler/lexer/lex_map.h b/compiler/lexer/lex_map.h
diff --git a/compiler/lexer/token_map.cc b/compiler/lexer/token_map.cc
@@ -5,14 +5,14 @@
 #include "compiler/lexer/token_map.h"
 
 #include "compiler/compiler.h"
-#include "compiler/token/token.h"
 #include "compiler/token/keyword.h"
 #include "compiler/token/operator.h"
-#include "compiler/lexer/lex_map.h"
+#include "compiler/token/token.h"
 #include "debugger/debugger.h"
 
 namespace Aq {
 Compiler::TokenMap::TokenMap() {
+  // TODO: Should be improved
   keyword_map_.Insert("auto", Token::Keyword::Auto);
   keyword_map_.Insert("and", Token::Keyword::And);
   keyword_map_.Insert("bitand", Token::Keyword::Bitand);
@@ -137,10 +137,12 @@ Compiler::TokenMap::~TokenMap() = default;
 
 Compiler::Token::Keyword Compiler::TokenMap::GetKeywordValue(
     std::string keyword) {
-  return keyword_map_.Find(keyword);
+  // TODO: Should be improved
+  // return keyword_map_.Find(keyword);
 }
 Compiler::Token::Operator Compiler::TokenMap::GetOperatorValue(
     std::string _operator) {
-  return operator_map_.Find(_operator);
+  // TODO: Should be improved
+  // return operator_map_.Find(_operator);
 }
 }  // namespace Aq
diff --git a/compiler/lexer/token_map.h b/compiler/lexer/token_map.h
@@ -6,10 +6,11 @@
 #define AQ_COMPILER_LEXER_TOKEN_MAP_H_
 
 #include "compiler/compiler.h"
+#include "compiler/hash_map/hash_map.h"
 #include "compiler/token/token.h"
-#include "compiler/lexer/lex_map.h"
 
 namespace Aq {
+// TODO: Should be improved
 class Compiler::TokenMap {
  public:
   TokenMap();
@@ -24,8 +25,8 @@ class Compiler::TokenMap {
   TokenMap& operator=(TokenMap&&) noexcept = default;
 
  private:
-  LexMap<Token::Keyword> keyword_map_;
-  LexMap<Token::Operator> operator_map_;
+  HashMap<Token::Keyword> keyword_map_;
+  HashMap<Token::Operator> operator_map_;
 };
 }  // namespace Aq
 

diff --git a/compiler/token/token.cc b/compiler/token/token.cc
@@ -8,6 +8,7 @@
 #include "debugger/debugger.h"
 
 namespace Aq {
+// TODO: Should be improved
 Compiler::Token::Token() = default;
 Compiler::Token::~Token() = default;
 }  // namespace Aq
diff --git a/compiler/token/token.h b/compiler/token/token.h
@@ -10,6 +10,7 @@
 #include "compiler/compiler.h"
 
 namespace Aq {
+// TODO: Should be improved
 class Compiler::Token {
  public:
   enum class Type {