From c40fbd980184172536af8f958f97f30eba11f148 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Tue, 18 May 2010 15:38:12 +0200 Subject: [PATCH] codea: good bye exprcount --- codea/parser.y | 72 +++++++++++++++++--------------------------------- codea/tree.c | 20 +++++++------- codea/tree.h | 9 +++---- 3 files changed, 37 insertions(+), 64 deletions(-) diff --git a/codea/parser.y b/codea/parser.y index bab08bc..b994891 100644 --- a/codea/parser.y +++ b/codea/parser.y @@ -24,14 +24,13 @@ @end /* beschreibung der attribute - * s: - * f: - * gparamges: - * parms: - * node: - * exprcount: - * sin: - * sout: + * s: symboltabelle + * f: symboltabelle fuer quirks mit structur und parameter + * gparamges: anzahl der parameter in einer methode + * parms: parametercounter + * node: baum fuer iburg + * sin: symboltabelle fuer statement ("eingabe") + * sout: symboltabelle die aus einem statement wieder rauskommt ("ausgabe") */ @autoinh s gparamges @autosyn node imm @@ -43,7 +42,7 @@ @attributes { struct symbol *f; int offsetcount; } FeldID @attributes { struct symbol *s; } Methoddef @attributes { struct symbol *s; int gparamges; } Statseq Exprs -@attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; short imm; } Expr Minusterm Multerm Orterm Feld Term +@attributes { struct symbol *s; int gparamges; struct treenode *node; short imm; } Expr Minusterm Multerm Orterm Feld Term @attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr @attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; } Statement @@ -186,7 +185,7 @@ Statement: @{ statinout() xxputsin(@Expr.s@,) - @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL, @Expr.exprcount@+1); fprintf(stderr, "RETURN: %s (gparamges: %i, exprcount: %i, gesamt %i [maximal: 7])\n", @Expr.gparamges@ + @Expr.exprcount@ + 1 > 7 ? "zu hohe tiefe" : "tiefe passt", @Expr.gparamges@, @Expr.exprcount@+1, @Expr.gparamges@+@Expr.exprcount@+1); + @i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL); @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@); @} ; @@ -206,9 +205,8 @@ Lexpr: Feld: Term '.' IDENT @{ @c check(@Feld.s@, @IDENT.name@, S_FIELD); - @i @Feld.node@ = new_field(@IDENT.name@, @Term.node@, TREENULL, tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD)->soffset, @Feld.exprcount@); + @i @Feld.node@ = new_field(@IDENT.name@, @Term.node@, TREENULL, tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD)->soffset); - @i @Feld.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Feld)- Term.IDENT\n"); @reg @Term.node@->reg = @Feld.node@->reg; @} ; @@ -217,21 +215,18 @@ Expr: Term @{ @reg @Term.node@->reg = @Expr.node@->reg; - @i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- Term\n"); @} | NOT Term @{ - @i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- NOT Term\n"); - @i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL, @Expr.exprcount@), @Expr.exprcount@); + @i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL)); @reg @Term.node@->reg = @Expr.node@->reg; @} | Term Minusterm @{ - @i @Expr.exprcount@ = @Term.exprcount@ + @Minusterm.exprcount@; fprintf(stderr, "(Expr)- Term Minusterm\n"); - @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@, @Expr.exprcount@); + @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@); @i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@; @reg { @@ -248,8 +243,7 @@ Expr: | Term Multerm @{ - @i @Expr.exprcount@ = @Term.exprcount@ + @Multerm.exprcount@; fprintf(stderr, "(Expr)- Term Multerm\n"); - @i @Expr.node@ = new_node(O_MUL, @Term.node@, @Multerm.node@, @Expr.exprcount@); + @i @Expr.node@ = new_node(O_MUL, @Term.node@, @Multerm.node@); @i @Expr.imm@ = @Term.imm@ && @Multerm.imm@; @reg { @@ -264,8 +258,7 @@ Expr: | Term Orterm @{ - @i @Expr.exprcount@ = @Term.exprcount@ + @Orterm.exprcount@; fprintf(stderr, "(Expr)- Term Orterm\n"); - @i @Expr.node@ = new_node(O_OR, @Term.node@, @Orterm.node@, @Expr.exprcount@); + @i @Expr.node@ = new_node(O_OR, @Term.node@, @Orterm.node@); @i @Expr.imm@ = @Term.imm@ && @Orterm.imm@; @reg { @@ -276,8 +269,7 @@ Expr: | Term '<' Term @{ - @i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term < Term\n"); - @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@, @Expr.exprcount@); + @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@); @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@; @reg { @@ -288,8 +280,7 @@ Expr: | Term '=' Term @{ - @i @Expr.exprcount@ = @Term.0.exprcount@ + @Term.1.exprcount@; fprintf(stderr, "(Expr)- Term = Term\n"); - @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@, @Expr.exprcount@); + @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@); @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@; @reg { @@ -302,8 +293,7 @@ Expr: Minusterm: '-' Term Minusterm @{ - @i @Minusterm.0.exprcount@ = @Term.exprcount@ + @Minusterm.1.exprcount@; fprintf(stderr, "(Minusterm)- - Term Minusterm\n"); - @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@, @Minusterm.0.exprcount@); + @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@); @i @Minusterm.0.imm@ = @Term.imm@ && @Minusterm.1.imm@; @reg { @@ -318,7 +308,6 @@ Minusterm: | '-' Term @{ - @i @Minusterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Minusterm)- - Term\n"); @reg @Term.node@->reg = @Minusterm.node@->reg; @} ; @@ -326,8 +315,7 @@ Minusterm: Multerm: '*' Term Multerm @{ - @i @Multerm.0.exprcount@ = @Term.exprcount@ + @Multerm.1.exprcount@; fprintf(stderr, "(Multerm)- - Term Multerm\n"); - @i @Multerm.node@ = new_node(O_MUL, @Multerm.1.node@, @Term.node@, @Multerm.0.exprcount@); + @i @Multerm.node@ = new_node(O_MUL, @Multerm.1.node@, @Term.node@); @i @Multerm.0.imm@ = @Term.imm@ && @Multerm.1.imm@; @reg { @@ -342,7 +330,6 @@ Multerm: | '*' Term @{ - @i @Multerm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Multerm)- - Term\n"); @reg @Term.node@->reg = @Multerm.node@->reg; @} ; @@ -350,8 +337,7 @@ Multerm: Orterm: OR Term Orterm @{ - @i @Orterm.0.exprcount@ = @Term.exprcount@ + @Orterm.1.exprcount@; fprintf(stderr, "(Orterm)- - Term Orterm\n"); - @i @Orterm.node@ = new_node(O_OR, @Orterm.1.node@, @Term.node@, @Orterm.0.exprcount@); + @i @Orterm.node@ = new_node(O_OR, @Orterm.1.node@, @Term.node@); @i @Orterm.0.imm@ = @Term.imm@ && @Orterm.1.imm@; @reg { @@ -365,7 +351,6 @@ Orterm: @} | OR Term @{ - @i @Orterm.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Orterm)- - Term\n"); @reg @Term.node@->reg = @Orterm.node@->reg; @} @@ -375,27 +360,23 @@ Term: '(' Expr ')' @{ @i @Term.node@ = @Expr.node@; - @i @Term.exprcount@ = 1 + @Expr.exprcount@; fprintf(stderr, "(Term)- ( Expr )\n"); @} | NUM @{ - @i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- NUM\n"); - @i @Term.node@ = new_number(@NUM.val@, @Term.exprcount@); + @i @Term.node@ = new_number(@NUM.val@); @i @Term.imm@ = 1; @} | '-' NUM @{ - @i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- - NUM\n"); - @i @Term.node@ = new_number(-1 * (@NUM.val@), @Term.exprcount@); + @i @Term.node@ = new_number(-1 * (@NUM.val@)); @i @Term.imm@ = 1; @} | THIS @{ - @i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- THIS\n"); - @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0, @Term.exprcount@); + @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0); @i @Term.imm@ = 0; @} @@ -403,15 +384,14 @@ Term: @{ @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM); - @i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- IDENT\n"); @i @Term.imm@ = 0; @i { @Term.node@ = TREENULL; if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { /* es handelt sich um ein feldzugriff auf this */ - @Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0, @Term.exprcount@), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset, @Term.exprcount@); + @Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset); } else { /* param oder var */ - @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index, @Term.exprcount@); + @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_PARM)->param_index); } } @@ -424,21 +404,18 @@ Term: | Feld @{ @i @Term.node@ = @Feld.node@; - /*TODO*/@i @Term.exprcount@ = 0; @i @Term.imm@ = 0; @} | IDENT '(' Exprs ')' @{ @i @Term.node@ = TREENULL; - /*TODO*/@i @Term.exprcount@ = 0; @i @Term.imm@ = 0; @} | Term '.' IDENT '(' Exprs ')' @{ @i @Term.node@ = TREENULL; - /*TODO*/@i @Term.exprcount@ = 0; @i @Term.imm@ = 0; @} @@ -446,7 +423,6 @@ Term: Exprs: Expr ',' Exprs - /* TODO: exprcount uppen */ | Expr | ; diff --git a/codea/tree.c b/codea/tree.c index 2e430f2..593709c 100644 --- a/codea/tree.c +++ b/codea/tree.c @@ -15,12 +15,12 @@ static struct treenode *_new_plain(int op) new->parent = TREENULL; new->label = NULL; new->name = new->reg = (char *)NULL; - new->val = new->exprcount = 0; + new->val = 0; new->param_index = -1; return new; } -struct treenode *new_node(int op, struct treenode *l, struct treenode *r, int exprcount) +struct treenode *new_node(int op, struct treenode *l, struct treenode *r) { struct treenode *new = TREENULL; @@ -28,21 +28,20 @@ struct treenode *new_node(int op, struct treenode *l, struct treenode *r, int ex fprintf(stderr, "new_node: %i (%s)\n", op, o_names[op]); #endif if(op == O_SUB && l != TREENULL && r != TREENULL && l->op == O_NUM && r->op == O_NUM) { - new = new_number(l->val - r->val, exprcount); + new = new_number(l->val - r->val); free(l); free(r); } else { new = _new_plain(op); new->kids[0] = l; new->kids[1] = r; - new->exprcount = exprcount; } new->name = (char *)NULL; return new; } -struct treenode *new_param(int op, char *name, struct treenode *l, struct treenode *r, int param_index, int exprcount) +struct treenode *new_param(int op, char *name, struct treenode *l, struct treenode *r, int param_index) { - struct treenode *new = new_node(op, l, r, exprcount); + struct treenode *new = new_node(op, l, r); #ifdef DDTREE fprintf(stderr, "new_param: %i (index)\n", param_index); @@ -52,9 +51,9 @@ struct treenode *new_param(int op, char *name, struct treenode *l, struct treeno return new; } -struct treenode *new_field(char *name, struct treenode *l, struct treenode *r, int soffset, int exprcount) +struct treenode *new_field(char *name, struct treenode *l, struct treenode *r, int soffset) { - struct treenode *new = new_node(O_FIELD, l, r, exprcount); + struct treenode *new = new_node(O_FIELD, l, r); #ifdef DDTREE fprintf(stderr, "new_field: %i (soffset)\n", soffset); @@ -64,7 +63,7 @@ struct treenode *new_field(char *name, struct treenode *l, struct treenode *r, i return new; } -struct treenode *new_number(long val, int exprcount) +struct treenode *new_number(long val) { struct treenode *new; /* TODO: maximal groesse? */ @@ -89,7 +88,6 @@ struct treenode *new_number(long val, int exprcount) fprintf(stderr, "new_number: %i\n", val); #endif new->val = val; - new->exprcount = exprcount; memset(t, 0, BUFMAX); sprintf(t, "%li", val); new->name = t; @@ -109,7 +107,7 @@ void write_tree(struct treenode *node, int indent) { if(node == TREENULL) return; write_indent(indent); - fprintf(stderr, "%s @ %%%s (%i). \"%s\"\n", o_names[node->op], node->reg, node->exprcount, node->name == (char*) NULL ? "" : node->name); + fprintf(stderr, "%s @ %%%s. \"%s\"\n", o_names[node->op], node->reg, node->name == (char*) NULL ? "" : node->name); if(node->kids[0] != TREENULL) { write_tree(node->kids[0], indent+1); } diff --git a/codea/tree.h b/codea/tree.h index 2e38ed4..24f1a3a 100644 --- a/codea/tree.h +++ b/codea/tree.h @@ -32,7 +32,6 @@ struct treenode { char *reg; struct treenode *parent; int param_index; - int exprcount; int soffset; }; @@ -45,10 +44,10 @@ typedef struct treenode *treenodep; #define STATE_LABEL(p) ((p)->label) #define PANIC printf -struct treenode *new_node(int op, struct treenode *l, struct treenode *r, int exprcount); -struct treenode *new_number(long val, int exprcount); -struct treenode *new_param(int op, char *name, struct treenode *l, struct treenode *r, int param_index, int exprcount); -struct treenode *new_field(char *name, struct treenode *l, struct treenode *r, int soffset, int exprcount); +struct treenode *new_node(int op, struct treenode *l, struct treenode *r); +struct treenode *new_number(long val); +struct treenode *new_param(int op, char *name, struct treenode *l, struct treenode *r, int param_index); +struct treenode *new_field(char *name, struct treenode *l, struct treenode *r, int soffset); void write_tree(struct treenode *node, int ident); #endif -- 2.25.1