X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=codea%2Fparser.y;h=01ff3cfb9f4f3994d50cfa51932526d58aa72ff9;hb=7558daa314b54a853327307c48f4b7d48939d1b5;hp=c64007e30c4605f52319190f7afbabbd0fc3a66a;hpb=1655012042275ce0a24e5429e3d2a14559849cda;p=uebersetzerbau-ss10.git

diff --git a/codea/parser.y b/codea/parser.y
index c64007e..01ff3cf 100644
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -39,11 +39,12 @@
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
 @attributes { struct symbol *f; int paramges; int parms; } Parms
-@attributes { struct symbol *f; } FeldID Structdef Program
+@attributes { struct symbol *f; int soffset; } Program
+@attributes { struct symbol *f; int soffset; int offsetcount; } FeldID Structdef
 @attributes { struct symbol *s; } Methoddef
 @attributes { struct symbol *s; int gparamges; } Statseq Exprs
-@attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; } Expr Minusterm Term Multerm Orterm
-@attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr Feld
+@attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; } 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
@@ -55,6 +56,7 @@ Input:
 	  Program
 	  @{
 	    @i @Program.f@ = tab_new();
+		@i @Program.soffset@ = 0;
 	    @gen @revorder(1) printf("\t.text\n");
 	  @}
 	;
@@ -64,11 +66,14 @@ Program:
 	  @{
 	    @i @Methoddef.s@ = @Program.0.f@;
 	    @i @Program.1.f@ = @Program.0.f@;
+	    @i @Program.1.soffset@ = @Program.0.soffset@;
 	  @}
 
 	| Structdef ';' Program
 	  @{
 	    @i @Program.1.f@ = tab_merge(@Program.0.f@, @Structdef.f@, 1);
+		@i @Structdef.offsetcount@ = @Program.0.soffset@;
+		@i @Program.1.soffset@ = @Structdef.soffset@;
 	  @}
 	|
 	;
@@ -87,6 +92,8 @@ Structdef:
 	  STRUCT FeldID END
 	  @{
 	    @i @Structdef.f@ = @FeldID.f@;
+		@i @FeldID.offsetcount@ = @Structdef.offsetcount@;
+		@i @Structdef.soffset@ = @FeldID.soffset@;
 	  @}
 	;
 
@@ -94,9 +101,9 @@ Parms:
 	  /* lokale Vars werden in Statement in die tabelle eingefuegt */
 	  IDENT Parms
 	  @{
-	    @i @Parms.1.parms@ = @Parms.parms@ + 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@);
+	    @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@, -1);
 	  @}
 
 	|
@@ -109,12 +116,16 @@ Parms:
 FeldID:
 	  IDENT FeldID
 	  @{
-	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1);
+	    @i @FeldID.1.offsetcount@ = @FeldID.0.offsetcount@ + 1;
+		@i @FeldID.0.soffset@ = @FeldID.1.soffset@;
+		/* TODO: offset hier verwenden */
+	    @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1, @FeldID.0.offsetcount@);
 	  @}
 
 	|
 	  @{
 	    @i @FeldID.f@ = tab_new();
+		@i @FeldID.soffset@ = @FeldID.offsetcount@;
 	  @}
 	;
 
@@ -142,7 +153,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, -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;
 	  @}
@@ -193,6 +204,8 @@ Lexpr:
 	  @{
 	    @i @Lexpr.node@ = TREENULL;
 	    @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM);
+		/* this.feldname */
+		/* TODO fuer zuweisungen ... (codeb?) */
 	  @}
 
 	| Feld
@@ -201,7 +214,10 @@ Lexpr:
 Feld: Term '.' IDENT
 	  @{
 	    @c check(@Feld.s@, @IDENT.name@, S_FIELD);
-	    @i @Feld.node@ = TREENULL;
+	    @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.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Feld)- Term.IDENT\n");
+		@reg @Term.node@->reg = @Feld.node@->reg;
 	  @}
 	;
 
@@ -214,8 +230,10 @@ Expr:
 
 	| NOT Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
 		@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@);
+
+		@reg @Term.node@->reg = @Expr.node@->reg;
 	  @}
 
 	| Term Minusterm
@@ -259,14 +277,24 @@ Expr:
 
 	| Term '<' Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
 		@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@);
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+		}
 	  @}
 
 	| Term '=' Term
 	  @{
-	    @i @Expr.node@ = TREENULL;
 		@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@);
+
+		@reg {
+			@Term.0.node@->reg = @Expr.node@->reg;
+			@Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.node@->skip, @Expr.gparamges@);
+		}
 	  @}
 	;
 
@@ -355,13 +383,27 @@ Term:
 	| IDENT
 	  @{
 	    @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM);
+
 		@i @Term.exprcount@ = 0; fprintf(stderr, "(Term)- IDENT\n");
-	    @i @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@);
+	    @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@);
+			} 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@);
+			}
+		}
+
+		@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;
+	    @i @Term.node@ = @Feld.node@;
 		/*TODO*/@i @Term.exprcount@ = 0;
 	  @}