Changeset 640b3df for src/ResolvExpr

Timestamp:

Feb 21, 2023, 4:24:34 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

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

Children:

257a8f5, ce44c5f

Parents:

1180175 (diff), 9a533ba (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:

• CurrentObject.cc (modified) (1 diff)
• ResolveAssertions.cc (modified) (1 diff)
• Resolver.cc (modified) (1 diff)
• Resolver.h (modified) (1 diff)

src/ResolvExpr/CurrentObject.cc

@@ -26 +26 @@
 #include "AST/Init.hpp"                // for Designation
 #include "AST/Node.hpp"                // for readonly
-#include "AST/Print.hpp"                // for readonly
+#include "AST/Print.hpp"               // for readonly
 #include "AST/Type.hpp"
+#include "Common/Eval.h"               // for eval
 #include "Common/Indenter.h"           // for Indenter, operator<<
 #include "Common/SemanticError.h"      // for SemanticError

src/ResolvExpr/ResolveAssertions.cc

@@ -30 +30 @@
 #include "Common/FilterCombos.h"    // for filterCombos
 #include "Common/Indenter.h"        // for Indenter
-#include "Common/utility.h"         // for sort_mins
 #include "GenPoly/GenPoly.h"        // for getFunctionType
 #include "ResolvExpr/AlternativeFinder.h"  // for computeConversionCost

src/ResolvExpr/Resolver.cc

@@ -38 +38 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
+#include "Common/Eval.h"                 // for eval
 #include "Common/PassVisitor.h"          // for PassVisitor
 #include "Common/SemanticError.h"        // for SemanticError

src/ResolvExpr/Resolver.h

@@ -34 +34 @@
         class Decl;
         class DeletedExpr;
+        class Expr;
         class Init;
         class StmtExpr;