"a->b" is just shorthand for "(*a).b".

So let's make that explicit in the parse tree, and avoid
carrying the special cases around further. This makes the
evaluation phase only have one case to worry about.

1 files changed, 9 insertions, 2 deletions

diff --git a/expression.c b/expression.c
index d02452c..2133379 100644
--- a/expression.c
+++ b/expression.c
@@ -300,10 +300,17 @@ static struct token *postfix_expression(struct token *token, struct expression *
 			token = token->next;
 			continue;
 		}
-		case '.':			/* Structure member dereference */
 		case SPECIAL_DEREFERENCE: {	/* Structure pointer member dereference */
+			/* "x->y" is just shorthand for "(*x).y" */
+			struct expression *inner = alloc_expression(token->pos, EXPR_PREOP);
+			inner->op = '*';
+			inner->unop = expr;
+			expr = inner;
+		}
+		/* Fallthrough!! */
+		case '.': {			/* Structure member dereference */
 			struct expression *deref = alloc_expression(token->pos, EXPR_DEREF);
-			deref->op = token->special;
+			deref->op = '.';
 			deref->deref = expr;
 			token = token->next;
 			if (token_type(token) != TOKEN_IDENT) {