Changeset 4d6d62e for src/SynTree

Timestamp:

May 18, 2018, 5:40:48 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

6b8c4a8

Parents:

682dcae

Message:

Add move operators for ParamEntry?

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)

src/SynTree/ApplicationExpr.cc

@@ -49 +49 @@
 }
 
+ParamEntry::ParamEntry( ParamEntry && other ) :
+                decl( other.decl ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ), inferParams( std::move( other.inferParams ) ) {
+        other.actualType = nullptr;
+        other.formalType = nullptr;
+        other.expr = nullptr;
+}
+
+ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
+        if ( &other == this ) return *this;
+        delete actualType;
+        delete formalType;
+        delete expr;
+        decl = other.decl;
+        actualType = other.actualType;
+        formalType = other.formalType;
+        expr = other.expr;
+        other.actualType = nullptr;
+        other.formalType = nullptr;
+        other.expr = nullptr;
+        inferParams = std::move( other.inferParams );
+        return *this;
+}
+
 ApplicationExpr::ApplicationExpr( Expression *funcExpr, const std::list<Expression *> & args ) : function( funcExpr ), args( args ) {
         PointerType *pointer = strict_dynamic_cast< PointerType* >( funcExpr->get_result() );

src/SynTree/Expression.h

@@ -41 +41 @@
         ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
         ParamEntry( const ParamEntry & other );
+        ParamEntry( ParamEntry && other );
         ~ParamEntry();
         ParamEntry & operator=( const ParamEntry & other );
+        ParamEntry & operator=( ParamEntry && other );
 
         UniqueId decl;