Changeset f6f0cca3 for src

Timestamp:

May 18, 2018, 10:05:49 AM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

ff29f08

Parents:

7a37f25

git-author:

Aaron Moss <a3moss@…> (05/17/18 15:51:08)

git-committer:

Aaron Moss <a3moss@…> (05/18/18 10:05:49)

Message:

Standard library builds in GC branch

Location:

src

Files:

• ResolvExpr/Alternative.cc (modified) (1 diff)
• ResolvExpr/Alternative.h (modified) (1 diff)
• SynTree/GcTracer.h (modified) (1 diff)

src/ResolvExpr/Alternative.cc

@@ -37 +37 @@
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost, const Cost &cvtCost )
                 : cost( cost ), cvtCost( cvtCost ), expr( expr ), env( env ) {}
+        
+        Alternative::Alternative( const Alternative& o )
+                : cost( o.cost ), cvtCost( o.cvtCost ), expr( maybeClone( o.expr ) ), env( o.env ) {}
+        
+        Alternative & Alternative::operator= ( const Alternative& o ) {
+                if ( &o == this ) return *this;
+                cost = o.cost;
+                cvtCost = o.cvtCost;
+                expr = maybeClone( o.expr );
+                env = o.env;
+                return *this;
+        }
 
         void Alternative::print( std::ostream &os, Indenter indent ) const {

src/ResolvExpr/Alternative.h

@@ -31 +31 @@
                 Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost );
                 Alternative( Expression *expr, const TypeEnvironment &env, const Cost &cost, const Cost &cvtCost );
-                Alternative( const Alternative &other ) = default;
-                Alternative &operator=( const Alternative &other ) = default;
+                Alternative( const Alternative &other );
+                Alternative & operator= ( const Alternative &other );
+                Alternative( Alternative&& other ) = default;
+                Alternative & operator= ( Alternative&& other ) = default;
 
                 void print( std::ostream &os, Indenter indent = {} ) const;

src/SynTree/GcTracer.h

@@ -102 +102 @@
         void visit( Label& lbl ) {
                 acceptAll( lbl.get_attributes(), *visitor );
-                maybeAccept( lbl.get_statement(), *visitor );  // xxx - not sure this is needed...
+                // maybeAccept( lbl.get_statement(), *visitor );  // introduces infinite loop in tracer
         }