Changeset eba74ba for src/SynTree

Timestamp:

May 25, 2018, 2:51:06 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

cdc4d43

Parents:

3ef35bd (diff), 58e822a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

Location:

src/SynTree

Files:

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

src/SynTree/ApplicationExpr.cc

@@ -42 +42 @@
 }
 
+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;
+        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.cc

@@ -50 +50 @@
 }
 
+void Expression::spliceInferParams( Expression * other ) {
+        if ( ! other ) return;
+        for ( auto p : other->inferParams ) {
+                inferParams[p.first] = std::move( p.second );
+        }
+}
+
 Expression::~Expression() {
         delete env;

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 & operator=( const ParamEntry & other );
+        ParamEntry & operator=( ParamEntry && other );
 
         UniqueId decl;
@@ -74 +76 @@
 
         InferredParams & get_inferParams() { return inferParams; }
+
+        // move other's inferParams to this
+        void spliceInferParams( Expression * other );
 
         virtual Expression * clone() const override = 0;