Changeset e7f8119 for src/AST/Expr.hpp

Timestamp:

Jun 10, 2019, 10:52:03 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6355ba7

Parents:

9856ca9 (diff), 61c7239 (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

File:

• src/AST/Expr.hpp (modified) (5 diffs)

src/AST/Expr.hpp

@@ -17 +17 @@
 
 #include <cassert>
+#include <deque>
 #include <map>
 #include <string>
@@ -111 +112 @@
                 }
 
-                const ResnSlots& resnSlotsConst() const {
+                const ResnSlots& resnSlots() const {
                         if (mode == Slots) {
                                 return data.resnSlots;
@@ -128 +129 @@
                 }
 
-                const InferredParams& inferParamsConst() const {
+                const InferredParams& inferParams() const {
                         if (mode == Params) {
                                 return data.inferParams;
@@ -134 +135 @@
                         assert(!"Mode was not already Params");
                         return *((InferredParams*)nullptr);
+                }
+
+                /// splices other InferUnion into this one. Will fail if one union is in `Slots` mode 
+                /// and the other is in `Params`.
+                void splice( InferUnion && o ) {
+                        if ( o.mode == Empty ) return;
+                        if ( mode == Empty ) { init_from( o ); return; }
+                        assert( mode == o.mode && "attempt to splice incompatible InferUnion" );
+
+                        if ( mode == Slots ){
+                                data.resnSlots.insert( 
+                                        data.resnSlots.end(), o.data.resnSlots.begin(), o.data.resnSlots.end() );
+                        } else if ( mode == Params ) {
+                                for ( const auto & p : o.data.inferParams ) {
+                                        data.inferParams[p.first] = std::move(p.second);
+                                }
+                        } else assert(!"invalid mode");
                 }
         };
@@ -695 +713 @@
 public:
         ptr<Expr> expr;
-        std::vector<InitAlternative> initAlts;
-
-        UntypedInitExpr( const CodeLocation & loc, const Expr * e, std::vector<InitAlternative> && as )
+        std::deque<InitAlternative> initAlts;
+
+        UntypedInitExpr( const CodeLocation & loc, const Expr * e, std::deque<InitAlternative> && as )
         : Expr( loc ), expr( e ), initAlts( std::move(as) ) {}