Changeset 3f7e12cb for src/SynTree/Initializer.h

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, with_gc

Children:

954908d

Parents:

78315272 (diff), e35f30a (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

File:

• src/SynTree/Initializer.h (modified) (6 diffs)

src/SynTree/Initializer.h

@@ -37 +37 @@
         std::list< Expression * > & get_designators() { return designators; }
 
-        virtual Designation * clone() const { return new Designation( *this ); };
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Designation * acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual Designation * clone() const override { return new Designation( *this ); };
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        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 void accept( Visitor &v ) = 0;
-        virtual Initializer *acceptMutator( Mutator &m ) = 0;
-        virtual void print( std::ostream &os, int indent = 0 ) const = 0;
+        virtual Initializer *clone() const override = 0;
+        virtual void accept( Visitor &v ) override = 0;
+        virtual Initializer *acceptMutator( Mutator &m ) override = 0;
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
   private:
         bool maybeConstructed;
@@ -75 +75 @@
         void set_value( Expression *newValue ) { value = newValue; }
 
-        virtual SingleInit *clone() const { return new SingleInit( *this); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual SingleInit *clone() const override { return new SingleInit( *this); }
+        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, Indenter indent = {} ) const override;
 };
 
@@ -103 +103 @@
         const_iterator end() const { return initializers.end(); }
 
-        virtual ListInit *clone() const { return new ListInit( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual ListInit *clone() const override { return new ListInit( *this ); }
+        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, Indenter indent = {} ) const override;
 };
 
@@ -117 +117 @@
         Statement * ctor;
         Statement * dtor;
+        // C-style initializer made up of SingleInit and ListInit nodes to use as a fallback
+        // if an appropriate constructor definition is not found by the resolver
+        Initializer * init;
 
         ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
@@ -129 +132 @@
         Initializer * get_init() const { return init; }
 
-        ConstructorInit *clone() const { return new ConstructorInit( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
+        ConstructorInit *clone() const override { return new ConstructorInit( *this ); }
+        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, Indenter indent = {} ) const override;
 
   private:
-        // C-style initializer made up of SingleInit and ListInit nodes to use as a fallback
-        // if an appropriate constructor definition is not found by the resolver
-        Initializer * init;
 };
-
-std::ostream & operator<<( std::ostream & out, const Initializer * init );
-std::ostream & operator<<( std::ostream & out, const Designation * des );
 
 // Local Variables: //