Changeset fcd17b2f for src/SynTree

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

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (1 diff)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (3 diffs)
• Mutator.cc (modified) (2 diffs)
• Mutator.h (modified) (2 diffs)
• SynTree.h (modified) (2 diffs)
• Visitor.cc (modified) (2 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -44 +44 @@
 }
 
-ApplicationExpr::ApplicationExpr( Expression *funcExpr ) : function( funcExpr ) {
+ApplicationExpr::ApplicationExpr( Expression *funcExpr, const std::list< Expression * > & argList ) : function( funcExpr ), args( argList ) {
         PointerType *pointer = safe_dynamic_cast< PointerType* >( funcExpr->get_result() );
         FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:41:13 2017
-// Update Count     : 52
+// Last Modified On : Tue Jul 25 14:15:47 2017
+// Update Count     : 54
 //
 
@@ -298 +298 @@
         if ( result->isVoid() ) {
                 os << "nothing";
+        } else {
+                result->print( os, indent+2 );
+        } // if
+        os << std::endl;
+        Expression::print( os, indent );
+}
+
+VirtualCastExpr::VirtualCastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
+        set_result(toType);
+}
+
+VirtualCastExpr::VirtualCastExpr( const VirtualCastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
+}
+
+VirtualCastExpr::~VirtualCastExpr() {
+        delete arg;
+}
+
+void VirtualCastExpr::print( std::ostream &os, int indent ) const {
+        os << "Virtual Cast of:" << std::endl << std::string( indent+2, ' ' );
+        arg->print(os, indent+2);
+        os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
+        os << std::string( indent+2, ' ' );
+        if ( ! result ) {
+                os << "unknown";
         } else {
                 result->print( os, indent+2 );

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 ); }

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun 22 13:43:00 2017
-// Update Count     : 24
+// Last Modified On : Mon Jul 24 16:32:00 2017
+// Update Count     : 25
 //
 
@@ -235 +235 @@
 }
 
+Expression *Mutator::mutate( VirtualCastExpr *castExpr ) {
+        castExpr->set_env( maybeMutate( castExpr->get_env(), *this ) );
+        castExpr->set_result( maybeMutate( castExpr->get_result(), *this ) );
+        castExpr->set_arg( maybeMutate( castExpr->get_arg(), *this ) );
+        return castExpr;
+}
+
 Expression *Mutator::mutate( UntypedMemberExpr *memberExpr ) {
         memberExpr->set_env( maybeMutate( memberExpr->get_env(), *this ) );

src/SynTree/Mutator.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:51:30 2017
-// Update Count     : 15
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 24 16:31:00 2017
+// Update Count     : 16
 //
 #include <cassert>
@@ -59 +59 @@
         virtual Expression* mutate( LabelAddressExpr *labAddressExpr );
         virtual Expression* mutate( CastExpr *castExpr );
+        virtual Expression* mutate( VirtualCastExpr *castExpr );
         virtual Expression* mutate( UntypedMemberExpr *memberExpr );
         virtual Expression* mutate( MemberExpr *memberExpr );

src/SynTree/SynTree.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:51:46 2017
-// Update Count     : 10
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 24 16:54:00 2017
+// Update Count     : 11
 //
 
@@ -66 +66 @@
 class LabelAddressExpr;
 class CastExpr;
+class VirtualCastExpr;
 class MemberExpr;
 class UntypedMemberExpr;

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun 22 13:41:00 2017
-// Update Count     : 26
+// Last Modified On : Mon Jul 24 16:30:00 2017
+// Update Count     : 27
 //
 
@@ -192 +192 @@
 }
 
+void Visitor::visit( VirtualCastExpr *castExpr ) {
+        maybeAccept( castExpr->get_result(), *this );
+        maybeAccept( castExpr->get_arg(), *this );
+}
+
 void Visitor::visit( UntypedMemberExpr *memberExpr ) {
         maybeAccept( memberExpr->get_result(), *this );

src/SynTree/Visitor.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:54:04 2017
-// Update Count     : 12
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jul 24 16:28:00 2017
+// Update Count     : 13
 //
 
@@ -60 +60 @@
         virtual void visit( NameExpr *nameExpr );
         virtual void visit( CastExpr *castExpr );
+        virtual void visit( VirtualCastExpr *castExpr );
         virtual void visit( AddressExpr *addressExpr );
         virtual void visit( LabelAddressExpr *labAddressExpr );