Changeset 6840e7c for src/SynTree/Initializer.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/Initializer.h (modified) (5 diffs)

src/SynTree/Initializer.h

@@ -37 +37 @@
         std::list< Expression * > & get_designators() { return designators; }
 
-        virtual Designation * clone() const { return new Designation( *this ); };
+        virtual Designation * clone() const override { return new Designation( *this ); };
         virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Designation * acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
+        virtual Designation * acceptMutator( Mutator &m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -54 +54 @@
         bool get_maybeConstructed() { return maybeConstructed; }
 
-        virtual Initializer *clone() const = 0;
+        virtual Initializer *clone() const override = 0;
         virtual void accept( Visitor &v ) override = 0;
-        virtual Initializer *acceptMutator( Mutator &m ) = 0;
-        virtual void print( std::ostream &os, int indent = 0 ) const override = 0;
+        virtual Initializer *acceptMutator( Mutator &m ) override = 0;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
   private:
         bool maybeConstructed;
@@ -78 +78 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Initializer *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;
 };
 
@@ -106 +106 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Initializer *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;
 };
 
@@ -135 +135 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Initializer *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: