Changeset fcd17b2f for src/SynTree/Expression.h

Timestamp:

Jul 27, 2017, 2:56:39 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

874960b

Parents:

4d4e5de (diff), a04ce4d (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) (3 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 : Sat Jul 22 09:53:16 2017
-// Update Count     : 42
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 24 16:27:00 2017
+// Update Count     : 43
 //
 
@@ -79 +79 @@
 class ApplicationExpr : public Expression {
   public:
-        ApplicationExpr( Expression * function );
+        ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
         ApplicationExpr( const ApplicationExpr & other );
         virtual ~ApplicationExpr();
@@ -194 +194 @@
 
         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 ); }
+        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:
+        Expression * arg;
+};
+
+/// VirtualCastExpr repersents a virtual dynamic cast, e.g. (virtual exception)e
+class VirtualCastExpr : public Expression {
+  public:
+        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 ); }