Changes in src/SynTree/ApplicationExpr.cc [462a7c7:aaeacf4]

File:

• src/SynTree/ApplicationExpr.cc (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -28 +28 @@
 #include "Type.h"                // for Type, PointerType, FunctionType
 
-ParamEntry::ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr )
-                : decl( decl ), declptr( declptr ), actualType( actualType ), formalType( formalType ), expr( expr ) {
-        }
+ParamEntry::ParamEntry( const ParamEntry &other ) :
+                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
+}
 
-ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
+ParamEntry &ParamEntry::operator=( const ParamEntry &other ) {
+        if ( &other == this ) return *this;
+        const_cast<UniqueId &>(decl) = other.decl;
+        const_cast<Declaration * &>(declptr) = maybeClone( other.declptr );
+        // xxx - this looks like a memory leak
+        const_cast<Type * &>(actualType) = maybeClone( other.actualType );
+        const_cast<Type * &>(formalType) = maybeClone( other.formalType );
+        expr = maybeClone( other.expr );
+        // *inferParams = *other.inferParams;
+        return *this;
 }
 
@@ -44 +52 @@
 
 ParamEntry::ParamEntry( ParamEntry && other ) :
-                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ) {
-        new (&other) ParamEntry();
+                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr )/*, inferParams( std::move( other.inferParams ) )*/ {
+        const_cast<Declaration * &>(other.declptr) = nullptr;
+        const_cast<Type * &>(other.actualType) = nullptr;
+        const_cast<Type * &>(other.formalType) = nullptr;
+        other.expr = nullptr;
 }
 
 ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
         if ( &other == this ) return *this;
-        this->~ParamEntry();
-        new (this) ParamEntry(other.decl, other.declptr, other.actualType, other.formalType, other.expr);
-        new (&other) ParamEntry();
-
+        delete declptr;
+        delete actualType;
+        delete formalType;
+        delete expr;
+        const_cast<UniqueId &>(decl) = other.decl;
+        const_cast<Declaration * &>(declptr) = other.declptr;
+        const_cast<Type * &>(actualType) = other.actualType;
+        const_cast<Type * &>(formalType) = other.formalType;
+        expr = other.expr;
+        const_cast<Declaration * &>(other.declptr) = nullptr;
+        const_cast<Type * &>(other.actualType) = nullptr;
+        const_cast<Type * &>(other.formalType) = nullptr;
+        other.expr = nullptr;
+        // inferParams = std::move( other.inferParams );
         return *this;
 }