8 files changed, 242 insertions, 40 deletions
diff --git a/src/lexer/lexer.cpp b/src/lexer.cpp
index 70af4b5..3b134eb 100644
--- a/src/lexer/lexer.cpp
+++ b/src/lexer.cpp
@@ -1,4 +1,4 @@
-#include "lexer/lexer.hpp"
+#include "lexer.hpp"
 
 Lexer::Lexer(const std::string& src) : src(src), position(0), line(1), column(1) {}
 
diff --git a/src/main.cpp b/src/main.cpp
index 9a11516..24a748d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,8 +2,8 @@
 #include <sstream>
 #include <fstream>
 
-#include "lexer/lexer.hpp"
-#include "parser/parser.hpp"
+#include "lexer.hpp"
+#include "parser.hpp"
 
 std::string tokenTypeToString(TokenType type) {
     switch (type) {
diff --git a/src/parser/parser.cpp b/src/parser.cpp
index 97a1f27..6f47890 100644
--- a/src/parser/parser.cpp
+++ b/src/parser.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "parser/parser.hpp"
+#include "parser.hpp"
 
 Parser::Parser(const std::vector<Token>& tokens) : tokens_(tokens), position_(0) {}
 
diff --git a/src/semantic/scope.cpp b/src/scope.cpp
index ba5aa41..86e2668 100644
--- a/src/semantic/scope.cpp
+++ b/src/scope.cpp
@@ -1,4 +1,4 @@
-#include "semantic/scope.hpp"
+#include "scope.hpp"
 
 Scope::Scope(std::string name, int level, std::unique_ptr<Scope> parent) : scope_name(name), scope_level(level), parent_scope(parent) {}
 
diff --git a/src/semantic/semantic_analyzer.cpp b/src/semantic/semantic_analyzer.cpp
deleted file mode 100644
index 57f217e..0000000
--- a/src/semantic/semantic_analyzer.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "semantic/semantic_analyzer.hpp"
-
-SemanticAnalyzer::SemanticAnalyzer() : symobl_table(new SemanticTable), errors(std::vector<Error>), warnings(std::vector<Error>), current_function(nullptr), current_function_return_type(""), has_main_function(false) {}
-
-bool SemanticAnalyzer::analyze(ASTNode* ast) {
-    this->symbol_table.enterScope("global")
-    this->visit(ast);
-    this->validateMainFunction();
-
-    if (has_main_function == false) {
-        //error
-        return false;
-    }
-
-    this->symbol_table.exitScope();
-    return true;
-}
-
-std::vector<Error> SemanticAnalyzer::getErrors() {
-    return this->errors;
-}
-
-std::vector<Error> SemanticAnalyzer::getWarnings() {
-    return this->warnings;
-}
-
-bool SemanticAnalyzer::hasErrors() {
-    return !this->errors.empty();
-}
-
-std::string SemanticAnalyzer::visit(ASTNode* ast) {
-
-}
diff --git a/src/semantic_analyzer.cpp b/src/semantic_analyzer.cpp
new file mode 100644
index 0000000..e097e4f
--- /dev/null
+++ b/src/semantic_analyzer.cpp
@@ -0,0 +1,235 @@
+#include "semantic_analyzer.hpp"
+
+SemanticAnalyzer::SemanticAnalyzer() : symobl_table(new SemanticTable), errors(std::vector<Error>), warnings(std::vector<Error>), current_function(nullptr), current_function_return_type(""), has_main_function(false) {}
+
+bool SemanticAnalyzer::analyze(ASTNode* ast) {
+    symbol_table.enterScope("global")
+    visit(ast);
+    validateMainFunction();
+
+    if (has_main_function == false) {
+        //error
+        return false;
+    }
+
+    symbol_table.exitScope();
+    return true;
+}
+
+std::vector<Error> SemanticAnalyzer::getErrors() {
+    return errors;
+}
+
+std::vector<Error> SemanticAnalyzer::getWarnings() {
+    return warnings;
+}
+
+bool SemanticAnalyzer::hasErrors() {
+    return !errors.empty();
+}
+
+std::string SemanticAnalyzer::visit(ASTNode* node) {
+    if (ProgramNode* prog = dynamic_cast<ProgramNode*>(node)) {
+        return visitProgram(prog);
+    }
+
+    else if (FunctionDeclNode* func = dynamic_cast<FunctionDeclNode*>(node)) {
+        return visitFunctionDecl(func);
+    }
+
+    else if (ParameterNode* param = dynamic_cast<ParameterNode*>(node)) {
+        return visitParameter(param);
+    }
+
+    else if (VarDeclNode* var = dynamic_cast<VarDeclNode*>(node)) {
+        return visitVarDeclaration(var);
+    }
+
+    else if (AssignmentNode as = dynamic_cast<AssignmentNode>(node)) {
+        return visitAssignment(as);
+    }
+
+    else if (IfStatementNode is = dynamic_cast<IfStatementNode>(node)) {
+        return visitIfStatement(is);
+    }
+
+    else if (WhileStatementNode ws = dynamic_cast<WhileStatementNode>(node)) {
+        return visitWhileStatement(ws);
+    }
+
+    else if (ForStatementNode fs = dynamic_cast<ForStatementNode>(node)) {
+        return visitForStatement(fs);
+    }
+
+    else if (ReturnStatementNode rs = dynamic_cast<ReturnStatementNode>(node)) {
+        return visitReturnStatement(rs);
+    }
+
+    else if (ExpressionStatementNode es = dynamic_cast<ExpressionStatementNode>(node)) {
+        return visitExpressionStatement(es);
+    }
+
+    else if (BinaryExprNode bin = dynamic_cast<BinaryExprNode>(node)) {
+        return visitBinaryExpression(bin);
+    }
+
+    else if (UnaryExprNode un = dynamic_cast<UnaryExprNode>(node)) {
+        return visitUnaryExpression(un);
+    }
+
+    else if (FunctionCallNode func_call = dynamic_cast<FunctionCallNode>(node)) {
+        return visitFunctionCall(func_call);
+    }
+
+    else if (IdentifierNode ident = dynamic_cast<IdentifierNode>(node)) {
+        return visitIdentifier(ident);
+    }
+
+    else if (LiteralNode lit = dynamic_cast<LiteralNode>(node)) {
+        return visitLiteral(lit);
+    }
+}
+
+std::string visitProgram(ProgramNode* node){
+    // get list of functions
+    // visit each function
+    // return
+
+}
+
+std::string visitFunctionDecl(FunctionDeclNode* node){
+    // check for dupe name
+    // create function symbol and insert into global scope
+    // check if main function
+    // enter function scope
+    // process parameters
+    // process function body
+    // verify non-void functions have return statements
+    // exit function scope and clear context
+    // return
+
+}
+
+std::string visitParameter(ParameterNode*){
+    // get parameter info from node
+    // check for dupes
+    // create parameter symbol
+    // insert into current scope
+    // return parameter type
+
+}
+
+std::string visitVarDeclaration(VarDeclNode* node){
+    // get variable information
+    // check for dupes
+    // if initializer exists, check type
+    // create variable symbol
+    // insert into current scope
+    // return
+
+}
+
+std::string visitAssignment(AssignmentNode* node){
+    // get left side info
+    // look up target variable
+    // verify variable
+    // analyze right side info
+    // check type compatability
+    // make var as initialized
+    // return
+
+}
+
+std::string visitIfStatement(IfStatementNode* node){
+    // analyze condition
+    // verify condition is bool
+    // analyze then branch
+    // analyze else branch
+    // return
+
+}
+
+std::string visitWhileStatement(WhileStatementNode* node){
+    // analyze condition
+    // verify condition is bool
+    // analyze loop body
+    // return
+
+}
+
+std::string visitForStatement(ForStatementNode* node){
+    // enter new scope for loop
+    // analyze initialization
+    // analyze condition
+    // analyze update statement
+    // analyze loop body
+    // exit for loop scope
+    // return 
+
+}
+
+std::string visitReturnStatement(ReturnStatementNode* node){
+    // check if inside function
+    // get return expression
+    // analyze return expression
+    // validate return type matches function
+    // return
+    
+}
+
+std::String visitExpressionStatement(ExpressionStatementNode* node){
+    // get the expression
+    // analyze expression
+    // return
+
+}
+
+std::string visitBinaryExpression(BinaryExprNode* node){
+    // get operator and operands
+    // analyze operands
+    // infer result type based on operator
+    // return result type
+
+}
+
+std::string visitUnaryExpression(UnaryExprNode* node){
+    // get operator and operand
+    // analyze operand
+    // infer result type
+    // return result type
+
+}
+
+std::string visitFunctionCall(FunctionCallNode* node){
+    // get function name and args
+    // look up function
+    // verify its a function
+    // get expected parameter information
+    // check argument count
+    // check each argument type
+    // return functions return type
+
+}
+
+std::string visitIdentifier(IdentifierNode* node){
+    // get identifier name
+    // look up in symbol table
+    // check if initialized
+    // return symbol type
+    
+}
+
+std::string visitLiteral(LiteralNode* node){
+    // determine literal type
+    // return appropriate type
+
+}
+
+bool checkTypeCompatibility(std::string target, std::string source){
+    // determines if a value of source type can be used where target type is expected
+
+}
+
+std::string inferBinaryOpType(std::string op, std::string left, std::string right){
+
+}
diff --git a/src/semantic/symbol.cpp b/src/symbol.cpp
index 5142ea8..ad2041d 100644
--- a/src/semantic/symbol.cpp
+++ b/src/symbol.cpp
@@ -1,4 +1,4 @@
-#include "semantic/symbol.hpp"
+#include "symbol.hpp"
 
 Symbol::Symbol(std::string name, SymbolType type, std::string data_type, int scope) : symbol_name(name), symbol_type(type), data_type(data_type), scope_level(scope_level) {}
 
diff --git a/src/semantic/symbol_table.cpp b/src/symbol_table.cpp
index 548d6ee..81ff474 100644
--- a/src/semantic/symbol_table.cpp
+++ b/src/symbol_table.cpp
@@ -1,4 +1,4 @@
-#include "semantic/symbol_table.hpp"
+#include "symbol_table.hpp"
 
 #include <iostream>