Changeset 1c85ffc for src

Timestamp:

Dec 5, 2023, 11:50:10 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

81da3da4

Parents:

2b12d6e (diff), 2345ab3 (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

Files:

• AST/Chain.hpp (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (3 diffs)

src/AST/Chain.hpp

@@ -33 +33 @@
         template<typename actual_node_t, typename child_t>
         auto operator()( child_t actual_node_t::*child ) {
-                auto n = mutate(base.get());
+                node_t * n = base.get_and_mutate();
                 actual_node_t * node = strict_dynamic_cast<actual_node_t *>(n);
-                base = node;
                 return _chain_mutator< typename std::remove_reference< decltype(node->*child) >::type >{node->*child};
         }
 
         node_t * operator->() {
-                auto n = mutate(base.get());
-                base = n;
-                return n;
+                return base.get_and_mutate();
         }
 };

src/ResolvExpr/Resolver.cc

@@ -29 +29 @@
 #include "Unify.h"                       // for unify
 #include "CompilationState.h"
-#include "AST/Chain.hpp"
 #include "AST/Decl.hpp"
 #include "AST/Init.hpp"
@@ -104 +103 @@
                                                                 }
                                                         }
-                                                } 
-                                        } 
+                                                }
+                                        }
                                         visit_children = false;
                                 }
@@ -607 +606 @@
                                 ( objectDecl->get_type() )->base->base ) {
                                 objectDecl = fixObjectType( objectDecl, context );
-                                currentObject = ast::CurrentObject{ 
-                                        objectDecl->location, 
+                                currentObject = ast::CurrentObject{
+                                        objectDecl->location,
                                         enumBase
                                 };