Changeset 6840e7c for src/SynTree/Statement.h

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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' into cleanup-dtors

File:

• src/SynTree/Statement.h (modified) (19 diffs)

src/SynTree/Statement.h

@@ -43 +43 @@
         const std::list<Label> & get_labels() const { return labels; }
 
-        virtual Statement *clone() const = 0;
+        virtual Statement *clone() const override = 0;
         virtual void accept( Visitor &v ) override = 0;
-        virtual Statement *acceptMutator( Mutator &m ) = 0;
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual Statement *acceptMutator( Mutator &m ) override = 0;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -65 +65 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual CompoundStmt *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -76 +76 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual NullStmt *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -93 +93 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -124 +124 @@
         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;
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
 };
 
@@ -150 +150 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -171 +171 @@
 
         virtual SwitchStmt *clone() const override { return new SwitchStmt( *this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 
 };
@@ -199 +199 @@
 
         virtual CaseStmt *clone() const override { return new CaseStmt( *this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
   private:
         bool _isDefault;
@@ -225 +225 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -251 +251 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -280 +280 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
   private:
         static const char *brType[];
@@ -299 +299 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -323 +323 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -346 +346 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -374 +374 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -391 +391 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -428 +428 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 
 };
@@ -448 +448 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -470 +470 @@
         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, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };