folder structure refactoring

CMakeLists.txt

@@ -6,30 +6,48 @@ set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
-include_directories(include
-                    deps/tree-sitter-lang/src
-                    deps/tree-sitter/lib/src)
+include_directories(
+  include
+  include/nodes
+  include/builders
+  include/printers
 
+  deps/tree-sitter-lang/src
+  deps/tree-sitter/lib/src
+)
+
+set(
+  NODES
+  src/nodes/type_nodes.cpp
+  src/nodes/expression_nodes.cpp
+  src/nodes/statement_nodes.cpp
+)
+
+set(
+  BUILDERS
+  src/builders/basic_builders.cpp
+  src/builders/type_builders.cpp
+  src/builders/doc_builders.cpp
+  src/builders/expression_builders.cpp
+  src/builders/statement_builders.cpp
+)
+
+set(
+  PRINTERS
+  src/printers/basic_printers.cpp
+  src/printers/type_printers.cpp
+  src/printers/doc_printers.cpp
+  src/printers/expression_printers.cpp
+  src/printers/statement_printers.cpp
+)
 
 add_executable(lang src/main.cpp
-
                     src/name_tree.cpp
+                    src/types.cpp
 
-                    src/type_nodes.cpp
-                    src/expression_nodes.cpp
-                    src/statement_nodes.cpp
-
-                    src/basic_builders.cpp
-                    src/type_builders.cpp
-                    src/doc_builders.cpp
-                    src/expression_builders.cpp
-                    src/statement_builders.cpp
-
-                    src/basic_printers.cpp
-                    src/type_printers.cpp
-                    src/doc_printers.cpp
-                    src/expression_printers.cpp
-                    src/statement_printers.cpp
+                    ${NODES}
+                    ${BUILDERS}
+                    ${PRINTERS}
 
                     include/tree_sitter_wrapper.hpp
                     deps/tree-sitter-lang/src/tree_sitter/parser.h

include/name_tree.hpp

@@ -45,9 +45,9 @@ template <typename T> class StatementProxy {
 public:
   StatementProxy(AnyStatementProxy proxy) : proxy_(proxy) {}
 
-  T *get() { proxy_.get()->get<T>().value(); }
+  T *get() { return proxy_.get()->get<T>().value(); }
 
-  const T *get() const { proxy_.get()->get<T>().value(); }
+  const T *get() const { return proxy_.get()->get<T>().value(); }
 
   //
 

src/nodes/expression_nodes.cpp

@@ -1,4 +1,4 @@
-#include "../include/expression_nodes.hpp"
+#include "expression_nodes.hpp"
 
 namespace nodes {