Changes in src/AST/Expr.hpp [cf32116:e67991f]

File:

• src/AST/Expr.hpp (modified) (12 diffs)

src/AST/Expr.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri May 10 10:30:00 2019
-// Last Modified By : Andrew Beach
-// Created On       : Thr Sep 26 12:51:00 2019
-// Update Count     : 2
+// Last Modified By : Aaron B. Moss
+// Created On       : Fri May 10 10:30:00 2019
+// Update Count     : 1
 //
 
@@ -30 +30 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND \
-    template<typename node_t> friend node_t * mutate(const node_t * node); \
-        template<typename node_t> friend node_t * shallowCopy(const node_t * node);
-
+#define MUTATE_FRIEND template<typename node_t> friend node_t * mutate(const node_t * node);
 
 class ConverterOldToNew;
@@ -187 +184 @@
 
         Expr * set_extension( bool ex ) { extension = ex; return this; }
-        virtual bool get_lvalue() const;
 
         virtual const Expr * accept( Visitor & v ) const override = 0;
@@ -204 +200 @@
         ApplicationExpr( const CodeLocation & loc, const Expr * f, std::vector<ptr<Expr>> && as = {} );
 
-        bool get_lvalue() const final;
-
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -220 +214 @@
         UntypedExpr( const CodeLocation & loc, const Expr * f, std::vector<ptr<Expr>> && as = {} )
         : Expr( loc ), func( f ), args( std::move(as) ) {}
-
-        bool get_lvalue() const final;
 
         /// Creates a new dereference expression
@@ -298 +290 @@
         CastExpr( const Expr * a ) : CastExpr( a->location, a, GeneratedCast ) {}
 
-        bool get_lvalue() const final;
-
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -347 +337 @@
         : Expr( loc ), member( mem ), aggregate( agg ) { assert( aggregate ); }
 
-        bool get_lvalue() const final;
-
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -363 +351 @@
         MemberExpr( const CodeLocation & loc, const DeclWithType * mem, const Expr * agg );
 
-        bool get_lvalue() const final;
-
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
         MemberExpr * clone() const override { return new MemberExpr{ *this }; }
         MUTATE_FRIEND
-
-        // Custructor overload meant only for AST conversion
-        enum NoOpConstruction { NoOpConstructionChosen };
-        MemberExpr( const CodeLocation & loc, const DeclWithType * mem, const Expr * agg,
-            NoOpConstruction overloadSelector );
-        friend class ::ConverterOldToNew;
-        friend class ::ConverterNewToOld;
 };
 
@@ -385 +364 @@
         VariableExpr( const CodeLocation & loc );
         VariableExpr( const CodeLocation & loc, const DeclWithType * v );
-
-        bool get_lvalue() const final;
 
         /// generates a function pointer for a given function
@@ -554 +531 @@
 
         CommaExpr( const CodeLocation & loc, const Expr * a1, const Expr * a2 )
-        : Expr( loc ), arg1( a1 ), arg2( a2 ) {
-                this->result = a2->result;
-        }
-
-        bool get_lvalue() const final;
+        : Expr( loc ), arg1( a1 ), arg2( a2 ) {}
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -631 +604 @@
         CompoundLiteralExpr( const CodeLocation & loc, const Type * t, const Init * i );
 
-        bool get_lvalue() const final;
-
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -688 +659 @@
 
         TupleIndexExpr( const CodeLocation & loc, const Expr * t, unsigned i );
-
-        bool get_lvalue() const final;
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }