1 files changed, 7 insertions, 3 deletions
diff --git a/expr.h b/expr.h
index e660848..5667839 100644
--- a/expr.h
+++ b/expr.h
@@ -6,7 +6,7 @@ enum exprkind {
 
 	/* postfix expression */
 	EXPRCALL,
-	/* member E.M gets transformed to *(typeof(E.M) *)((char *)E + offsetof(typeof(E), M)) */
+	EXPRMEMBER,
 	EXPRINCDEC,
 	EXPRCOMPOUND,
 	/* subscript E1[E2] gets transformed to *((E1)+(E2)) */
@@ -49,14 +49,18 @@ struct expr {
 			size_t nargs;
 		} call;
 		struct {
-			struct init *init;
-		} compound;
+			struct expr *base;
+			size_t offset;
+		} member;
 		struct {
 			int op;
 			_Bool post;
 			struct expr *base;
 		} incdec;
 		struct {
+			struct init *init;
+		} compound;
+		struct {
 			int op;
 			struct expr *base;
 		} unary;