Changeset 1f44196 for src/ResolvExpr/Alternative.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/ResolvExpr/Alternative.cc (modified) (5 diffs)

src/ResolvExpr/Alternative.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Alternative.cc -- 
+// Alternative.cc --
 //
 // Author           : Richard C. Bilson
@@ -12 +12 @@
 // Last Modified On : Sat May 16 23:54:23 2015
 // Update Count     : 2
-// 
+//
 
 #include "Alternative.h"
@@ -20 +20 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -35 +35 @@
                 if ( &other == this ) return *this;
                 initialize( other, *this );
+                return *this;
+        }
+
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
+                other.expr = nullptr;
+        }
+
+        Alternative & Alternative::operator=( Alternative && other ) {
+                if ( &other == this )  return *this;
+                delete expr;
+                cost = other.cost;
+                cvtCost = other.cvtCost;
+                expr = other.expr;
+                env = other.env;
+                other.expr = nullptr;
                 return *this;
         }
@@ -54 +69 @@
                         expr->print( os, indent );
                         os << "(types:" << std::endl;
-                        printAll( expr->get_results(), os, indent + 4 );
-                        os << ")" << std::endl;
+                        os << std::string( indent+4, ' ' );
+                        expr->get_result()->print( os, indent + 4 );
+                        os << std::endl << ")" << std::endl;
                 } else {
                         os << "Null expression!" << std::endl;