X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=codea%2Fparser.y;h=b994891bb15bf11ceed54dcf623525cc76b016b3;hb=c40fbd980184172536af8f958f97f30eba11f148;hp=3ccb81f705bb2cb25cb2accb7b697fd4480c0d44;hpb=fdf651dc3e6d5166926e9fac4bc21dcc3eb06fda;p=uebersetzerbau-ss10.git

diff --git a/codea/parser.y b/codea/parser.y
index 3ccb81f..b994891 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -5,6 +5,8 @@
 	#include "symtable.h"
 	#include "chelper.h"
 	#include "tree.h"
+
+	#define MAX(A,B) (A > B ? A : B)
 %}
 
 %start Input
@@ -21,15 +23,28 @@
 	 * geht nicht, weil verschachtelte macros deaktiviert sind */
 @end
 
-@autoinh s
-@autosyn node
+/* beschreibung der attribute
+ * 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
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
-@attributes { struct symbol *f; } FeldID Parms Structdef Program
-@attributes { struct symbol *s; } Methoddef Statseq Exprs
-@attributes { struct symbol *s; struct treenode *node; } Lexpr Expr Minusterm Multerm Orterm Term Feld
-@attributes { struct symbol *sin; struct symbol *sout; struct treenode *node; } Statement
+@attributes { struct symbol *f; int paramges; int parms; } Parms
+@attributes { struct symbol *f; } Program Structdef;
+@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; 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
 
 @traversal @postorder c
 @traversal @preorder reg
@@ -61,7 +76,9 @@ Program:
 Methoddef:
 	  METHOD IDENT '(' Parms ')' Statseq END
 	  @{
+	    @i @Parms.parms@ = 1;
 	    @i @Statseq.s@ = tab_merge(@Methoddef.s@, @Parms.f@, 0);
+		@i @Statseq.gparamges@ = @Parms.paramges@;
 	    @gen @revorder(1) func_header(@IDENT.name@);
 	  @}
 	;
@@ -70,6 +87,7 @@ Structdef:
 	  STRUCT FeldID END
 	  @{
 	    @i @Structdef.f@ = @FeldID.f@;
+		@i @FeldID.offsetcount@ = 0;
 	  @}
 	;
 
@@ -77,19 +95,23 @@ Parms:
 	  /* lokale Vars werden in Statement in die tabelle eingefuegt */
 	  IDENT Parms
 	  @{
-	    @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1);
+	    @i @Parms.1.parms@ = @Parms.0.parms@ + 1;
+		@i @Parms.0.paramges@ = @Parms.1.paramges@;
+	    @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@, -1);
 	  @}
 
 	|
 	  @{
 	    @i @Parms.f@ = tab_new();
+		@i @Parms.paramges@ = @Parms.parms@;
 	  @}
 	;
 
 FeldID:
 	  IDENT FeldID
 	  @{
-	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1);
+	    @i @FeldID.1.offsetcount@ = @FeldID.0.offsetcount@ + 1;
+	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1, @FeldID.0.offsetcount@);
 	  @}
 
 	|
@@ -103,7 +125,7 @@ Statseq:
 	  @{
 		@i @Statement.sin@ = @Statseq.0.s@;
 		@i @Statseq.1.s@ = @Statement.sout@;
-		@gen burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
+		@gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
 	  @}
 
 	|
@@ -122,7 +144,7 @@ Statement:
 	  @{
 	  	/* tab_clone ist hier noetig, vgl. folgendes statement
 		 * > var x := x - 1; */
-		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1);
+		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, -1, -1);
 		xxputsin(@Expr.s@,)
 	    @i @Statement.node@ = TREENULL;
 	  @}
@@ -164,7 +186,7 @@ Statement:
 	  	statinout()
 		xxputsin(@Expr.s@,)
 		@i @Statement.node@ = new_node(O_RET, @Expr.node@, TREENULL);
-		@reg @Statement.node@->reg = next_reg((char *)NULL, 0); @Expr.node@->reg = @Statement.node@->reg;
+		@reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 	  @}
 	;
 
@@ -173,6 +195,8 @@ Lexpr:
 	  @{
 	    @i @Lexpr.node@ = TREENULL;
 	    @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM);
+		/* this.feldname */
+		/* TODO fuer zuweisungen ... (codeb?) */
 	  @}
 
 	| Feld
@@ -181,8 +205,9 @@ Lexpr:
 Feld: Term '.' IDENT
 	  @{
 	    @c check(@Feld.s@, @IDENT.name@, S_FIELD);
-	    @i @Feld.node@ = TREENULL;
-		@reg fprintf(stderr, "w00t8\n");
+	    @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);
+
+		@reg @Term.node@->reg = @Feld.node@->reg;
 	  @}
 	;
 
@@ -194,73 +219,139 @@ Expr:
 
 	| NOT Term
 	  @{
-	    @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t2\n");
+		@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.node@ = TREENULL; fprintf(stderr, "w00t3\n");
+	    @i @Expr.node@ = new_node(O_SUB, @Term.node@, @Minusterm.node@);
+		@i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
+
+		@reg {
+			if(!(@Expr.node@->kids[0] == TREENULL && @Expr.node@->kids[1] == TREENULL)) {
+				@Term.node@->reg = @Expr.node@->reg;
+				if(@Minusterm.imm@) {
+					@Minusterm.node@->reg = @Expr.node@->reg;
+				} else {
+					@Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+				}
+			}
+		}
 	  @}
 
 	| Term Multerm
 	  @{
-	    @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t4\n");
+	    @i @Expr.node@ = new_node(O_MUL, @Term.node@, @Multerm.node@);
+		@i @Expr.imm@ = @Term.imm@ && @Multerm.imm@;
+
+		@reg {
+			@Term.node@->reg = @Expr.node@->reg;
+			if(@Term.imm@) {
+				@Multerm.node@->reg = @Expr.node@->reg;
+			} else {
+				@Multerm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+			}
+		}
 	  @}
 
 	| Term Orterm
 	  @{
-	    @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t5\n");
+	    @i @Expr.node@ = new_node(O_OR, @Term.node@, @Orterm.node@);
+		@i @Expr.imm@ = @Term.imm@ && @Orterm.imm@;
+
+		@reg {
+			@Term.node@->reg = @Expr.node@->reg;
+			@Orterm.node@->reg = next_reg(@Term.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term '<' Term
 	  @{
-	    @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t6\n");
+	    @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@);
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term '=' Term
 	  @{
-	    @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t7\n");
+	    @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@);
+		@i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
+		}
 	  @}
 	;
 
 Minusterm:
 	  '-' Term Minusterm
 	  @{
-	    @i @Minusterm.node@ = TREENULL;
-	    @reg fprintf(stderr, "minus1\n");
+	    @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@);
+		@i @Minusterm.0.imm@ = @Term.imm@ && @Minusterm.1.imm@;
+
+	    @reg {
+			@Minusterm.1.node@->reg = @Minusterm.node@->reg;
+			if(@Minusterm.1.imm@) {
+				@Term.node@->reg = @Minusterm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Minusterm.1.node@->reg, @Minusterm.gparamges@);
+			}
+		}
 	  @}
 
 	| '-' Term
 	  @{
-	    @i @Minusterm.node@ = TREENULL;
-	    @reg fprintf(stderr, "minus2\n");
+	    @reg @Term.node@->reg = @Minusterm.node@->reg;
 	  @}
 	;
 
 Multerm:
 	  '*' Term Multerm
 	  @{
-	    @i @Multerm.node@ = TREENULL;
-	    @reg fprintf(stderr, "mul1\n");
+	    @i @Multerm.node@ = new_node(O_MUL, @Multerm.1.node@, @Term.node@);
+		@i @Multerm.0.imm@ = @Term.imm@ && @Multerm.1.imm@;
+
+	    @reg {
+			@Multerm.1.node@->reg = @Multerm.node@->reg;
+			if(@Multerm.1.imm@) {
+				@Term.node@->reg = @Multerm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Multerm.1.node@->reg, @Multerm.gparamges@);
+			}
+		}
 	  @}
 
 	| '*' Term
 	  @{
-	    @i @Multerm.node@ = TREENULL;
-	    @reg fprintf(stderr, "mul2\n");
+	    @reg @Term.node@->reg = @Multerm.node@->reg;
 	  @}
 	;
 
 Orterm:
 	  OR Term Orterm
 	  @{
-	    @i @Orterm.node@ = TREENULL;
-	    @reg fprintf(stderr, "or1\n");
+	    @i @Orterm.node@ = new_node(O_OR, @Orterm.1.node@, @Term.node@);
+		@i @Orterm.0.imm@ = @Term.imm@ && @Orterm.1.imm@;
+
+	    @reg {
+			@Orterm.1.node@->reg = @Orterm.node@->reg;
+			if(@Orterm.1.imm@) {
+				@Term.node@->reg = @Orterm.node@->reg;
+			} else {
+				@Term.node@->reg = next_reg(@Orterm.1.node@->reg, @Orterm.gparamges@);
+			}
+		}
 	  @}
 	| OR Term
 	  @{
-	    @i @Orterm.node@ = TREENULL;
-	    @reg fprintf(stderr, "or2\n");
+	    @reg @Term.node@->reg = @Orterm.node@->reg;
 	  @}
 
 	;
@@ -268,51 +359,64 @@ Orterm:
 Term:
 	  '(' Expr ')'
 	  @{
-	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf1\n");
+	    @i @Term.node@ = @Expr.node@;
 	  @}
 
 	| NUM
 	  @{
-	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf2\n");
+	    @i @Term.node@ = new_number(@NUM.val@);
+		@i @Term.imm@ = 1;
 	  @}
 
 	| '-' NUM
 	  @{
-	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf3\n");
+	    @i @Term.node@ = new_number(-1 * (@NUM.val@));
+		@i @Term.imm@ = 1;
 	  @}
 
 	| THIS
 	  @{
-	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf4\n");
+	    @i @Term.node@ = new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0);
+		@i @Term.imm@ = 0;
 	  @}
 
 	| IDENT
 	  @{
 	    @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
-	    @i @Term.node@ = new_node(O_ID, TREENULL, TREENULL); @Term.node@->param_index=1;
-	    @reg fprintf(stderr, "wtf5\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), 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);
+			}
+		}
+
+		@reg if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) {
+			/* TODO: kein schoener hack? */
+			@Term.node@->kids[0]->reg = @Term.node@->reg;
+		}
 	  @}
 
 	| Feld
 	  @{
-	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf6\n");
+	    @i @Term.node@ = @Feld.node@;
+		@i @Term.imm@ = 0;
 	  @}
 
 	| IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf7\n");
+		@i @Term.imm@ = 0;
 	  @}
 
 	| Term '.' IDENT '(' Exprs ')'
 	  @{
 	    @i @Term.node@ = TREENULL;
-	    @reg fprintf(stderr, "wtf8\n");
+		@i @Term.imm@ = 0;
 	  @}
 
 	;