Return fix

2 files changed, 4 insertions, 5 deletions

diff --git a/src/generator.c b/src/generator.c
index bf187e0..37581e0 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -97,7 +97,7 @@ Type gen_function_declaration(const char name[], int return_type, int nb_param)
 }
 
 void gen_function_end_declaration() {
-  fprintf(output, "mov rsp, rbp\npop rbp\nret\n"); 
+  fprintf(output, "mov rax,-1\nmov rsp, rbp\npop rbp\nret\n"); 
 }
 
 void gen_function_return(Type expect, Type actual) {
@@ -105,9 +105,8 @@ void gen_function_return(Type expect, Type actual) {
     fprintf(stderr, "Return type mismatch at line %d.", lineno);
     exit(1);
   }
-
   if (actual != VOID_T) fprintf(output, "pop rax\n");
-  gen_function_end_declaration();
+  fprintf(output, "mov rsp, rbp\npop rbp\nret\n");
 }
 
 Type gen_function_call(const char name[], int nb_param) {
@@ -183,7 +182,7 @@ void gen_print(int type) {
     case CHAR:
       fprintf(output, "call printc\n");
     break;
-    default: fprintf(stderr, "Error print, supposed to have type CHAR or INT");
+    default: fprintf(stderr, "Error print, supposed to have type CHAR or INT\n");
   }
   
 }
diff --git a/src/symbol_table.c b/src/symbol_table.c
index 9d9617c..64399bd 100644
--- a/src/symbol_table.c
+++ b/src/symbol_table.c
@@ -213,6 +213,6 @@ static char *string_of_type(int type) {
 void check_expected_type(int type_to_check, int type_expected) {
   if (type_to_check != type_expected)
     fprintf(stderr, "Expected type : %s -> Got type : %s (near line %d)\n",
-            string_of_type(type_to_check), string_of_type(type_to_check),
+            string_of_type(type_expected), string_of_type(type_to_check),
             lineno);
 }