Changeset 9236060 for src/SynTree/Expression.h

Timestamp:

Aug 14, 2017, 2:03:39 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

74b007ba

Parents:

fd344aa (diff), 54cd58b (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 references

File:

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

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:44:00 2017
-// Update Count     : 41
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Aug  8 11:54:00 2017
+// Update Count     : 44
 //
 
-#ifndef EXPRESSION_H
-#define EXPRESSION_H
+#pragma once
 
 #include <map>
@@ -30 +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 );
@@ -50 +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;
 };
 
@@ -80 +79 @@
 class ApplicationExpr : public Expression {
   public:
-        ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list<Expression *>() );
+        Expression * function;
+
+        ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
         ApplicationExpr( const ApplicationExpr & other );
         virtual ~ApplicationExpr();
@@ -93 +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;
@@ -104 +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 );
@@ -124 +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;
 };
 
@@ -132 +133 @@
 class NameExpr : public Expression {
   public:
+        std::string name;
+
         NameExpr( std::string name, Expression *_aname = nullptr );
         NameExpr( const NameExpr & other );
@@ -143 +146 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::string name;
 };
 
@@ -153 +154 @@
 class AddressExpr : public Expression {
   public:
+        Expression * arg;
+
         AddressExpr( Expression * arg, Expression *_aname = nullptr );
         AddressExpr( const AddressExpr & other );
@@ -164 +167 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -171 +172 @@
 class LabelAddressExpr : public Expression {
   public:
+        Expression * arg;
+
         LabelAddressExpr( Expression * arg );
         LabelAddressExpr( const LabelAddressExpr & other );
@@ -182 +185 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg;
 };
 
@@ -189 +190 @@
 class CastExpr : public Expression {
   public:
+        Expression * arg;
+
         CastExpr( Expression * arg, Expression *_aname = nullptr );
         CastExpr( Expression * arg, Type * toType, Expression *_aname = nullptr );
@@ -195 +198 @@
 
         Expression * get_arg() const { return arg; }
-        void set_arg(Expression * newValue ) { arg = newValue; }
+        void set_arg( Expression * newValue ) { arg = newValue; }
 
         virtual CastExpr * clone() const { return new CastExpr( * this ); }
@@ -201 +204 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
+};
+
+/// VirtualCastExpr repersents a virtual dynamic cast, e.g. (virtual exception)e
+class VirtualCastExpr : public Expression {
+  public:
         Expression * arg;
+
+        VirtualCastExpr( Expression * arg, Type * toType );
+        VirtualCastExpr( const VirtualCastExpr & other );
+        virtual ~VirtualCastExpr();
+
+        Expression * get_arg() const { return arg; }
+        void set_arg( Expression * newValue ) { arg = newValue; }
+
+        virtual VirtualCastExpr * clone() const { return new VirtualCastExpr( * 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;
 };
 
@@ -208 +227 @@
 class UntypedMemberExpr : public Expression {
   public:
+        Expression * member;
+        Expression * aggregate;
+
         UntypedMemberExpr( Expression * member, Expression * aggregate, Expression *_aname = nullptr );
         UntypedMemberExpr( const UntypedMemberExpr & other );
@@ -221 +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;
 };
 
@@ -230 +249 @@
 class MemberExpr : public Expression {
   public:
+        DeclarationWithType * member;
+        Expression * aggregate;
+
         MemberExpr( DeclarationWithType * member, Expression * aggregate, Expression *_aname = nullptr );
         MemberExpr( const MemberExpr & other );
@@ -243 +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;
 };
 
@@ -252 +271 @@
 class VariableExpr : public Expression {
   public:
+        DeclarationWithType * var;
+
         VariableExpr( DeclarationWithType * var, Expression *_aname = nullptr );
         VariableExpr( const VariableExpr & other );
@@ -265 +286 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        DeclarationWithType * var;
 };
 
@@ -272 +291 @@
 class ConstantExpr : public Expression {
   public:
+        Constant constant;
+
         ConstantExpr( Constant constant, Expression *_aname = nullptr );
         ConstantExpr( const ConstantExpr & other );
@@ -283 +304 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Constant constant;
 };
 
@@ -290 +309 @@
 class SizeofExpr : public Expression {
   public:
+        Expression * expr;
+        Type * type;
+        bool isType;
+
         SizeofExpr( Expression * expr, Expression *_aname = nullptr );
         SizeofExpr( const SizeofExpr & other );
@@ -306 +329 @@
         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 );
@@ -331 +354 @@
         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;
 };
 
@@ -340 +359 @@
 class UntypedOffsetofExpr : public Expression {
   public:
+        Type * type;
+        std::string member;
+
         UntypedOffsetofExpr( Type * type, const std::string & member, Expression *_aname = nullptr );
         UntypedOffsetofExpr( const UntypedOffsetofExpr & other );
@@ -353 +375 @@
         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;
 };
 
@@ -361 +380 @@
 class OffsetofExpr : public Expression {
   public:
+        Type * type;
+        DeclarationWithType * member;
+
         OffsetofExpr( Type * type, DeclarationWithType * member, Expression *_aname = nullptr );
         OffsetofExpr( const OffsetofExpr & other );
@@ -374 +396 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Type * type;
-        DeclarationWithType * member;
 };
 
@@ -382 +401 @@
 class OffsetPackExpr : public Expression {
 public:
+        StructInstType * type;
+
         OffsetPackExpr( StructInstType * type_, Expression * aname_ = 0 );
         OffsetPackExpr( const OffsetPackExpr & other );
@@ -392 +413 @@
         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;
 };
 
@@ -402 +419 @@
 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 );
@@ -420 +442 @@
         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;
 };
 
@@ -430 +447 @@
 class LogicalExpr : public Expression {
   public:
+        Expression * arg1;
+        Expression * arg2;
+
         LogicalExpr( Expression * arg1, Expression * arg2, bool andp = true, Expression *_aname = nullptr );
         LogicalExpr( const LogicalExpr & other );
@@ -444 +464 @@
         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 );
@@ -468 +491 @@
         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 );
@@ -490 +512 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * arg1;
-        Expression * arg2;
 };
 
@@ -498 +517 @@
 class TypeExpr : public Expression {
   public:
+        Type * type;
+
         TypeExpr( Type * type );
         TypeExpr( const TypeExpr & other );
@@ -509 +530 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Type * type;
 };
 
@@ -516 +535 @@
 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 );
@@ -533 +556 @@
         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;
 };
 
@@ -544 +564 @@
 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;
 };
 
@@ -569 +589 @@
 class ConstructorExpr : public Expression {
 public:
+        Expression * callExpr;
+
         ConstructorExpr( Expression * callExpr );
         ConstructorExpr( const ConstructorExpr & other );
@@ -580 +602 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * callExpr;
 };
 
@@ -587 +607 @@
 class CompoundLiteralExpr : public Expression {
   public:
+        Initializer * initializer;
+
         CompoundLiteralExpr( Type * type, Initializer * initializer );
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
@@ -598 +620 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Initializer * initializer;
 };
 
@@ -605 +625 @@
 class RangeExpr : public Expression {
   public:
+        Expression * low, * high;
+
         RangeExpr( Expression * low, Expression * high );
         RangeExpr( const RangeExpr & other );
@@ -617 +639 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        Expression * low, * high;
 };
 
@@ -624 +644 @@
 class UntypedTupleExpr : public Expression {
   public:
+        std::list<Expression*> exprs;
+
         UntypedTupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         UntypedTupleExpr( const UntypedTupleExpr & other );
@@ -634 +656 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::list<Expression*> exprs;
 };
 
@@ -641 +661 @@
 class TupleExpr : public Expression {
   public:
+        std::list<Expression*> exprs;
+
         TupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         TupleExpr( const TupleExpr & other );
@@ -651 +673 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        std::list<Expression*> exprs;
 };
 
@@ -658 +678 @@
 class TupleIndexExpr : public Expression {
   public:
+        Expression * tuple;
+        unsigned int index;
+
         TupleIndexExpr( Expression * tuple, unsigned int index );
         TupleIndexExpr( const TupleIndexExpr & other );
@@ -671 +694 @@
         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;
 };
 
@@ -679 +699 @@
 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 );
@@ -690 +712 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-  private:
-        StmtExpr * stmtExpr = nullptr;
 };
 
@@ -697 +717 @@
 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 );
@@ -711 +735 @@
         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 );
@@ -738 +762 @@
         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;
@@ -758 +780 @@
 class UntypedInitExpr : public Expression {
 public:
+        Expression * expr;
+        std::list<InitAlternative> initAlts;
+
         UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
         UntypedInitExpr( const UntypedInitExpr & other );
@@ -771 +796 @@
         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 );
@@ -792 +817 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-private:
-        Expression * expr;
-        Designation * designation;
 };
 
 
 std::ostream & operator<<( std::ostream & out, const Expression * expr );
-
-#endif // EXPRESSION_H
 
 // Local Variables: //