Changeset f80e0218 for src/SynTree/Expression.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr  8 17:18:06 2016
-// Update Count     : 21
+// Last Modified On : Wed Jun  8 17:05:30 2016
+// Update Count     : 22
 //
 
@@ -22 +22 @@
 #include "Mutator.h"
 #include "Constant.h"
+#include "Common/UniqueName.h"
 
 /// Expression is the root type for all expressions
@@ -37 +38 @@
         Expression *get_argName() const { return argName; }
         void set_argName( Expression *name ) { argName = name; }
+        bool get_extension() const { return extension; }
+        void set_extension( bool exten ) { extension = exten; }
 
         virtual Expression *clone() const = 0;
@@ -46 +49 @@
         TypeSubstitution *env;
         Expression* argName; // if expression is used as an argument, it can be "designated" by this name
+        bool extension = false;
 };
 
@@ -559 +563 @@
 };
 
+/// ImplicitCopyCtorExpr represents the application of a function to a set of parameters,
+/// along with a set of copy constructor calls, one for each argument.
+class ImplicitCopyCtorExpr : public Expression {
+public:
+        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; }
+        void set_tempDecls( std::list< ObjectDecl * > newValue ) { tempDecls = newValue; }
+
+        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
+        void set_returnDecls( std::list< ObjectDecl * > newValue ) { returnDecls = newValue; }
+
+        std::list< Expression * > & get_dtors() { return dtors; }
+        void set_dtors( std::list< Expression * > newValue ) { dtors = newValue; }
+
+        virtual ImplicitCopyCtorExpr *clone() const { return new ImplicitCopyCtorExpr( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Expression *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        ApplicationExpr * callExpr;
+        std::list< ObjectDecl * > tempDecls;
+        std::list< ObjectDecl * > returnDecls;
+        std::list< Expression * > dtors;
+};
+
 /// ValofExpr represents a GCC 'lambda expression'
 class UntypedValofExpr : public Expression {