Changeset cd7ef0b for src/SynTree/Expression.h

Timestamp:

Aug 10, 2017, 3:39:11 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

38d70ab

Parents:

275f4b4 (diff), e1780a2 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:27:00 2017
-// Update Count     : 43
+// Last Modified On : Fri Aug  8 11:54:00 2017
+// Update Count     : 44
 //
 
@@ -29 +29 @@
 class Expression : public BaseSyntaxNode{
   public:
+        Type * result;
+        TypeSubstitution * env;
+        Expression * argName; // if expression is used as an argument, it can be "designated" by this name
+        bool extension = false;
+
         Expression( Expression * _aname = nullptr );
         Expression( const Expression & other );
@@ -49 +54 @@
         virtual Expression * acceptMutator( Mutator & m ) = 0;
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  protected:
-        Type * result;
-        TypeSubstitution * env;
-        Expression * argName; // if expression is used as an argument, it can be "designated" by this name
-        bool extension = false;
 };
 
@@ -79 +79 @@
 class ApplicationExpr : public Expression {
   public:
+        Expression * function;
+
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
         ApplicationExpr( const ApplicationExpr & other );
@@ -92 +94 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+
   private:
-        Expression * function;
         std::list<Expression *> args;
         InferredParams inferParams;
@@ -103 +105 @@
 class UntypedExpr : public Expression {
   public:
+        Expression * function;
+        std::list<Expression*> args;
+
         UntypedExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >(), Expression *_aname = nullptr );
         UntypedExpr( const UntypedExpr & other );
@@ -123 +128 @@
         virtual void print( std::ostream & os, int indent = 0 ) const;
         virtual void printArgs(std::ostream & os, int indent = 0) const;
-  private:
-        Expression * function;
-        std::list<Expression*> args;
 };
 
@@ -131 +133 @@
 class NameExpr : public Expression {
   public:
+        std::string name;
+
         NameExpr( std::string name, Expression *_aname = nullptr );
         NameExpr( const NameExpr & other );
@@ -142 +146 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::string name;
 };
 
@@ -152 +154 @@
 class AddressExpr : public Expression {
   public:
+        Expression * arg;
+
         AddressExpr( Expression * arg, Expression *_aname = nullptr );
         AddressExpr( const AddressExpr & other );
@@ -163 +167 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -170 +172 @@
 class LabelAddressExpr : public Expression {
   public:
+        Expression * arg;
+
         LabelAddressExpr( Expression * arg );
         LabelAddressExpr( const LabelAddressExpr & other );
@@ -181 +185 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -188 +190 @@
 class CastExpr : public Expression {
   public:
+        Expression * arg;
+
         CastExpr( Expression * arg, Expression *_aname = nullptr );
         CastExpr( Expression * arg, Type * toType, Expression *_aname = nullptr );
@@ -200 +204 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -207 +209 @@
 class VirtualCastExpr : public Expression {
   public:
+        Expression * arg;
+
         VirtualCastExpr( Expression * arg, Type * toType );
         VirtualCastExpr( const VirtualCastExpr & other );
@@ -218 +222 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -225 +227 @@
 class UntypedMemberExpr : public Expression {
   public:
+        Expression * member;
+        Expression * aggregate;
+
         UntypedMemberExpr( Expression * member, Expression * aggregate, Expression *_aname = nullptr );
         UntypedMemberExpr( const UntypedMemberExpr & other );
@@ -238 +243 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * member;
-        Expression * aggregate;
 };
 
@@ -247 +249 @@
 class MemberExpr : public Expression {
   public:
+        DeclarationWithType * member;
+        Expression * aggregate;
+
         MemberExpr( DeclarationWithType * member, Expression * aggregate, Expression *_aname = nullptr );
         MemberExpr( const MemberExpr & other );
@@ -260 +265 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        DeclarationWithType * member;
-        Expression * aggregate;
 };
 
@@ -269 +271 @@
 class VariableExpr : public Expression {
   public:
+        DeclarationWithType * var;
+
         VariableExpr( DeclarationWithType * var, Expression *_aname = nullptr );
         VariableExpr( const VariableExpr & other );
@@ -280 +284 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        DeclarationWithType * var;
 };
 
@@ -287 +289 @@
 class ConstantExpr : public Expression {
   public:
+        Constant constant;
+
         ConstantExpr( Constant constant, Expression *_aname = nullptr );
         ConstantExpr( const ConstantExpr & other );
@@ -298 +302 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Constant constant;
 };
 
@@ -305 +307 @@
 class SizeofExpr : public Expression {
   public:
+        Expression * expr;
+        Type * type;
+        bool isType;
+
         SizeofExpr( Expression * expr, Expression *_aname = nullptr );
         SizeofExpr( const SizeofExpr & other );
@@ -321 +327 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
+};
+
+/// AlignofExpr represents an alignof expression
+class AlignofExpr : public Expression {
+  public:
         Expression * expr;
         Type * type;
         bool isType;
-};
-
-/// AlignofExpr represents an alignof expression
-class AlignofExpr : public Expression {
-  public:
+
         AlignofExpr( Expression * expr, Expression *_aname = nullptr );
         AlignofExpr( const AlignofExpr & other );
@@ -346 +352 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * expr;
-        Type * type;
-        bool isType;
 };
 
@@ -355 +357 @@
 class UntypedOffsetofExpr : public Expression {
   public:
+        Type * type;
+        std::string member;
+
         UntypedOffsetofExpr( Type * type, const std::string & member, Expression *_aname = nullptr );
         UntypedOffsetofExpr( const UntypedOffsetofExpr & other );
@@ -368 +373 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Type * type;
-        std::string member;
 };
 
@@ -376 +378 @@
 class OffsetofExpr : public Expression {
   public:
+        Type * type;
+        DeclarationWithType * member;
+
         OffsetofExpr( Type * type, DeclarationWithType * member, Expression *_aname = nullptr );
         OffsetofExpr( const OffsetofExpr & other );
@@ -389 +394 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Type * type;
-        DeclarationWithType * member;
 };
 
@@ -397 +399 @@
 class OffsetPackExpr : public Expression {
 public:
+        StructInstType * type;
+
         OffsetPackExpr( StructInstType * type_, Expression * aname_ = 0 );
         OffsetPackExpr( const OffsetPackExpr & other );
@@ -407 +411 @@
         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:
-        StructInstType * type;
+        virtual void print( std::ostream & os, int indent = 0 ) const;
 };
 
@@ -417 +417 @@
 class AttrExpr : public Expression {
   public:
+        Expression * attr;
+        Expression * expr;
+        Type * type;
+        bool isType;
+
         AttrExpr(Expression * attr, Expression * expr, Expression *_aname = nullptr );
         AttrExpr( const AttrExpr & other );
@@ -435 +440 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * attr;
-        Expression * expr;
-        Type * type;
-        bool isType;
 };
 
@@ -445 +445 @@
 class LogicalExpr : public Expression {
   public:
+        Expression * arg1;
+        Expression * arg2;
+
         LogicalExpr( Expression * arg1, Expression * arg2, bool andp = true, Expression *_aname = nullptr );
         LogicalExpr( const LogicalExpr & other );
@@ -459 +462 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+
   private:
+        bool isAnd;
+};
+
+/// ConditionalExpr represents the three-argument conditional ( p ? a : b )
+class ConditionalExpr : public Expression {
+  public:
         Expression * arg1;
         Expression * arg2;
-        bool isAnd;
-};
-
-/// ConditionalExpr represents the three-argument conditional ( p ? a : b )
-class ConditionalExpr : public Expression {
-  public:
+        Expression * arg3;
+
         ConditionalExpr( Expression * arg1, Expression * arg2, Expression * arg3, Expression *_aname = nullptr );
         ConditionalExpr( const ConditionalExpr & other );
@@ -483 +489 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
+};
+
+/// CommaExpr represents the sequence operator ( a, b )
+class CommaExpr : public Expression {
+  public:
         Expression * arg1;
         Expression * arg2;
-        Expression * arg3;
-};
-
-/// CommaExpr represents the sequence operator ( a, b )
-class CommaExpr : public Expression {
-  public:
+
         CommaExpr( Expression * arg1, Expression * arg2, Expression *_aname = nullptr );
         CommaExpr( const CommaExpr & other );
@@ -505 +510 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg1;
-        Expression * arg2;
 };
 
@@ -513 +515 @@
 class TypeExpr : public Expression {
   public:
+        Type * type;
+
         TypeExpr( Type * type );
         TypeExpr( const TypeExpr & other );
@@ -524 +528 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Type * type;
 };
 
@@ -531 +533 @@
 class AsmExpr : public Expression {
   public:
+        Expression * inout;
+        ConstantExpr * constraint;
+        Expression * operand;
+
         AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
         AsmExpr( const AsmExpr & other );
@@ -548 +554 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
+
         // https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints
-        Expression * inout;
-        ConstantExpr * constraint;
-        Expression * operand;
 };
 
@@ -559 +562 @@
 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; }
-        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
-        std::list< Expression * > & get_dtors() { return dtors; }
-
-        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;
+
+        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 ); }
+        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;
 };
 
@@ -584 +587 @@
 class ConstructorExpr : public Expression {
 public:
+        Expression * callExpr;
+
         ConstructorExpr( Expression * callExpr );
         ConstructorExpr( const ConstructorExpr & other );
@@ -595 +600 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * callExpr;
 };
 
@@ -602 +605 @@
 class CompoundLiteralExpr : public Expression {
   public:
+        Initializer * initializer;
+
         CompoundLiteralExpr( Type * type, Initializer * initializer );
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
@@ -613 +618 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Initializer * initializer;
 };
 
@@ -620 +623 @@
 class RangeExpr : public Expression {
   public:
+        Expression * low, * high;
+
         RangeExpr( Expression * low, Expression * high );
         RangeExpr( const RangeExpr & other );
@@ -632 +637 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * low, * high;
 };
 
@@ -639 +642 @@
 class UntypedTupleExpr : public Expression {
   public:
+        std::list<Expression*> exprs;
+
         UntypedTupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         UntypedTupleExpr( const UntypedTupleExpr & other );
@@ -649 +654 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::list<Expression*> exprs;
 };
 
@@ -656 +659 @@
 class TupleExpr : public Expression {
   public:
+        std::list<Expression*> exprs;
+
         TupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         TupleExpr( const TupleExpr & other );
@@ -666 +671 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::list<Expression*> exprs;
 };
 
@@ -673 +676 @@
 class TupleIndexExpr : public Expression {
   public:
+        Expression * tuple;
+        unsigned int index;
+
         TupleIndexExpr( Expression * tuple, unsigned int index );
         TupleIndexExpr( const TupleIndexExpr & other );
@@ -686 +692 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * tuple;
-        unsigned int index;
 };
 
@@ -694 +697 @@
 class TupleAssignExpr : public Expression {
   public:
+        StmtExpr * stmtExpr = nullptr;
+
         TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname = nullptr );
         TupleAssignExpr( const TupleAssignExpr & other );
@@ -705 +710 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        StmtExpr * stmtExpr = nullptr;
 };
 
@@ -712 +715 @@
 class StmtExpr : public Expression {
 public:
+        CompoundStmt * statements;
+        std::list< ObjectDecl * > returnDecls; // return variable(s) for stmt expression
+        std::list< Expression * > dtors; // destructor(s) for return variable(s)
+
         StmtExpr( CompoundStmt * statements );
         StmtExpr( const StmtExpr & other );
@@ -726 +733 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        CompoundStmt * statements;
-        std::list< ObjectDecl * > returnDecls; // return variable(s) for stmt expression
-        std::list< Expression * > dtors; // destructor(s) for return variable(s)
 };
 
 class UniqueExpr : public Expression {
 public:
+        Expression * expr;
+        ObjectDecl * object;
+        VariableExpr * var;
+
         UniqueExpr( Expression * expr, long long idVal = -1 );
         UniqueExpr( const UniqueExpr & other );
@@ -753 +760 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+
 private:
-        Expression * expr;
-        ObjectDecl * object;
-        VariableExpr * var;
         int id;
         static long long count;
@@ -773 +778 @@
 class UntypedInitExpr : public Expression {
 public:
+        Expression * expr;
+        std::list<InitAlternative> initAlts;
+
         UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
         UntypedInitExpr( const UntypedInitExpr & other );
@@ -786 +794 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * expr;
-        std::list<InitAlternative> initAlts;
 };
 
 class InitExpr : public Expression {
 public:
+        Expression * expr;
+        Designation * designation;
+
         InitExpr( Expression * expr, Designation * designation );
         InitExpr( const InitExpr & other );
@@ -807 +815 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * expr;
-        Designation * designation;
 };