Changeset 2a301ff for src/InitTweak/InitTweak.cc

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• src/InitTweak/InitTweak.cc (modified) (3 diffs)

src/InitTweak/InitTweak.cc

@@ -882 +882 @@
                 if (!assign) {
                         auto td = new ast::TypeDecl(CodeLocation(), "T", {}, nullptr, ast::TypeDecl::Dtype, true);
-                        assign = new ast::FunctionDecl(CodeLocation(), "?=?", {},
+                        assign = new ast::FunctionDecl(CodeLocation(), "?=?", {td},
                         { new ast::ObjectDecl(CodeLocation(), "_dst", new ast::ReferenceType(new ast::TypeInstType("T", td))),
                           new ast::ObjectDecl(CodeLocation(), "_src", new ast::TypeInstType("T", td))},
@@ -891 +891 @@
                                 dst = new ast::AddressExpr(dst);
                         }
-                }
-                else {
+                } else {
                         dst = new ast::CastExpr(dst, new ast::ReferenceType(dst->result, {}));
                 }
@@ -900 +899 @@
                         }
                 }
-                return new ast::ApplicationExpr(dst->location, ast::VariableExpr::functionPointer(dst->location, assign), {dst, src});
+                auto var = ast::VariableExpr::functionPointer(dst->location, assign);
+                auto app = new ast::ApplicationExpr(dst->location, var, {dst, src});
+                // Skip the resolver, just set the result to the correct type.
+                app->result = ast::deepCopy( src->result );
+                return app;
         }