Changes in src/SynTree/ApplicationExpr.cc [849720f:4d6d62e]

File:

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

src/SynTree/ApplicationExpr.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 12 14:28:00 2019
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Apr 26 12:41:06 2016
+// Update Count     : 4
 //
 
@@ -25 +25 @@
 #include "Declaration.h"         // for Declaration
 #include "Expression.h"          // for ParamEntry, ApplicationExpr, Expression
-#include "InitTweak/InitTweak.h" // for getFunction
 #include "ResolvExpr/typeops.h"  // for extractResultType
 #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 ), 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;
+        decl = other.decl;
+        // xxx - this looks like a memory leak
+        actualType = maybeClone( other.actualType );
+        formalType = maybeClone( other.formalType );
+        expr = maybeClone( other.expr );
+        *inferParams = *other.inferParams;
+        return *this;
 }
 
 ParamEntry::~ParamEntry() {
-        delete declptr;
         delete actualType;
         delete formalType;
@@ -45 +50 @@
 
 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 ), 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;
-        this->~ParamEntry();
-        new (this) ParamEntry(other.decl, other.declptr, other.actualType, other.formalType, other.expr);
-        new (&other) ParamEntry();
-
+        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;
 }
@@ -77 +91 @@
 }
 
-bool ApplicationExpr::get_lvalue() const {
-        // from src/GenPoly/Lvalue.cc: isIntrinsicReference
-        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
-        if ( const DeclarationWithType * func = InitTweak::getFunction( this ) ) {
-                return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
-        }
-        return false;
-}
-
 void ApplicationExpr::print( std::ostream &os, Indenter indent ) const {
         os << "Application of" << std::endl << indent+1;