Type Refactor

include/ast/ast.h

@@ -5,7 +5,7 @@
 
 #include "Token.h"
 
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 using antlr4::Token, std::make_shared, std::shared_ptr;
 

include/ast/passes/type_check.h

@@ -3,12 +3,13 @@
 #include <stack>
 #include "ast/ast.h"
 #include "ast/passes/pass.h"
+#include "shared/type/type.h"
 
 class TypeCheck : public Pass {
    private:
     std::stack<shared_ptr<ast::Function>> func_stack;
-    void check_numeric(Type type, size_t line);
-    void check_bool(Type type, size_t line);
+    void check_numeric(TypePtr type, size_t line);
+    void check_bool(TypePtr type, size_t line);
 
    public:
     explicit TypeCheck();

include/ast/symbol/symbol.h

@@ -4,7 +4,7 @@
 #include <string>
 
 #include "ast/ast.h"
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 using std::shared_ptr;
 
@@ -23,9 +23,9 @@ class Symbol {
 
 typedef shared_ptr<Symbol> SymbolPtr;
 
-class BuiltinTypeSymbol : public Symbol, public Type {
+class BuiltinTypeSymbol : public Symbol {
    public:
-    BuiltinTypeSymbol(std::string name);
+    BuiltinTypeSymbol(TypePtr type);
     std::string get_name() override;
 };
 

include/backend/builtin/print.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 namespace builtin {
 void define_all_print();

include/backend/expressions/arithmetic.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ast/ast.h"
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 #include "mlir/Dialect/LLVMIR/LLVMAttrs.h"
 #include "mlir/IR/Value.h"

include/backend/io.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "mlir/IR/Value.h"
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 namespace io {
 void printf(mlir::Value value, TypePtr type);

include/shared/context.h

@@ -6,7 +6,7 @@
 #include <mlir/IR/Types.h>
 #include <memory>
 
-#include "shared/type.h"
+#include "shared/type/type.h"
 
 using std::shared_ptr, std::make_shared, std::unique_ptr;
 

include/shared/type/boolean.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "shared/type/type.h"
+
+class Boolean : public Type {
+   public:
+    Boolean();
+    std::string get_specifier() const override;
+    mlir::Type get_mlir() const override;
+};

include/shared/type/character.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "shared/type/type.h"
+
+class Character : public Type {
+   public:
+    Character();
+    std::string get_specifier() const override;
+    mlir::Type get_mlir() const override;
+};

include/shared/type/float.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "shared/type/type.h"
+
+class F32 : public Type {
+   public:
+    F32();
+    std::string get_specifier() const override;
+    mlir::Type get_mlir() const override;
+};

include/shared/type/integer.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "shared/type/type.h"
+
+class I32 : public Type {
+   public:
+    I32();
+    std::string get_specifier() const override;
+    mlir::Type get_mlir() const override;
+    bool is_numeric() const override;
+};

include/shared/type/type.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include "mlir/IR/Types.h"
+
+class Type {
+   protected:
+    std::string name;
+
+   public:
+    explicit Type(std::string name);
+
+    std::string get_name() const;
+    mlir::Type get_pointer();
+
+    virtual std::string get_specifier() const;
+    virtual mlir::Type get_mlir() const;
+    virtual bool is_numeric() const;
+
+    bool operator==(const Type rhs) const;
+};
+
+class Any : public Type {
+   public:
+    Any();
+    std::string get_specifier() const override;
+};
+
+class None : public Type {
+   public:
+    None();
+    std::string get_specifier() const override;
+    mlir::Type get_mlir() const override;
+};
+
+class Unset : public Type {
+   public:
+    Unset();
+    std::string get_specifier() const override;
+};
+
+typedef std::shared_ptr<Type> TypePtr;

src/CMakeLists.txt

@@ -22,7 +22,12 @@ set(
   "${CMAKE_CURRENT_SOURCE_DIR}/ast/passes/def_ref.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/ast/passes/type_check.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/ast/passes/builtin.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/type.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/character.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/integer.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/float.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/boolean.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/shared/type/type.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/shared/context.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/errors/syntax.cpp"
 )

src/ast/ast.cpp

@@ -312,7 +312,7 @@ ast::Call::Call(std::string name,
 ast::Call::Call(std::string name,
                 std::vector<shared_ptr<Expression>> args,
                 Token* token)
-    : Expression(make_shared<Type>(Type::unset), token) {
+    : Expression(make_shared<Unset>(), token) {
     this->name = name;
     this->arguments = args;
     this->function = nullptr;

src/ast/builder.cpp

@@ -6,6 +6,7 @@
 #include "ast/ast.h"
 #include "ast/builder.h"
 #include "shared/context.h"
+#include "shared/type/type.h"
 
 using std::any_cast;
 
@@ -81,7 +82,7 @@ std::any Builder::visitType(FusionParser::TypeContext* ctx) {
         throw std::runtime_error("invalid type found");
     }
 
-    return dynamic_pointer_cast<Type>(type.value());
+    return dynamic_pointer_cast<Type>(type.value()->get_type());
 }
 
 std::any Builder::visitQualifier(FusionParser::QualifierContext* ctx) {
@@ -144,7 +145,7 @@ std::any Builder::visitLiteralChar(FusionParser::LiteralCharContext* ctx) {
 std::any Builder::visitIdentifier(FusionParser::IdentifierContext* ctx) {
     Token* token = ctx->ID()->getSymbol();
     std::string name = ctx->ID()->getText();
-    TypePtr type = make_shared<Type>(Type::unset);
+    TypePtr type = make_shared<Unset>();
 
     auto var =
         make_shared<ast::Variable>(ast::Qualifier::Let, type, name, token);
@@ -361,7 +362,7 @@ std::any Builder::visitUnary(FusionParser::UnaryContext* ctx) {
 std::any Builder::visitAssignment(FusionParser::AssignmentContext* ctx) {
     Token* token = ctx->ID()->getSymbol();
     std::string name = ctx->ID()->getText();
-    TypePtr type = make_shared<Type>(Type::unset);
+    TypePtr type = make_shared<Unset>();
 
     auto var =
         make_shared<ast::Variable>(ast::Qualifier::Let, type, name, token);

src/ast/passes/type_check.cpp

@@ -79,11 +79,12 @@ void TypeCheck::visit_binary_operator(shared_ptr<ast::BinaryOperator> node) {
     visit(node->rhs);
 
     size_t line = node->token->getLine();
-    Type lhs = *node->lhs->get_type();
-    Type rhs = *node->rhs->get_type();
-    if (lhs != rhs) {
-        throw TypeError(line, "mismatched lhs(" + lhs.get_name() +
-                                  ") and rhs(" + rhs.get_name() +
+    TypePtr lhs = node->lhs->get_type();
+    TypePtr rhs = node->rhs->get_type();
+
+    if (*lhs != *rhs) {
+        throw TypeError(line, "mismatched lhs(" + lhs->get_name() +
+                                  ") and rhs(" + rhs->get_name() +
                                   ") types on binary operator: " +
                                   ast::binary_op_type_to_string(node->type));
     }
@@ -116,6 +117,7 @@ void TypeCheck::visit_binary_operator(shared_ptr<ast::BinaryOperator> node) {
         case ast::BinaryOpType::EQ:
         case ast::BinaryOpType::NE:
             node->set_type(ctx::t_bool);
+            break;
     }
 }
 
@@ -137,14 +139,14 @@ void TypeCheck::visit_unary_operator(shared_ptr<ast::UnaryOperator> node) {
     }
 }
 
-void TypeCheck::check_numeric(Type type, size_t line) {
-    if (type != *ctx::i32) {
-        throw TypeError(line, "type(" + type.get_name() + ") is not numeric");
+void TypeCheck::check_numeric(TypePtr type, size_t line) {
+    if (!type->is_numeric()) {
+        throw TypeError(line, "type(" + type->get_name() + ") is not numeric");
     }
 }
 
-void TypeCheck::check_bool(Type type, size_t line) {
-    if (type != *ctx::t_bool) {
-        throw TypeError(line, "type(" + type.get_name() + ") is not boolean");
+void TypeCheck::check_bool(TypePtr type, size_t line) {
+    if (*type != *ctx::t_bool) {
+        throw TypeError(line, "type(" + type->get_name() + ") is not boolean");
     }
 }

src/ast/symbol/symbol.cpp

@@ -15,8 +15,8 @@ TypePtr Symbol::get_type() {
     return this->type;
 }
 
-BuiltinTypeSymbol::BuiltinTypeSymbol(std::string name)
-    : Symbol(name), Type(name) {}
+BuiltinTypeSymbol::BuiltinTypeSymbol(TypePtr type)
+    : Symbol(type->get_name(), type) {}
 
 std::string BuiltinTypeSymbol::get_name() {
     return Symbol::get_name();

src/ast/symbol/symbol_table.cpp

@@ -52,9 +52,9 @@ SymbolTable::SymbolTable() {
 
 void SymbolTable::init_types() {
     for (const auto& ty : ctx::primitives) {
-        define(make_shared<BuiltinTypeSymbol>(ty->get_name()));
+        define(make_shared<BuiltinTypeSymbol>(ty));
     }
-    define(make_shared<BuiltinTypeSymbol>(ctx::any->get_name()));
+    define(make_shared<BuiltinTypeSymbol>(ctx::any));
 }
 
 void SymbolTable::init_builtins() {

src/backend/builtin/print.cpp

@@ -9,7 +9,7 @@
 namespace {
 void create_type_str(TypePtr type) {
     std::string ty = type->get_specifier();
-    auto gvalue = mlir::StringRef(ty.c_str(), 3);
+    auto gvalue = mlir::StringRef(ty.c_str(), ty.size() + 1);
 
     auto gtype =
         mlir::LLVM::LLVMArrayType::get(ctx::ch->get_mlir(), gvalue.size());

src/shared/context.cpp

@@ -1,4 +1,9 @@
 #include "shared/context.h"
+#include "shared/type/boolean.h"
+#include "shared/type/character.h"
+#include "shared/type/float.h"
+#include "shared/type/integer.h"
+#include "shared/type/type.h"
 
 mlir::MLIRContext ctx::context;
 std::unique_ptr<mlir::Location> ctx::loc =
@@ -19,12 +24,12 @@ void ctx::initialize_context() {
     context.loadDialect<mlir::LLVM::LLVMDialect>();
     builder = std::make_shared<mlir::OpBuilder>(&context);
 
-    ctx::ch = std::make_shared<Type>(Type::ch);
-    ctx::any = std::make_shared<Type>(Type::any);
-    ctx::i32 = std::make_shared<Type>(Type::i32);
-    ctx::f32 = std::make_shared<Type>(Type::f32);
-    ctx::none = std::make_shared<Type>(Type::none);
-    ctx::t_bool = std::make_shared<Type>(Type::t_bool);
+    ctx::any = make_shared<Any>();
+    ctx::i32 = make_shared<I32>();
+    ctx::f32 = make_shared<F32>();
+    ctx::none = make_shared<None>();
+    ctx::ch = make_shared<Character>();
+    ctx::t_bool = make_shared<Boolean>();
 
     ctx::primitives = {
         ctx::ch,