Changeset 65197c2 for src/SynTree

Timestamp:

Dec 5, 2017, 2:17:17 PM (8 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, stuck-waitfor-destruct, with_gc

Children:

971d9f2, a85e44c, c13e8dc8

Parents:

12d2dc8 (diff), 866f560 (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:

• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• ReferenceToType.cc (modified) (2 diffs)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (3 diffs)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Mutator.cc

@@ -203 +203 @@
 }
 
+Statement * Mutator::mutate( WithStmt * withStmt ) {
+        mutateAll( withStmt->exprs, *this );
+        withStmt->stmt = maybeMutate( withStmt->stmt, *this );
+        return withStmt;
+}
+
 NullStmt * Mutator::mutate( NullStmt *nullStmt ) {
         return nullStmt;

src/SynTree/Mutator.h

@@ -50 +50 @@
         virtual Statement * mutate( FinallyStmt * catchStmt );
         virtual Statement * mutate( WaitForStmt * waitforStmt );
+        virtual Statement * mutate( WithStmt * withStmt );
         virtual NullStmt * mutate( NullStmt * nullStmt );
         virtual Statement * mutate( DeclStmt * declStmt );

src/SynTree/ReferenceToType.cc

@@ -70 +70 @@
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 
+AggregateDecl * StructInstType::getAggr() { return baseStruct; }
+
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
@@ -101 +103 @@
 
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
+
+AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Statement.cc

@@ -456 +456 @@
 }
 
+
+WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Statement(), exprs( exprs ), stmt( stmt ) {}
+WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
+        cloneAll( other.exprs, exprs );
+}
+WithStmt::~WithStmt() {
+        deleteAll( exprs );
+        delete stmt;
+}
+
+void WithStmt::print( std::ostream & os, Indenter indent ) const {
+        os << "With statement" << endl;
+        os << indent << "... with statement:" << endl << indent+1;
+        stmt->print( os, indent+1 );
+}
+
+
 NullStmt::NullStmt( const std::list<Label> & labels ) : Statement( labels ) {
 }

src/SynTree/Statement.h

@@ -431 +431 @@
 };
 
+class WithStmt : public Statement {
+public:
+        std::list< Expression * > exprs;
+        Statement * stmt;
+
+        WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+        WithStmt( const WithStmt & other );
+        virtual ~WithStmt();
+
+        virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 
 // represents a declaration that occurs as part of a compound statement

src/SynTree/SynTree.h

@@ -55 +55 @@
 class FinallyStmt;
 class WaitForStmt;
+class WithStmt;
 class NullStmt;
 class DeclStmt;

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
+        virtual AggregateDecl * getAggr() {     assertf( false, "Non-aggregate type: %s", toString( this ).c_str() ); }
+
         virtual Type *clone() const = 0;
         virtual void accept( Visitor & v ) = 0;
@@ -405 +407 @@
         virtual bool isComplete() const override;
 
+        virtual AggregateDecl * getAggr() override;
+
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
         /// Clones declarations into "foundDecls", caller responsible for freeing
@@ -436 +440 @@
 
         virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() override;
 
         /// looks up the members of this union named "name" and places them into "foundDecls"

src/SynTree/Visitor.cc

@@ -174 +174 @@
 }
 
-void Visitor::visit( __attribute__((unused)) NullStmt *nullStmt ) {
+void Visitor::visit( WithStmt * withStmt ) {
+        acceptAll( withStmt->exprs, *this );
+        maybeAccept( withStmt->stmt, *this );
+}
+
+void Visitor::visit( NullStmt * ) {
 }
 

src/SynTree/Visitor.h

@@ -52 +52 @@
         virtual void visit( FinallyStmt * finallyStmt );
         virtual void visit( WaitForStmt * waitforStmt );
+        virtual void visit( WithStmt * withStmt );
         virtual void visit( NullStmt * nullStmt );
         virtual void visit( DeclStmt * declStmt );