Changeset 9082d7e8 for src/ResolvExpr

Timestamp:

Mar 30, 2023, 4:05:59 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

Children:

bd72c284

Parents:

d24b1985 (diff), ff443e5 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• Candidate.cpp (modified) (2 diffs)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/Candidate.cpp

@@ -17 +17 @@
 
 #include <iostream>
+#include <sstream>
 
 #include "AST/Print.hpp"
@@ -44 +45 @@
         sorted.reserve(cands.size());
         for(const auto & c : cands) {
-                std::stringstream ss;
+                std::ostringstream ss;
                 print( ss, *c, indent );
                 sorted.push_back(ss.str());

src/ResolvExpr/Resolver.cc

@@ -39 +39 @@
 #include "AST/Type.hpp"
 #include "Common/Eval.h"                 // for eval
+#include "Common/Iterate.hpp"            // for group_iterate
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError
 #include "Common/Stats/ResolveTime.h"    // for ResolveTime::start(), ResolveTime::stop()
-#include "Common/utility.h"              // for ValueGuard, group_iterate
+#include "Common/ToString.hpp"           // for toCString
 #include "InitTweak/GenInit.h"
 #include "InitTweak/InitTweak.h"         // for isIntrinsicSingleArgCallStmt