5 files changed, 106 insertions, 18 deletions

diff --git a/src/compiler/ast-tree.c b/src/compiler/ast-tree.c
index de17a82..87f4755 100644
--- a/src/compiler/ast-tree.c
+++ b/src/compiler/ast-tree.c
@@ -373,7 +373,7 @@ AstTreeRoot *makeAstTree(ParserNode *parsedRoot) {
     root->variables.data[i]->value = value;
   }
 
-  if (!setAllTypesRoot(root)) {
+  if (!setAllTypesRoot(root) || !astTreeCleanRoot(root)) {
     goto RETURN_ERROR;
   }
 
@@ -490,7 +490,6 @@ AstTree *astTreeParseFunction(ParserNode *parserNode,
   for (size_t i = 0; i < p_variables_size; ++i) {
     variables[i] = p_variables[i];
   }
-  printLog("%p", function->arguments);
   variables[variables_size - 2] = &function->arguments;
   variables[variables_size - 1] = &scope.variables;
 
@@ -851,7 +850,10 @@ AstTree *makeTypeOf(AstTree *value) {
   }
   case AST_TREE_TOKEN_VALUE_U64:
     return newAstTree(AST_TREE_TOKEN_TYPE_U64, NULL);
-  case AST_TREE_TOKEN_VARIABLE:
+  case AST_TREE_TOKEN_VARIABLE: {
+    AstTreeVariable *variable = value->metadata;
+    return copyAstTree(variable->type);
+  }
   case AST_TREE_TOKEN_KEYWORD_PRINT_U64:
   case AST_TREE_TOKEN_NONE:
   }
@@ -945,6 +947,12 @@ bool setTypesFunction(AstTree *tree) {
     }
   }
 
+  for (size_t i = 0; i < metadata->scope.variables.size; ++i) {
+    if (!setTypesAstVariable(metadata->scope.variables.data[i])) {
+      return false;
+    }
+  }
+
   return true;
 }
 
@@ -1005,16 +1013,16 @@ bool setTypesVariable(AstTree *tree) {
 }
 
 bool setTypesAstVariable(AstTreeVariable *variable) {
+  if (!setAllTypes(variable->value)) {
+    return false;
+  }
+
   if (variable->type == NULL) {
     if ((variable->type = makeTypeOf(variable->value)) == NULL) {
       return false;
     }
   }
 
-  if (!setAllTypes(variable->value)) {
-    return false;
-  }
-
   if (!hasTypeOf(variable->value, variable->type)) {
     printLog("Type mismatch");
     return false;
@@ -1022,3 +1030,82 @@ bool setTypesAstVariable(AstTreeVariable *variable) {
     return true;
   }
 }
+
+bool astTreeCleanRoot(AstTreeRoot *root) {
+  for (size_t i = 0; i < root->variables.size; ++i) {
+    astTreeClean(root->variables.data[i]->value);
+    astTreeClean(root->variables.data[i]->type);
+  }
+  return true;
+}
+
+bool astTreeClean(AstTree *tree) {
+  switch (tree->token) {
+  case AST_TREE_TOKEN_VARIABLE:
+    return astTreeCleanVariable(tree);
+  case AST_TREE_TOKEN_FUNCTION:
+    return astTreeCleanFunction(tree);
+  case AST_TREE_TOKEN_KEYWORD_PRINT_U64:
+  case AST_TREE_TOKEN_TYPE_TYPE:
+  case AST_TREE_TOKEN_TYPE_FUNCTION:
+  case AST_TREE_TOKEN_TYPE_VOID:
+  case AST_TREE_TOKEN_TYPE_U64:
+  case AST_TREE_TOKEN_FUNCTION_CALL:
+  case AST_TREE_TOKEN_VALUE_U64:
+    return true;
+  case AST_TREE_TOKEN_NONE:
+  }
+  printLog("Bad token '%d'", tree->token);
+  exit(1);
+}
+
+bool astTreeCleanFunction(AstTree *tree) {
+  AstTreeFunction *metadata = tree->metadata;
+
+  for (size_t i = 0; i < metadata->arguments.size; ++i) {
+    printLog("Not supported");
+    return false;
+  }
+
+  if (!astTreeClean(metadata->returnType)) {
+    return false;
+  }
+
+  for (size_t i = 0; i < metadata->scope.expressions_size; ++i) {
+    AstTree expression = metadata->scope.expressions[i];
+    if (!astTreeClean(&expression)) {
+      return false;
+    }
+  }
+
+  for (size_t i = 0; i < metadata->scope.variables.size; ++i) {
+    if (!astTreeCleanAstVariable(metadata->scope.variables.data[i])) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool astTreeCleanVariable(AstTree *tree) {
+  return astTreeCleanAstVariable(tree->metadata);
+}
+
+bool astTreeCleanAstVariable(AstTreeVariable *variable) {
+  if (!astTreeClean(variable->value) || !astTreeClean(variable->type)) {
+    return false;
+  }
+  AstTree *value = variable->value;
+  if (value->token == AST_TREE_TOKEN_VARIABLE) {
+    do {
+      AstTreeVariable *value_metadata = value->metadata;
+      AstTree *newValue = value_metadata->value;
+      astTreeDelete(value);
+      value = newValue;
+    } while (value->token == AST_TREE_TOKEN_VARIABLE);
+
+    variable->value = copyAstTree(value);
+  }
+
+  return true;
+}
diff --git a/src/compiler/ast-tree.h b/src/compiler/ast-tree.h
index 852441c..b9c1585 100644
--- a/src/compiler/ast-tree.h
+++ b/src/compiler/ast-tree.h
@@ -131,3 +131,9 @@ bool setTypesTypeFunction(AstTree *tree);
 bool setTypesFunctionCall(AstTree *tree);
 bool setTypesVariable(AstTree *tree);
 bool setTypesAstVariable(AstTreeVariable *variable);
+
+bool astTreeCleanRoot(AstTreeRoot *root);
+bool astTreeClean(AstTree *tree);
+bool astTreeCleanFunction(AstTree *tree);
+bool astTreeCleanVariable(AstTree *tree);
+bool astTreeCleanAstVariable(AstTreeVariable *variable);
diff --git a/src/compiler/code-generator.c b/src/compiler/code-generator.c
index 1969016..4c0becb 100644
--- a/src/compiler/code-generator.c
+++ b/src/compiler/code-generator.c
@@ -77,13 +77,7 @@ CodeGeneratorCodes *codeGenerator(AstTreeRoot *astTreeRoot) {
         return NULL;
       }
       continue;
-    case AST_TREE_TOKEN_VALUE_U64: {
-      CodeGeneratorOperandU64 value = (AstTreeU64)variable->value->metadata;
-      generateCodePushCode(
-          codes, createGenerateCode(variable->name_begin, variable->name_end,
-                                    CODE_GENERATOR_INSTRUCTION_PRINT_U64,
-                                    (void *)value));
-    }
+    case AST_TREE_TOKEN_VALUE_U64:
       continue;
     case AST_TREE_TOKEN_TYPE_TYPE:
     case AST_TREE_TOKEN_TYPE_FUNCTION:
diff --git a/src/compiler/parser.c b/src/compiler/parser.c
index 50b8aae..504e40a 100644
--- a/src/compiler/parser.c
+++ b/src/compiler/parser.c
@@ -842,12 +842,12 @@ bool isValue(ParserNode *node) {
   case PARSER_TOKEN_FUNCTION_DEFINITION:
   case PARSER_TOKEN_FUNCTION_CALL:
   case PARSER_TOKEN_VALUE_U64:
+  case PARSER_TOKEN_IDENTIFIER:
     return true;
   case PARSER_TOKEN_TYPE_FUNCTION:
   case PARSER_TOKEN_TYPE_TYPE:
   case PARSER_TOKEN_TYPE_VOID:
   case PARSER_TOKEN_TYPE_U64:
-  case PARSER_TOKEN_IDENTIFIER:
   case PARSER_TOKEN_CONSTANT:
   case PARSER_TOKEN_SYMBOL_PARENTHESIS:
   case PARSER_TOKEN_ROOT:
diff --git a/test/main.felan b/test/main.felan
index 1adc1dd..3f1ef4c 100644
--- a/test/main.felan
+++ b/test/main.felan
@@ -1,9 +1,10 @@
 main :()->void: () -> void {
   a :: 3;
-  print_u64 a;
-  c :: 4;
-  print_u64 b;
+  c :: a;
   print_u64 c;
+  print_u64 b;
+  print_u64 a;
 };
+
 a :: 1;
 b :: 2;