before phase3

driver.cc

@@ -10,8 +10,11 @@ driver::driver () {
   push_scope();
 }
 
-int driver::get_label () {
-  return label_counter++;
+std::string driver::get_label () {
+  std::string label = label_prefix;
+  label_counter++;
+  label = label + std::to_string(label_counter);
+  return label;
 }
 
 void driver::push_scope () {

driver.hh

@@ -4,7 +4,7 @@
 # include <map>
 # include <set>
 # include <fstream>
-# include "types.hh" 
+# include "types.hh"
 # include "parser.hh"
 #include "helpers/helpers.hh"
 
@@ -24,12 +24,12 @@ public:
     // ====> LABEL
     std::string label_prefix;
     int label_counter;
-    int get_label();
+    std::string get_label();
 
 
     // ====> SCOPE
     int curr_scope;
-    
+
     void push_scope();
     void pop_scope();
 

scanner.l

@@ -65,7 +65,7 @@ comment  (($\*([^*]|[\r\n]|(\*+([^*$]|[\r\n])))*\*+$)|($$.*))
 "default"     token_to_file("DEFAULT"); return yy::parser::make_DEFAULT              (loc);
 
 
-"int"         token_to_file("INT", std::string(yytext)); return yy::parser::make_INT               (loc);
+"int"         token_to_file("INT"); return yy::parser::make_INT               (loc);
 "char"        token_to_file("CHAR"); return yy::parser::make_CHAR              (loc);
 "void"        token_to_file("VOID"); return yy::parser::make_VOID              (loc);
 
@@ -99,7 +99,7 @@ comment  (($\*([^*]|[\r\n]|(\*+([^*$]|[\r\n])))*\*+$)|($$.*))
 "."           token_to_file("DOT"); return yy::parser::make_DOT               (loc);
 
 
-{int}         token_to_file("INT", std::string(yytext)); return make_INTCONST(yytext, constants, loc);
+{int}         token_to_file("INT"); return make_INTCONST(yytext, constants, loc);
 {char}        token_to_file("CHAR"); return make_CHARCONST(yytext, constants, loc);
 {id}          token_to_file("ID"); return yy::parser::make_ID(yytext, loc);
 

types/Code.hh

@@ -6,11 +6,11 @@
 struct Code
 {
     std::string text;
-    // int continue_label;
-    // int break_label;
-    // int case_label;
-    int start_label;
-    int end_label;
+    // std::string continue_label;
+    // std::string break_label;
+    // std::string case_label;
+    std::string start_label;
+    std::string end_label;
 
     /**
      *  start_label:   LI $s0, 12

types/Var.hh

@@ -8,7 +8,6 @@ struct Var
     int offset;
     std::string id;
     int scope;
-    // TODO: "initial_value" --> "value"
     int initial_value;
 
     enum Type