Changeset 2ed94a9 for src/AST

Timestamp:

Feb 8, 2023, 2:27:55 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master, stuck-waitfor-destruct

Children:

b110bcc

Parents:

997185e (diff), ccb29b4 (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/AST

Files:

• Expr.cpp (modified) (1 diff)
• Node.hpp (modified) (2 diffs)
• SymbolTable.cpp (modified) (2 diffs)

src/AST/Expr.cpp

@@ -30 +30 @@
 #include "Common/SemanticError.h"
 #include "GenPoly/Lvalue.h"        // for referencesPermissable
-#include "ResolvExpr/typeops.h"    // for extractResultType
+#include "ResolvExpr/Unify.h"      // for extractResultType
 #include "Tuples/Tuples.h"         // for makeTupleType
 

src/AST/Node.hpp

@@ -19 +19 @@
 #include <cstddef>     // for nullptr_t
 #include <iosfwd>
-#include <type_traits> // for remove_reference
 
 #include "Common/ErrorObjects.h"  // for SemanticErrorException
@@ -36 +35 @@
         Node(const Node&) : strong_count(0), weak_count(0) {}
         Node(Node&&) : strong_count(0), weak_count(0) {}
-        Node& operator= (const Node&) = delete;
-        Node& operator= (Node&&) = delete;
+        Node& operator=(const Node&) = delete;
+        Node& operator=(Node&&) = delete;
         virtual ~Node() {}
 

src/AST/SymbolTable.cpp

@@ -22 +22 @@
 #include "Inspect.hpp"
 #include "Type.hpp"
-#include "CodeGen/OperatorTable.h"  // for isCtorDtorAssign
+#include "CodeGen/OperatorTable.h"         // for isCtorDtorAssign
 #include "Common/SemanticError.h"
 #include "Common/Stats/Counter.h"
@@ -28 +28 @@
 #include "InitTweak/InitTweak.h"
 #include "ResolvExpr/Cost.h"
-#include "ResolvExpr/typeops.h"
+#include "ResolvExpr/CandidateFinder.hpp"  // for referenceToRvalueConversion
+#include "ResolvExpr/Unify.h"
 #include "SymTab/Mangler.h"