Changes in src/SynTree/ApplicationExpr.cc [aaeacf4:0b00df0]

File:

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

src/SynTree/ApplicationExpr.cc

@@ -29 +29 @@
 
 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 ) )*/ {
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
 }
 
 ParamEntry &ParamEntry::operator=( const ParamEntry &other ) {
         if ( &other == this ) return *this;
-        const_cast<UniqueId &>(decl) = other.decl;
-        const_cast<Declaration * &>(declptr) = maybeClone( other.declptr );
+        decl = other.decl;
         // xxx - this looks like a memory leak
-        const_cast<Type * &>(actualType) = maybeClone( other.actualType );
-        const_cast<Type * &>(formalType) = maybeClone( other.formalType );
+        actualType = maybeClone( other.actualType );
+        formalType = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
         // *inferParams = *other.inferParams;
@@ -45 +44 @@
 
 ParamEntry::~ParamEntry() {
-        delete declptr;
         delete actualType;
         delete formalType;
@@ -52 +50 @@
 
 ParamEntry::ParamEntry( ParamEntry && other ) :
-                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;
+                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;
 }
@@ -61 +58 @@
 ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
         if ( &other == this ) return *this;
-        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;
+        decl = other.decl;
+        actualType = other.actualType;
+        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.actualType = nullptr;
+        other.formalType = nullptr;
         other.expr = nullptr;
         // inferParams = std::move( other.inferParams );