Changeset c0d00b6 for src/ResolvExpr/Alternative.h

Timestamp:

Nov 25, 2017, 3:22:18 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

c6e2c18

Parents:

9d06142 (diff), 3de176d (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' into cleanup-dtors

File:

• src/ResolvExpr/Alternative.h (modified) (4 diffs)

src/ResolvExpr/Alternative.h

@@ -17 +17 @@
 
 #include <iosfwd>             // for ostream
-#include <list>               // for list
+#include <vector>             // for vector
 
 #include "Cost.h"             // for Cost
@@ -25 +25 @@
 
 namespace ResolvExpr {
-        struct Alternative;
-
-        typedef std::list< Alternative > AltList;
-
         struct Alternative {
                 Alternative();
@@ -41 +37 @@
                 void print( std::ostream &os, Indenter indent = {} ) const;
 
+                /// Returns the stored expression, but released from management of this Alternative
+                Expression* release_expr() {
+                        Expression* tmp = expr;
+                        expr = nullptr;
+                        return tmp;
+                }
+
                 Cost cost;
                 Cost cvtCost;
@@ -46 +49 @@
                 TypeEnvironment env;
         };
+
+        typedef std::vector< Alternative > AltList;
+
+        /// Moves all elements from src to the end of dst
+        void splice( AltList& dst, AltList& src );
+
+        /// Moves all elements from src to the beginning of dst
+        void spliceBegin( AltList& dst, AltList& src );
 } // namespace ResolvExpr