Changes in src/SynTree/Initializer.h [65cdc1e:e4d829b]

File:

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

src/SynTree/Initializer.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Aug  9 10:19:00 2017
-// Update Count     : 22
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 23 16:12:42 2017
+// Update Count     : 20
 //
 
-#pragma once
+#ifndef INITIALIZER_H
+#define INITIALIZER_H
 
 #include <cassert>
@@ -27 +28 @@
 class Designation : public BaseSyntaxNode {
 public:
-        std::list< Expression * > designators;
-
         Designation( const std::list< Expression * > & designators );
         Designation( const Designation & other );
@@ -39 +38 @@
         virtual Designation * acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+private:
+        std::list< Expression * > designators;
 };
 
@@ -63 +64 @@
 class SingleInit : public Initializer {
   public:
-        //Constant *value;
-        Expression *value;      // has to be a compile-time constant
-
         SingleInit( Expression *value, bool maybeConstructed = false );
         SingleInit( const SingleInit &other );
@@ -77 +75 @@
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        //Constant *value;
+        Expression *value;      // has to be a compile-time constant
 };
 
@@ -83 +84 @@
 class ListInit : public Initializer {
   public:
-        std::list<Initializer *> initializers;  // order *is* important
-        std::list<Designation *> designations;  // order/length is consistent with initializers
-
         ListInit( const std::list<Initializer*> &initializers,
                           const std::list<Designation *> &designators = {}, bool maybeConstructed = false );
@@ -105 +103 @@
         virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        std::list<Initializer *> initializers;  // order *is* important
+        std::list<Designation *> designations;  // order/length is consistent with initializers
 };
 
@@ -113 +114 @@
 class ConstructorInit : public Initializer {
   public:
-        Statement * ctor;
-        Statement * dtor;
-
         ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
         ConstructorInit( const ConstructorInit &other );
@@ -133 +131 @@
 
   private:
+        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
@@ -141 +141 @@
 std::ostream & operator<<( std::ostream & out, const Designation * des );
 
+#endif // INITIALIZER_H
+
 // Local Variables: //
 // tab-width: 4 //