Changeset 436c0de for src/SynTree

Timestamp:

Jun 18, 2017, 9:22:22 AM (8 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:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/InitTweak/GenInit.cc

Location:

src/SynTree

Files:

• Expression.h (modified) (1 diff)
• Initializer.cc (modified) (1 diff)
• Initializer.h (modified) (1 diff)
• Mutator.cc (modified) (3 diffs)
• Mutator.h (modified) (3 diffs)
• Statement.cc (modified) (7 diffs)
• Statement.h (modified) (6 diffs)
• SynTree.h (modified) (3 diffs)
• TupleExpr.cc (modified) (1 diff)
• Visitor.cc (modified) (3 diffs)
• Visitor.h (modified) (3 diffs)
• ZeroOneType.cc (modified) (2 diffs)

src/SynTree/Expression.h

@@ -690 +690 @@
 };
 
-/// MemberTupleExpr represents a tuple member selection operation on a struct type, e.g. s.[a, b, c] after processing by the expression analyzer
-class MemberTupleExpr : public Expression {
-  public:
-        MemberTupleExpr( Expression * member, Expression * aggregate, Expression * _aname = nullptr );
-        MemberTupleExpr( const MemberTupleExpr & other );
-        virtual ~MemberTupleExpr();
-
-        Expression * get_member() const { return member; }
-        Expression * get_aggregate() const { return aggregate; }
-        MemberTupleExpr * set_member( Expression * newValue ) { member = newValue; return this; }
-        MemberTupleExpr * set_aggregate( Expression * newValue ) { aggregate = newValue; return this; }
-
-        virtual MemberTupleExpr * clone() const { return new MemberTupleExpr( * 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 * member;
-        Expression * aggregate;
-};
-
 /// TupleAssignExpr represents a multiple assignment operation, where both sides of the assignment have tuple type, e.g. [a, b, c] = [d, e, f];, a mass assignment operation, where the left hand side has tuple type and the right hand side does not, e.g. [a, b, c] = 5.0;, or a tuple ctor/dtor expression
 class TupleAssignExpr : public Expression {

src/SynTree/Initializer.cc

@@ -33 +33 @@
 }
 
-void Initializer::print( std::ostream &os, int indent ) {}
+// void Initializer::print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent ) {}
 
 SingleInit::SingleInit( Expression *v, const std::list< Expression *> &_designators, bool maybeConstructed ) : Initializer( maybeConstructed ), value ( v ), designators( _designators ) {

src/SynTree/Initializer.h

@@ -53 +53 @@
         virtual void accept( Visitor &v ) = 0;
         virtual Initializer *acceptMutator( Mutator &m ) = 0;
-        virtual void print( std::ostream &os, int indent = 0 );
+        virtual void print( std::ostream &os, int indent = 0 ) = 0;
   private:
         //      std::string name;

src/SynTree/Mutator.cc

@@ -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:45:19 2017
-// Update Count     : 22
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Mar  8 16:36:00 2017
+// Update Count     : 23
 //
 
@@ -153 +153 @@
 }
 
+Statement *Mutator::mutate( ThrowStmt *throwStmt ) {
+        throwStmt->set_expr( maybeMutate( throwStmt->get_expr(), *this ) );
+        throwStmt->set_target( maybeMutate( throwStmt->get_target(), *this ) );
+        return throwStmt;
+}
+
 Statement *Mutator::mutate( TryStmt *tryStmt ) {
         tryStmt->set_block( maybeMutate( tryStmt->get_block(), *this ) );
@@ -408 +414 @@
 }
 
-Expression *Mutator::mutate( MemberTupleExpr *tupleExpr ) {
-        tupleExpr->set_env( maybeMutate( tupleExpr->get_env(), *this ) );
-        tupleExpr->set_result( maybeMutate( tupleExpr->get_result(), *this ) );
-        tupleExpr->set_member( maybeMutate( tupleExpr->get_member(), *this ) );
-        tupleExpr->set_aggregate( maybeMutate( tupleExpr->get_aggregate(), *this ) );
-        return tupleExpr;
-}
-
 Expression *Mutator::mutate( TupleAssignExpr *assignExpr ) {
         assignExpr->set_env( maybeMutate( assignExpr->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 : Thu Feb  9 14:23:23 2017
-// Update Count     : 13
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun  8 15:45:00 2017
+// Update Count     : 14
 //
 #include <cassert>
@@ -46 +46 @@
         virtual Statement* mutate( BranchStmt *branchStmt );
         virtual Statement* mutate( ReturnStmt *returnStmt );
-        virtual Statement* mutate( TryStmt *returnStmt );
+        virtual Statement* mutate( ThrowStmt *throwStmt );
+        virtual Statement* mutate( TryStmt *tryStmt );
         virtual Statement* mutate( CatchStmt *catchStmt );
         virtual Statement* mutate( FinallyStmt *catchStmt );
@@ -82 +83 @@
         virtual Expression* mutate( TupleExpr *tupleExpr );
         virtual Expression* mutate( TupleIndexExpr *tupleExpr );
-        virtual Expression* mutate( MemberTupleExpr *tupleExpr );
         virtual Expression* mutate( TupleAssignExpr *assignExpr );
         virtual Expression* mutate( StmtExpr * stmtExpr );

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 12 13:58:48 2016
-// Update Count     : 62
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 10:37:00 2017
+// Update Count     : 64
 //
 
@@ -101 +101 @@
 }
 
-ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr, bool throwP ) : Statement( labels ), expr( _expr ), isThrow( throwP ) {}
-
-ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ), isThrow( other.isThrow ) {}
+ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr ) : Statement( labels ), expr( _expr ) {}
+
+ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
 
 ReturnStmt::~ReturnStmt() {
@@ -110 +110 @@
 
 void ReturnStmt::print( std::ostream &os, int indent ) const {
-        os << string ( isThrow? "Throw":"Return" ) << " Statement, returning: ";
+        os <<  "Return Statement, returning: ";
         if ( expr != 0 ) {
                 os << endl << string( indent+2, ' ' );
@@ -287 +287 @@
 }
 
+ThrowStmt::ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target ) :
+                Statement( labels ), kind(kind), expr(expr), target(target)     {
+        assertf(Resume == kind || nullptr == target, "Non-local termination throw is not accepted." );
+}
+
+ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
+        Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
+}
+
+ThrowStmt::~ThrowStmt() {
+        delete expr;
+        delete target;
+}
+
+void ThrowStmt::print( std::ostream &os, int indent) const {
+        if ( target ) {
+                os << "Non-Local ";
+        }
+        os << "Throw Statement, raising: ";
+        expr->print(os, indent + 4);
+        if ( target ) {
+                os << "At: ";
+                target->print(os, indent + 4);
+        }
+}
+
 TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<Statement *> &_handlers, FinallyStmt *_finallyBlock ) :
         Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
@@ -318 +344 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool catchAny ) :
-        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Kind _kind, Declaration *_decl, Expression *_cond, Statement *_body ) :
+        Statement( labels ), kind ( _kind ), decl ( _decl ), cond ( _cond ), body( _body ) {
 }
 
 CatchStmt::CatchStmt( const CatchStmt & other ) :
-        Statement( other ), decl ( maybeClone( other.decl ) ), body( maybeClone( other.body ) ), catchRest ( other.catchRest ) {
+        Statement( other ), kind ( other.kind ), decl ( maybeClone( other.decl ) ), cond ( maybeClone( other.cond ) ), body( maybeClone( other.body ) ) {
 }
 
@@ -332 +358 @@
 
 void CatchStmt::print( std::ostream &os, int indent ) const {
-        os << "Catch Statement" << endl;
+        os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
         os << string( indent, ' ' ) << "... catching" << endl;
@@ -338 +364 @@
                 decl->printShort( os, indent + 4 );
                 os << endl;
-        } else if ( catchRest )
-                os << string( indent + 4 , ' ' ) << "the rest" << endl;
+        }
         else
                 os << string( indent + 4 , ' ' ) << ">>> Error:  this catch clause must have a declaration <<<" << endl;

src/SynTree/Statement.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 : Fri Aug 12 13:57:46 2016
-// Update Count     : 65
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jun 12 13:35:00 2017
+// Update Count     : 67
 //
 
@@ -57 +57 @@
   private:
         std::list<Statement*> kids;
+};
+
+class NullStmt : public CompoundStmt {
+  public:
+        NullStmt();
+        NullStmt( std::list<Label> labels );
+
+        virtual NullStmt *clone() const { return new NullStmt( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
 };
 
@@ -261 +274 @@
 class ReturnStmt : public Statement {
   public:
-        ReturnStmt( std::list<Label> labels, Expression *expr, bool throwP = false );
+        ReturnStmt( std::list<Label> labels, Expression *expr );
         ReturnStmt( const ReturnStmt &other );
         virtual ~ReturnStmt();
@@ -274 +287 @@
   private:
         Expression *expr;
-        bool isThrow;
-};
-
-
-class NullStmt : public CompoundStmt {
-  public:
-        NullStmt();
-        NullStmt( std::list<Label> labels );
-
-        virtual NullStmt *clone() const { return new NullStmt( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-
-  private:
+};
+
+class ThrowStmt : public Statement {
+  public:
+        enum Kind { Terminate, Resume };
+
+        ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target = nullptr );
+        ThrowStmt( const ThrowStmt &other );
+        virtual ~ThrowStmt();
+
+        Kind get_kind() { return kind; }
+        Expression * get_expr() { return expr; }
+        void set_expr( Expression * newExpr ) { expr = newExpr; }
+        Expression * get_target() { return target; }
+        void set_target( Expression * newTarget ) { target = newTarget; }
+
+        virtual ThrowStmt *clone() const { return new ThrowStmt( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Kind kind;
+        Expression * expr;
+        Expression * target;
 };
 
@@ -317 +339 @@
 class CatchStmt : public Statement {
   public:
-        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool catchAny = false );
+        enum Kind { Terminate, Resume };
+
+        CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl,
+                   Expression *cond, Statement *body );
         CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();
 
+        Kind get_kind() { return kind; }
         Declaration *get_decl() { return decl; }
         void set_decl( Declaration *newValue ) { decl = newValue; }
-
+        Expression *get_cond() { return cond; }
+        void set_cond( Expression *newCond ) { cond = newCond; }
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
@@ -333 +360 @@
 
   private:
+        Kind kind;
         Declaration *decl;
+        Expression *cond;
         Statement *body;
-        bool catchRest;
 };
 

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 : Thu Feb  9 14:23:49 2017
-// Update Count     : 8
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun  8 17:00:00 2017
+// Update Count     : 9
 //
 
@@ -51 +51 @@
 class BranchStmt;
 class ReturnStmt;
+class ThrowStmt;
 class TryStmt;
 class CatchStmt;
@@ -89 +90 @@
 class TupleExpr;
 class TupleIndexExpr;
-class MemberTupleExpr;
 class TupleAssignExpr;
 class StmtExpr;

src/SynTree/TupleExpr.cc

@@ -78 +78 @@
 }
 
-MemberTupleExpr::MemberTupleExpr( Expression * member, Expression * aggregate, Expression * _aname ) : Expression( _aname ) {
-        set_result( maybeClone( member->get_result() ) ); // xxx - ???
-}
-
-MemberTupleExpr::MemberTupleExpr( const MemberTupleExpr &other ) : Expression( other ), member( other.member->clone() ), aggregate( other.aggregate->clone() ) {
-}
-
-MemberTupleExpr::~MemberTupleExpr() {
-        delete member;
-        delete aggregate;
-}
-
-void MemberTupleExpr::print( std::ostream &os, int indent ) const {
-        os << "Member Tuple Expression, with aggregate:" << std::endl;
-        os << std::string( indent+2, ' ' );
-        aggregate->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with member: " << std::endl;
-        os << std::string( indent+2, ' ' );
-        member->print( os, indent+2 );
-        Expression::print( os, indent );
-}
-
 TupleAssignExpr::TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname ) : Expression( _aname ) {
         // convert internally into a StmtExpr which contains the declarations and produces the tuple of the assignments

src/SynTree/Visitor.cc

@@ -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:45:25 2017
-// Update Count     : 24
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jun  8 16:31:00 2017
+// Update Count     : 25
 //
 
@@ -129 +129 @@
 }
 
+void Visitor::visit( ThrowStmt * throwStmt ) {
+        maybeAccept( throwStmt->get_expr(), *this );
+        maybeAccept( throwStmt->get_target(), *this );
+}
+
 void Visitor::visit( TryStmt *tryStmt ) {
         maybeAccept( tryStmt->get_block(), *this );
@@ -319 +324 @@
         maybeAccept( tupleExpr->get_result(), *this );
         maybeAccept( tupleExpr->get_tuple(), *this );
-}
-
-void Visitor::visit( MemberTupleExpr *tupleExpr ) {
-        maybeAccept( tupleExpr->get_result(), *this );
-        maybeAccept( tupleExpr->get_member(), *this );
-        maybeAccept( tupleExpr->get_aggregate(), *this );
 }
 

src/SynTree/Visitor.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May  3 08:58:00 2017
-// Update Count     : 10
+// Last Modified On : Thr Jun 08 15:45:00 2017
+// Update Count     : 11
 //
 
@@ -49 +49 @@
         virtual void visit( BranchStmt *branchStmt );
         virtual void visit( ReturnStmt *returnStmt );
+        virtual void visit( ThrowStmt *throwStmt );
         virtual void visit( TryStmt *tryStmt );
         virtual void visit( CatchStmt *catchStmt );
@@ -85 +86 @@
         virtual void visit( TupleExpr *tupleExpr );
         virtual void visit( TupleIndexExpr *tupleExpr );
-        virtual void visit( MemberTupleExpr *tupleExpr );
         virtual void visit( TupleAssignExpr *assignExpr );
         virtual void visit( StmtExpr * stmtExpr );

src/SynTree/ZeroOneType.cc

@@ -20 +20 @@
 ZeroType::ZeroType( Type::Qualifiers tq, const std::list< Attribute * > & attributes ) : Type( tq, attributes ) {}
 
-void ZeroType::print( std::ostream &os, int indent ) const {
+void ZeroType::print( std::ostream &os, __attribute__((unused)) int indent ) const {
         os << "zero_t";
 }
@@ -28 +28 @@
 OneType::OneType( Type::Qualifiers tq, const std::list< Attribute * > & attributes ) : Type( tq, attributes ) {}
 
-void OneType::print( std::ostream &os, int indent ) const {
+void OneType::print( std::ostream &os, __attribute__((unused)) int indent ) const {
         os << "one_t";
 }