Changeset 38093ae for src/Tuples

Timestamp:

Apr 18, 2024, 8:44:24 PM (20 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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

Location:

src/Tuples

Files:

• TupleAssignment.cc (modified) (1 diff)
• TupleExpansion.cpp (modified) (2 diffs)
• Tuples.h (modified) (1 diff)

src/Tuples/TupleAssignment.cc

@@ -35 +35 @@
 #include "InitTweak/GenInit.h"             // for genCtorInit
 #include "InitTweak/InitTweak.h"           // for getPointerBase, isAssignment
+#include "ResolvExpr/CandidateFinder.hpp"  // for CandidateFinder
 #include "ResolvExpr/Cost.h"               // for Cost
 #include "ResolvExpr/Resolver.h"           // for resolveCtorInit

src/Tuples/TupleExpansion.cpp

@@ -106 +106 @@
                         assignUnq = commaExpr->arg1;
                 }
-                auto finished = new ast::ObjectDecl( loc, toString( "_unq", id, "_finished_" ), new ast::BasicType( ast::BasicType::Kind::Bool ),
+                auto finished = new ast::ObjectDecl( loc, toString( "_unq", id, "_finished_" ), new ast::BasicType( ast::BasicKind::Bool ),
                         new ast::SingleInit( loc, ast::ConstantExpr::from_int( loc, 0 ) ), {}, ast::Linkage::Cforall );
                 declsToAddBefore.push_back( finished );
@@ -175 +175 @@
                         new ast::ObjectDecl( location,
                                 "dummy",
-                                new ast::BasicType( ast::BasicType::SignedInt ),
+                                new ast::BasicType( ast::BasicKind::SignedInt ),
                                 nullptr,
                                 ast::Storage::Classes(),

src/Tuples/Tuples.h

@@ -21 +21 @@
 #include "AST/Fwd.hpp"
 #include "AST/Node.hpp"
-#include "ResolvExpr/CandidateFinder.hpp"
+namespace ResolvExpr {
+        class CandidateFinder;
+}
 
 namespace Tuples {