Changeset 4a60488 for src/SynTree/Expression.h

Timestamp:

Sep 27, 2019, 3:35:46 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

90ce35aa

Parents:

8e1467d (diff), 849720f (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:

Merged from master taking the lvalue changes to expression and everything before that.

File:

• src/SynTree/Expression.h (modified) (16 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 : Mon Feb 18 18:29:51 2019
-// Update Count     : 49
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 15 13:46:00 2019
+// Update Count     : 54
 //
 
@@ -71 +71 @@
         const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
+        virtual bool get_lvalue() const;
 
         TypeSubstitution * get_env() const { return env; }
@@ -98 +99 @@
         virtual ~ApplicationExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_function() const { return function; }
         void set_function( Expression * newValue ) { function = newValue; }
@@ -120 +123 @@
         UntypedExpr( const UntypedExpr & other );
         virtual ~UntypedExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_function() const { return function; }
@@ -208 +213 @@
         virtual ~CastExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg() const { return arg; }
         void set_arg( Expression * newValue ) { arg = newValue; }
@@ -268 +275 @@
         virtual ~UntypedMemberExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_member() const { return member; }
         void set_member( Expression * newValue ) { member = newValue; }
@@ -291 +300 @@
         virtual ~MemberExpr();
 
+        bool get_lvalue() const final;
+
         DeclarationWithType * get_member() const { return member; }
         void set_member( DeclarationWithType * newValue ) { member = newValue; }
@@ -313 +324 @@
         VariableExpr( const VariableExpr & other );
         virtual ~VariableExpr();
+
+        bool get_lvalue() const final;
 
         DeclarationWithType * get_var() const { return var; }
@@ -463 +476 @@
 };
 
-/// AttrExpr represents an @attribute expression (like sizeof, but user-defined)
-class AttrExpr : public Expression {
-  public:
-        Expression * attr;
-        Expression * expr;
-        Type * type;
-        bool isType;
-
-        AttrExpr(Expression * attr, Expression * expr );
-        AttrExpr( const AttrExpr & other );
-        AttrExpr( Expression * attr, Type * type );
-        virtual ~AttrExpr();
-
-        Expression * get_attr() const { return attr; }
-        void set_attr( Expression * newValue ) { attr = newValue; }
-        Expression * get_expr() const { return expr; }
-        void set_expr( Expression * newValue ) { expr = newValue; }
-        Type * get_type() const { return type; }
-        void set_type( Type * newValue ) { type = newValue; }
-        bool get_isType() const { return isType; }
-        void set_isType( bool newValue ) { isType = newValue; }
-
-        virtual AttrExpr * clone() const override { return new AttrExpr( * this ); }
-        virtual void accept( Visitor & v ) override { v.visit( this ); }
-        virtual void accept( Visitor & v ) const override { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
-
 /// LogicalExpr represents a short-circuit boolean expression (&& or ||)
 class LogicalExpr : public Expression {
@@ -528 +512 @@
         ConditionalExpr( const ConditionalExpr & other );
         virtual ~ConditionalExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_arg1() const { return arg1; }
@@ -553 +539 @@
         virtual ~CommaExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_arg1() const { return arg1; }
         void set_arg1( Expression * newValue ) { arg1 = newValue; }
@@ -639 +627 @@
         ~ConstructorExpr();
 
+        bool get_lvalue() const final;
+
         Expression * get_callExpr() const { return callExpr; }
         void set_callExpr( Expression * newValue ) { callExpr = newValue; }
@@ -657 +647 @@
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
         virtual ~CompoundLiteralExpr();
+
+        bool get_lvalue() const final;
 
         Initializer * get_initializer() const { return initializer; }
@@ -715 +707 @@
         virtual ~TupleExpr();
 
+        bool get_lvalue() const final;
+
         std::list<Expression*>& get_exprs() { return exprs; }
 
@@ -733 +727 @@
         TupleIndexExpr( const TupleIndexExpr & other );
         virtual ~TupleIndexExpr();
+
+        bool get_lvalue() const final;
 
         Expression * get_tuple() const { return tuple; }
@@ -782 +778 @@
         StmtExpr( const StmtExpr & other );
         virtual ~StmtExpr();
+
+        bool get_lvalue() const final;
 
         CompoundStmt * get_statements() const { return statements; }