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

src/SynTree/Declaration.h

@@ -61 +61 @@
 
         void fixUniqueId( void );
-        virtual Declaration *clone() const = 0;
+        virtual Declaration *clone() const override = 0;
         virtual void accept( Visitor &v ) override = 0;
-        virtual Declaration *acceptMutator( Mutator &m ) = 0;
-        virtual void print( std::ostream &os, int indent = 0 ) const override = 0;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const = 0;
+        virtual Declaration *acceptMutator( Mutator &m ) override = 0;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const = 0;
 
         static void dumpIds( std::ostream &os );
@@ -142 +142 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual DeclarationWithType *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -170 +170 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual DeclarationWithType *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -193 +193 @@
 
         virtual NamedTypeDecl *clone() const override = 0;
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
 };
 
@@ -235 +235 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Declaration *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:
@@ -276 +276 @@
         AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
 
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
   protected:
         virtual std::string typeString() const = 0;
@@ -355 +355 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual AsmDecl *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const override;
-        virtual void printShort( std::ostream &os, int indent = 0 ) const override;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
 };