Changes in src/SynTree/Expression.h [0b00df0:2f86ddf]

File:

• src/SynTree/Expression.h (modified) (6 diffs)

src/SynTree/Expression.h

@@ -21 +21 @@
 #include <memory>                 // for allocator, unique_ptr
 #include <string>                 // for string
-#include <vector>                 // for vector
 
 #include "BaseSyntaxNode.h"       // for BaseSyntaxNode
@@ -39 +38 @@
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
-        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 )/*, inferParams( new InferredParams )*/ {}
-        ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr )/*, inferParams( new InferredParams )*/ {}
+        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 ), inferParams( new InferredParams ) {}
+        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 );
@@ -51 +50 @@
         Type * formalType;
         Expression * expr;
-        // std::unique_ptr< InferredParams > inferParams;
+        std::unique_ptr< InferredParams > inferParams;
 };
 
@@ -60 +59 @@
         TypeSubstitution * env;
         bool extension = false;
-        InferredParams inferParams;       ///< Post-resolution inferred parameter slots
-        std::vector<UniqueId> resnSlots;  ///< Pre-resolution inferred parameter slots
-        
-        // xxx - should turn inferParams+resnSlots into a union to save some memory
+        InferredParams inferParams;
 
         Expression();
@@ -77 +73 @@
         bool get_extension() const { return extension; }
         Expression * set_extension( bool exten ) { extension = exten; return this; }
+
+        InferredParams & get_inferParams() { return inferParams; }
 
         // move other's inferParams to this
@@ -593 +591 @@
 class ImplicitCopyCtorExpr : public Expression {
 public:
-        ApplicationExpr * callExpr;
-        std::list< ObjectDecl * > tempDecls;
-        std::list< ObjectDecl * > returnDecls;
-        std::list< Expression * > dtors;
+        ApplicationExpr * callExpr = nullptr;
 
         ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
         ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other );
         virtual ~ImplicitCopyCtorExpr();
-
-        ApplicationExpr * get_callExpr() const { return callExpr; }
-        void set_callExpr( ApplicationExpr * newValue ) { callExpr = newValue; }
-
-        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
-        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
-        std::list< Expression * > & get_dtors() { return dtors; }
 
         virtual ImplicitCopyCtorExpr * clone() const { return new ImplicitCopyCtorExpr( * this ); }