Changeset e67991f for src/SynTree

Timestamp:

Jul 16, 2019, 10:38:32 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6f15121

Parents:

7dc2e57b

Message:

WithStmt is now a Declaration

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• Expression.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -360 +360 @@
 };
 
+class WithStmt : public Declaration {
+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 void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Declaration * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream & os, Indenter indent = {} ) const override { print(os, indent); }
+};
+
 class AsmDecl : public Declaration {
   public:

src/SynTree/Expression.cc

@@ -724 +724 @@
 }
 
-DeletedExpr::DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
+DeletedExpr::DeletedExpr( Expression * expr, Declaration * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
         assert( expr->result );
         result = expr->result->clone();

src/SynTree/Expression.h

@@ -888 +888 @@
 public:
         Expression * expr;
-        BaseSyntaxNode * deleteStmt;
-
-        DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt );
+        Declaration * deleteStmt;
+
+        DeletedExpr( Expression * expr, Declaration * deleteStmt );
         DeletedExpr( const DeletedExpr & other );
         ~DeletedExpr();

src/SynTree/Mutator.h

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

src/SynTree/Statement.cc

@@ -493 +493 @@
 
 
-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 ) ) {
+WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Declaration("", noStorageClasses, LinkageSpec::Cforall), exprs( exprs ), stmt( stmt ) {}
+WithStmt::WithStmt( const WithStmt & other ) : Declaration( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
 }

src/SynTree/Statement.h

@@ -461 +461 @@
 };
 
-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 void accept( Visitor & v ) const override { v.visit( this ); }
-        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
-};
+// 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 void accept( Visitor & v ) const override { v.visit( this ); }
+//      virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+//      virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+// };