Changeset 6e49f18 for src/SynTree/Initializer.h

Timestamp:

Sep 27, 2017, 11:11:30 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f802e46

Parents:

a6c5d7c (diff), fa16264 (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 plg2:software/cfa/cfa-cc

File:

• src/SynTree/Initializer.h (modified) (4 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 Designation * acceptMutator( Mutator &m ) override { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) 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 Initializer *acceptMutator( Mutator &m ) override = 0;
         virtual void print( std::ostream &os, int indent = 0 ) const override = 0;
   private:
@@ -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 );
@@ -135 +138 @@
 
   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;
 };