Ast: improve consistency in instantiators

chqrlie · bvdberg · commit fa2e6f51474a · 2025-11-02T07:51:51.000+01:00
* add missing stats
* use direct return statements with casts
diff --git a/ast/array_designated_init_expr.c2 b/ast/array_designated_init_expr.c2
@@ -42,11 +42,10 @@ public fn ArrayDesignatedInitExpr* ArrayDesignatedInitExpr.create(ast_context.Co
 }
 
 fn Expr* ArrayDesignatedInitExpr.instantiate(ArrayDesignatedInitExpr* e, Instantiator* inst) {
-    ArrayDesignatedInitExpr* f = ArrayDesignatedInitExpr.create(inst.c,
-                                                                e.base.base.loc,
-                                                                e.designator.instantiate(inst),
-                                                                e.initValue.instantiate(inst));
-    return (Expr*)f;
+    return (Expr*)ArrayDesignatedInitExpr.create(inst.c,
+                                                 e.base.base.loc,
+                                                 e.designator.instantiate(inst),
+                                                 e.initValue.instantiate(inst));
 }
 
 public fn Expr* ArrayDesignatedInitExpr.getDesignator(const ArrayDesignatedInitExpr* e) {
diff --git a/ast/array_subscript_expr.c2 b/ast/array_subscript_expr.c2
@@ -48,12 +48,11 @@ public fn ArraySubscriptExpr* ArraySubscriptExpr.create(ast_context.Context* c,
 }
 
 fn Expr* ArraySubscriptExpr.instantiate(ArraySubscriptExpr* e, Instantiator* inst) {
-    ArraySubscriptExpr* a = ArraySubscriptExpr.create(inst.c,
-                                                      e.base.base.loc,
-                                                      e.base.base.arraySubscriptExprBits.src_len,
-                                                      e.lhs.instantiate(inst),
-                                                      e.idx.instantiate(inst));
-    return (Expr*)a;
+    return (Expr*)ArraySubscriptExpr.create(inst.c,
+                                            e.base.base.loc,
+                                            e.base.base.arraySubscriptExprBits.src_len,
+                                            e.lhs.instantiate(inst),
+                                            e.idx.instantiate(inst));
 }
 
 public fn Expr* ArraySubscriptExpr.getBase(const ArraySubscriptExpr* e) { return e.lhs; }
diff --git a/ast/asm_stmt.c2 b/ast/asm_stmt.c2
@@ -97,7 +97,7 @@ public fn AsmStmt* AsmStmt.create(ast_context.Context* c,
     return s;
 }
 
-fn Stmt* AsmStmt.instantiate(AsmStmt* s, Instantiator* inst) @(unused) {
+fn Stmt* AsmStmt.instantiate(AsmStmt* s, Instantiator* inst) {
     // TODO
     return (Stmt*)s;
 }
diff --git a/ast/assert_stmt.c2 b/ast/assert_stmt.c2
@@ -38,8 +38,7 @@ public fn AssertStmt* AssertStmt.create(ast_context.Context* c,
 }
 
 fn Stmt* AssertStmt.instantiate(AssertStmt* s, Instantiator* inst) {
-    AssertStmt* s2 = AssertStmt.create(inst.c, s.base.loc, s.inner.instantiate(inst));
-    return (Stmt*)s2;
+    return (Stmt*)AssertStmt.create(inst.c, s.base.loc, s.inner.instantiate(inst));
 }
 
 public fn Expr* AssertStmt.getInner(const AssertStmt* s) { return s.inner; }
diff --git a/ast/bitoffset_expr.c2 b/ast/bitoffset_expr.c2
@@ -42,11 +42,10 @@ public fn BitOffsetExpr* BitOffsetExpr.create(ast_context.Context* c, SrcLoc loc
 }
 
 fn Expr* BitOffsetExpr.instantiate(BitOffsetExpr* e, Instantiator* inst) {
-    BitOffsetExpr* b = BitOffsetExpr.create(inst.c,
-                                            e.base.base.loc,
-                                            e.lhs.instantiate(inst),
-                                            e.rhs.instantiate(inst));
-    return (Expr*)b;
+    return (Expr*)BitOffsetExpr.create(inst.c,
+                                       e.base.base.loc,
+                                       e.lhs.instantiate(inst),
+                                       e.rhs.instantiate(inst));
 }
 
 public fn Expr* BitOffsetExpr.getLHS(const BitOffsetExpr* e) { return e.lhs; }
diff --git a/ast/builtin_expr.c2 b/ast/builtin_expr.c2
@@ -111,25 +111,24 @@ public fn BuiltinExpr* BuiltinExpr.createToContainer(ast_context.Context* c, Src
 }
 
 fn Expr* BuiltinExpr.instantiate(BuiltinExpr* e, Instantiator* inst) {
-    BuiltinExpr* bi = nil;
     switch (e.getKind()) {
     case Sizeof:
     case Elemsof:
     case EnumMin:
     case EnumMax:
-        bi = BuiltinExpr.create(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len, e.inner.instantiate(inst), e.getKind());
-        break;
+        return (Expr*)BuiltinExpr.create(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len,
+                                         e.inner.instantiate(inst), e.getKind());
     case OffsetOf:
-        bi = BuiltinExpr.createOffsetOf(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len, e.inner.instantiate(inst), e.offset[0].member.instantiate(inst));
-        break;
+        return (Expr*)BuiltinExpr.createOffsetOf(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len,
+                                                 e.inner.instantiate(inst),
+                                                 e.offset[0].member.instantiate(inst));
     case ToContainer:
-        bi = BuiltinExpr.createToContainer(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len,
-                                             e.inner.instantiate(inst),
-                                             e.container[0].member.instantiate(inst),
-                                             e.container[0].pointer.instantiate(inst));
-        break;
+        return (Expr*)BuiltinExpr.createToContainer(inst.c, e.base.base.loc, e.base.base.builtinExprBits.src_len,
+                                                    e.inner.instantiate(inst),
+                                                    e.container[0].member.instantiate(inst),
+                                                    e.container[0].pointer.instantiate(inst));
     }
-    return (Expr*)bi;
+    return nil;
 }
 
 public fn BuiltinExprKind BuiltinExpr.getKind(const BuiltinExpr* e) {
diff --git a/ast/compound_stmt.c2 b/ast/compound_stmt.c2
@@ -58,7 +58,9 @@ fn CompoundStmt* CompoundStmt.instantiate(CompoundStmt* s, Instantiator* inst) {
     for (u32 i=0; i<count; i++) {
         s2.stmts[i] = s.stmts[i].instantiate(inst);
     }
-
+#if AstStatistics
+    Stats.addStmt(StmtKind.Compound, size);
+#endif
     return s2;
 }
 
diff --git a/ast/conditional_operator.c2 b/ast/conditional_operator.c2
@@ -47,13 +47,12 @@ public fn ConditionalOperator* ConditionalOperator.create(ast_context.Context* c
 }
 
 fn Expr* ConditionalOperator.instantiate(ConditionalOperator* e, Instantiator* inst) {
-    ConditionalOperator* o = ConditionalOperator.create(inst.c,
-                                                        e.base.base.loc,
-                                                        e.colonLoc,
-                                                        e.cond.instantiate(inst),
-                                                        e.lhs.instantiate(inst),
-                                                        e.rhs.instantiate(inst));
-    return (Expr*)o;
+    return (Expr*)ConditionalOperator.create(inst.c,
+                                             e.base.base.loc,
+                                             e.colonLoc,
+                                             e.cond.instantiate(inst),
+                                             e.lhs.instantiate(inst),
+                                             e.rhs.instantiate(inst));
 }
 
 public fn Expr* ConditionalOperator.getCond(const ConditionalOperator* e) {
diff --git a/ast/explicit_cast_expr.c2 b/ast/explicit_cast_expr.c2
@@ -61,6 +61,9 @@ fn Expr* ExplicitCastExpr.instantiate(ExplicitCastExpr* e, Instantiator* inst) {
     e2.inner = e.inner.instantiate(inst);
     e2.dest_type = QualType_Invalid;
     e2.dest.instantiate(&e.dest, inst);
+#if AstStatistics
+    Stats.addExpr(ExprKind.ExplicitCast, size);
+#endif
     return (Expr*)e2;
 }
 
diff --git a/ast/member_expr.c2 b/ast/member_expr.c2
@@ -106,6 +106,9 @@ fn Expr* MemberExpr.instantiate(MemberExpr* e, Instantiator* inst) {
     string.memcpy(e2, e, size);
     if (base) e2.refs[0].expr = base.instantiate(inst);
 
+#if AstStatistics
+    Stats.addExpr(ExprKind.Member, size);
+#endif
     return (Expr*)e2;
 }
 
diff --git a/ast/stmt.c2 b/ast/stmt.c2
@@ -120,9 +120,7 @@ fn Stmt* Stmt.instantiate(Stmt* s, Instantiator* inst) {
     case Switch:
         return SwitchStmt.instantiate((SwitchStmt*)s, inst);
     case Break:
-        return s;
     case Continue:
-        return s;
     case Fallthrough:
         return s;
     case Label:
@@ -134,7 +132,7 @@ fn Stmt* Stmt.instantiate(Stmt* s, Instantiator* inst) {
     case Decl:
         return DeclStmt.instantiate((DeclStmt*)s, inst);
     case Asm:
-        break;
+        return AsmStmt.instantiate((AsmStmt*)s, inst);
     case Assert:
         return AssertStmt.instantiate((AssertStmt*)s, inst);
     }

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,10 @@ public fn ArrayDesignatedInitExpr* ArrayDesignatedInitExpr.create(ast_context.Co`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`fn Expr* ArrayDesignatedInitExpr.instantiate(ArrayDesignatedInitExpr* e, Instantiator* inst) {`
`45`		`- ArrayDesignatedInitExpr* f = ArrayDesignatedInitExpr.create(inst.c,`
`46`		`- e.base.base.loc,`
`47`		`- e.designator.instantiate(inst),`
`48`		`- e.initValue.instantiate(inst));`
`49`		`- return (Expr*)f;`
	`45`	`+ return (Expr*)ArrayDesignatedInitExpr.create(inst.c,`
	`46`	`+ e.base.base.loc,`
	`47`	`+ e.designator.instantiate(inst),`
	`48`	`+ e.initValue.instantiate(inst));`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public fn Expr* ArrayDesignatedInitExpr.getDesignator(const ArrayDesignatedInitExpr* e) {`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public fn AsmStmt* AsmStmt.create(ast_context.Context* c,`
`97`	`97`	`return s;`
`98`	`98`	`}`
`99`	`99`
`100`		`-fn Stmt* AsmStmt.instantiate(AsmStmt* s, Instantiator* inst) @(unused) {`
	`100`	`+fn Stmt* AsmStmt.instantiate(AsmStmt* s, Instantiator* inst) {`
`101`	`101`	`// TODO`
`102`	`102`	`return (Stmt*)s;`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public fn AssertStmt* AssertStmt.create(ast_context.Context* c,`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`fn Stmt* AssertStmt.instantiate(AssertStmt* s, Instantiator* inst) {`
`41`		`- AssertStmt* s2 = AssertStmt.create(inst.c, s.base.loc, s.inner.instantiate(inst));`
`42`		`- return (Stmt*)s2;`
	`41`	`+ return (Stmt*)AssertStmt.create(inst.c, s.base.loc, s.inner.instantiate(inst));`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public fn Expr* AssertStmt.getInner(const AssertStmt* s) { return s.inner; }`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,10 @@ public fn BitOffsetExpr* BitOffsetExpr.create(ast_context.Context* c, SrcLoc loc`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`fn Expr* BitOffsetExpr.instantiate(BitOffsetExpr* e, Instantiator* inst) {`
`45`		`- BitOffsetExpr* b = BitOffsetExpr.create(inst.c,`
`46`		`- e.base.base.loc,`
`47`		`- e.lhs.instantiate(inst),`
`48`		`- e.rhs.instantiate(inst));`
`49`		`- return (Expr*)b;`
	`45`	`+ return (Expr*)BitOffsetExpr.create(inst.c,`
	`46`	`+ e.base.base.loc,`
	`47`	`+ e.lhs.instantiate(inst),`
	`48`	`+ e.rhs.instantiate(inst));`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`public fn Expr* BitOffsetExpr.getLHS(const BitOffsetExpr* e) { return e.lhs; }`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,9 @@ fn CompoundStmt* CompoundStmt.instantiate(CompoundStmt* s, Instantiator* inst) {`
`58`	`58`	`for (u32 i=0; i<count; i++) {`
`59`	`59`	`s2.stmts[i] = s.stmts[i].instantiate(inst);`
`60`	`60`	`}`
`61`		`-`
	`61`	`+#if AstStatistics`
	`62`	`+ Stats.addStmt(StmtKind.Compound, size);`
	`63`	`+#endif`
`62`	`64`	`return s2;`
`63`	`65`	`}`
`64`	`66`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ fn Expr* ExplicitCastExpr.instantiate(ExplicitCastExpr* e, Instantiator* inst) {`
`61`	`61`	`e2.inner = e.inner.instantiate(inst);`
`62`	`62`	`e2.dest_type = QualType_Invalid;`
`63`	`63`	`e2.dest.instantiate(&e.dest, inst);`
	`64`	`+#if AstStatistics`
	`65`	`+ Stats.addExpr(ExprKind.ExplicitCast, size);`
	`66`	`+#endif`
`64`	`67`	`return (Expr*)e2;`
`65`	`68`	`}`
`66`	`69`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ fn Expr* MemberExpr.instantiate(MemberExpr* e, Instantiator* inst) {`
`106`	`106`	`string.memcpy(e2, e, size);`
`107`	`107`	`if (base) e2.refs[0].expr = base.instantiate(inst);`
`108`	`108`
	`109`	`+#if AstStatistics`
	`110`	`+ Stats.addExpr(ExprKind.Member, size);`
	`111`	`+#endif`
`109`	`112`	`return (Expr*)e2;`
`110`	`113`	`}`
`111`	`114`