shithub: scc

Download patch

ref: 5d74dc264ed9a012ad74016ed02b2cd9d96d75b1
parent: a1254513235f39ea3816072cf50c0a46f6155e67
author: Roberto E. Vargas Caballero <k0ga@shike2.com>
date: Sun Jan 17 16:40:17 EST 2016 

Pass pointer to the initializer struct to the designations

We need the state of the current initialization in the full
initializer, and in this cases the best approach is to pass
a struct to all the functions with the data that they need.


--- a/cc1/init.c
+++ b/cc1/init.c
@@ -6,24 +6,26 @@
 #include "../inc/sizes.h"
 #include "cc1.h"
 
+typedef struct inititlizer Init;
+
 struct designator {
 	TINT pos;
+	Node *expr;
 	struct designator *next;
 };
 
 struct inititlizer {
-	Node *expr;
-	struct designator *dp;
-	struct inititalizer *next;
+	Type *type;
+	struct designator *head;
 };
 
 static TINT
-arydesig(Type *tp)
+arydesig(Init *ip)
 {
 	TINT npos;
 	Node *np;
 
-	if (tp->op != ARY)
+	if (ip->type->op != ARY)
 		errorp("array index in non-array initializer");
 	next();
 	np = iconstexpr();
@@ -34,11 +36,12 @@
 }
 
 static TINT
-fielddesig(Type *tp)
+fielddesig(Init *ip)
 {
 	TINT npos;
 	int ons;
 	Symbol *sym, **p;
+	Type *tp = ip->type;
 
 	if (!tp->aggreg)
 		errorp("field name not in record or union initializer");
@@ -59,50 +62,38 @@
 	return p - tp->p.fields;
 }
 
-static struct designator *
-designation(Type *tp)
+static Init *
+designation(Init *ip)
 {
-	struct designator *dp, *d, *head;
-	TINT (*fun)(Type *);
+	struct designator *dp;
+	TINT (*fun)(Init *);
 
-	for (;;) {
-		switch (yytoken) {
-		case '[': fun = arydesig;   break;
-		case '.': fun = fielddesig; break;
-		default:
-			if (head)
-				expect('=');
-			return head;
-		}
-		d = xmalloc(sizeof(*d));
-		d->next = NULL;
+	dp = xmalloc(sizeof(*dp));
+	dp->next = ip->head;
+	ip->head = dp;
 
-		if (!head) {
-			head = dp = d;
-		} else {
-			dp->next = d;
-			dp = d;
-		}
-		dp->pos  = (*fun)(tp);
+	switch (yytoken) {
+	case '[': fun = arydesig;   break;
+	case '.': fun = fielddesig; break;
+	default:  return ip;
 	}
+
+	dp->pos  = (*fun)(ip);
+	expect('=');
+	return ip;
 }
 
-static struct designator *
+static Node *
 initlist(Symbol *sym, Type *tp)
 {
-	struct designator *dp;
 	struct inititlizer *ip;
 	int toomany = 0;
 	TINT n;
 	Type *newtp;
 
+	/* TODO: catch the case of empty list */
 	for (n = 0; ; ++n) {
-		if ((dp = designation(tp)) == NULL) {
-			dp = xmalloc(sizeof(*dp));
-			dp->pos = n;
-		} else {
-			n = dp->pos;
-		}
+		designation(ip);
 		switch (tp->op) {
 		case ARY:
 			newtp = tp->type;
@@ -137,7 +128,7 @@
 		}
 		if (accept('{'))
 			return initlist(sym, tp);
-		ip->expr = assign(NULL);
+		ip->head->expr = assign(NULL);
 
 		if (!accept(','))
 			break;
@@ -148,7 +139,7 @@
 		tp->n.elem = n + 1;
 		tp->defined = 1;
 	}
-	return dp;
+	return NULL;
 }
 
 void