aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/generator.c24
-rw-r--r--src/generator.h2
-rw-r--r--src/tpc.y20
3 files changed, 22 insertions, 24 deletions
diff --git a/src/generator.c b/src/generator.c
index 44fdeab..b75f7a8 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -265,7 +265,7 @@ void gen_ifelse_end(int idx) {
265 265
266// ----- OPERATORS ----- 266// ----- OPERATORS -----
267 267
268int gen_assign(const char ident[], Scope scope) { 268static int gen_assign_simple(const char ident[], Scope scope) {
269 int l_addr = loc_get_addr(ident); 269 int l_addr = loc_get_addr(ident);
270 int g_addr = glo_get_addr(ident); 270 int g_addr = glo_get_addr(ident);
271 271
@@ -291,7 +291,7 @@ int gen_assign(const char ident[], Scope scope) {
291 } 291 }
292} 292}
293 293
294int gen_assign_tab(const char ident[], Scope scope) { 294static int gen_assign_tab(const char ident[], Scope scope) {
295 int l_addr = loc_get_addr(ident); 295 int l_addr = loc_get_addr(ident);
296 int g_addr = glo_get_addr(ident); 296 int g_addr = glo_get_addr(ident);
297 297
@@ -317,6 +317,13 @@ int gen_assign_tab(const char ident[], Scope scope) {
317 } 317 }
318} 318}
319 319
320int gen_assign(const char ident[], Scope scope) {
321 switch (loc_lookup(ident)) {
322 case TAB: return gen_assign_tab(ident, scope);
323 default: return gen_assign_simple(ident, scope);
324 }
325}
326
320void gen_or(int left, int right, int idx) { 327void gen_or(int left, int right, int idx) {
321 check_expected_types(left, INT,TAB); 328 check_expected_types(left, INT,TAB);
322 check_expected_types(right, INT,TAB); 329 check_expected_types(right, INT,TAB);
@@ -447,7 +454,7 @@ int gen_negate_expr(int type) {
447 return type; 454 return type;
448} 455}
449 456
450int gen_value(const char ident[], Scope scope) { 457static int gen_value_simple(const char ident[], Scope scope) {
451 int l_addr = loc_get_addr(ident); 458 int l_addr = loc_get_addr(ident);
452 459
453 switch (scope) { 460 switch (scope) {
@@ -470,7 +477,8 @@ int gen_value(const char ident[], Scope scope) {
470 exit(1); 477 exit(1);
471 } 478 }
472} 479}
473int gen_value_tab(const char ident[], Scope scope) { 480
481static int gen_value_tab(const char ident[], Scope scope) {
474 int l_addr = loc_get_addr(ident); 482 int l_addr = loc_get_addr(ident);
475 int g_addr = glo_get_addr(ident); 483 int g_addr = glo_get_addr(ident);
476 switch (scope) { 484 switch (scope) {
@@ -489,6 +497,14 @@ int gen_value_tab(const char ident[], Scope scope) {
489 exit(1); 497 exit(1);
490 } 498 }
491} 499}
500
501int gen_value(const char ident[], Scope scope) {
502 switch (loc_lookup(ident)) {
503 case TAB: return gen_value_tab(ident, scope);
504 default: return gen_value_simple(ident, scope);
505 }
506}
507
492int gen_num(int value, Scope scope) { 508int gen_num(int value, Scope scope) {
493 fprintf(output, "push %d\n", value); 509 fprintf(output, "push %d\n", value);
494 return INT; 510 return INT;
diff --git a/src/generator.h b/src/generator.h
index 9d6dd65..e1e47df 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -39,7 +39,6 @@ void gen_if_end(int idx);
39void gen_ifelse_end(int idx); 39void gen_ifelse_end(int idx);
40 40
41int gen_assign(const char ident[], Scope scope); 41int gen_assign(const char ident[], Scope scope);
42int gen_assign_tab(const char ident[], Scope scope);
43 42
44void gen_or(int left, int right, int idx); 43void gen_or(int left, int right, int idx);
45void gen_and(int left, int right, int idx); 44void gen_and(int left, int right, int idx);
@@ -51,7 +50,6 @@ void gen_divstar(char op, int left, int right);
51int gen_signed_expr(char op, int type); 50int gen_signed_expr(char op, int type);
52int gen_negate_expr(int type); 51int gen_negate_expr(int type);
53int gen_value(const char ident[], Scope scope); 52int gen_value(const char ident[], Scope scope);
54int gen_value_tab(const char ident[], Scope scope);
55 53
56int gen_num(int value, Scope scope); 54int gen_num(int value, Scope scope);
57int gen_char(int value, Scope scope); 55int gen_char(int value, Scope scope);
diff --git a/src/tpc.y b/src/tpc.y
index 74d31c6..6e733d0 100644
--- a/src/tpc.y
+++ b/src/tpc.y
@@ -2,11 +2,6 @@
2/* 2/*
3 * UPEM / Compilation / Projet 3 * UPEM / Compilation / Projet
4 * Pacien TRAN-GIRARD, Adam NAILI 4 * Pacien TRAN-GIRARD, Adam NAILI
5 *
6 * TODO :
7 * ------
8 * - arrays
9 *
10 */ 5 */
11 6
12int nb_globals = 0; 7int nb_globals = 0;
@@ -147,13 +142,7 @@ IfHandling: { gen_if_start($<num>$ = num_if++); };
147IfEndHandling: { gen_if_end($<num>-3); }; 142IfEndHandling: { gen_if_end($<num>-3); };
148IfElseEndHandling: { gen_ifelse_end($<num>-5); }; 143IfElseEndHandling: { gen_ifelse_end($<num>-5); };
149Exp: 144Exp:
150 LValue '=' Exp { 145 LValue '=' Exp { $$ = gen_assign($<ident>1, scope); }
151 if(loc_lookup($<ident>1) != TAB){
152 $$ = gen_assign($<ident>1, scope);
153 }else{
154 $$ = gen_assign_tab($<ident>1,scope);
155 }
156 }
157| EB 146| EB
158; 147;
159EB: 148EB:
@@ -184,12 +173,7 @@ F:
184 ADDSUB F { $$ = gen_signed_expr($1, $2); } 173 ADDSUB F { $$ = gen_signed_expr($1, $2); }
185| '!' F { $$ = gen_negate_expr($2); } 174| '!' F { $$ = gen_negate_expr($2); }
186| '(' Exp ')' { $$ = $2; } 175| '(' Exp ')' { $$ = $2; }
187| LValue { if(loc_lookup($<ident>1) != TAB){ 176| LValue { $$ = gen_value($<ident>1, scope); }
188 $$ = gen_value($<ident>1, scope);
189 }else{
190 $$ = gen_value_tab($<ident>1,scope);
191 }
192 }
193| NUM { $$ = gen_num($1, scope); } 177| NUM { $$ = gen_num($1, scope); }
194| CARACTERE { $$ = gen_char($1, scope); } 178| CARACTERE { $$ = gen_char($1, scope); }
195| IDENT '(' Arguments ')' { $$ = gen_function_call($<ident>1,$<num>3); } 179| IDENT '(' Arguments ')' { $$ = gen_function_call($<ident>1,$<num>3); }