Merge branch 'master' of https://github.com/pacien/upem-compil-tpc

2 files changed, 5 insertions, 5 deletions

diff --git a/src/generator.c b/src/generator.c
index c6140f1..ab3777c 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -282,7 +282,7 @@ void gen_or(int left, int right, int idx) {
   fprintf(output, "jmp .false%d\n", idx);
   fprintf(output, ".true%d:\n", idx);
   fprintf(output, "push 1\n");
-  fprintf(output, ".false%d:", idx);
+  fprintf(output, ".false%d:\n", idx);
 }
 
 void gen_and(int left, int right, int idx) {
@@ -300,7 +300,7 @@ void gen_and(int left, int right, int idx) {
   fprintf(output, "jmp .true%d\n", idx);
   fprintf(output, ".false%d:\n", idx);
   fprintf(output, "push 0\n");
-  fprintf(output, ".true%d:", idx);
+  fprintf(output, ".true%d:\n", idx);
 }
 
 void gen_eq(const char op[], int left, int right, int idx) {
@@ -316,7 +316,7 @@ void gen_eq(const char op[], int left, int right, int idx) {
   else
     exit(1); // TODO: error on unexpected op
 
-  fprintf(output, "push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:", idx, idx,
+  fprintf(output, "push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:\n", idx, idx,
           idx);
 }
 
@@ -337,7 +337,7 @@ void gen_order(const char op[], int left, int right, int idx) {
   else
     exit(1); // TODO: error on unexpected op
 
-  fprintf(output, "push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:", idx, idx,
+  fprintf(output, "push 0\njmp .false%d\n.true%d:\npush 1\n.false%d:\n", idx, idx,
           idx);
 }
 
diff --git a/src/tpc.y b/src/tpc.y
index 64652d9..7321780 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -126,7 +126,7 @@ Instr:
 | PRINT '(' Exp ')' ';'          { gen_print($<type>3);}
 | IF '(' Exp IfHandling')' Instr { gen_if_label($<num>4); }
 | IF '(' Exp IfHandling')' Instr ELSE IfEndHandling Instr IfElseEndHandling
-| WHILE '(' Exp ')' Instr 
+| WHILE {fprintf(output,".upwhile%d:\n",num_while);}'(' Exp {fprintf(output,"pop rax\ncmp rax,0\njz .downwhile%d\n",num_while);}')' Instr {fprintf(output,"jmp .upwhile%d\n.downwhile%d:\n",num_while,num_while);num_while++;}
 | '{' SuiteInstr '}'
 ;
 IfHandling:                       { gen_if_start($<num>$ = num_if++); };