Changeset 0720e049 for src/SynTree/Initializer.h

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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:/u/cforall/software/cfa/cfa-cc

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 : Peter A. Buhr
-// Last Modified On : Thu Mar 23 16:12:42 2017
-// Update Count     : 20
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  9 10:19:00 2017
+// Update Count     : 22
 //
 
-#ifndef INITIALIZER_H
-#define INITIALIZER_H
+#pragma once
 
 #include <cassert>
@@ -28 +27 @@
 class Designation : public BaseSyntaxNode {
 public:
+        std::list< Expression * > designators;
+
         Designation( const std::list< Expression * > & designators );
         Designation( const Designation & other );
@@ -38 +39 @@
         virtual Designation * acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-private:
-        std::list< Expression * > designators;
 };
 
@@ -64 +63 @@
 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 );
@@ -75 +77 @@
         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
 };
 
@@ -84 +83 @@
 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 );
@@ -103 +105 @@
         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
 };
 
@@ -114 +113 @@
 class ConstructorInit : public Initializer {
   public:
+        Statement * ctor;
+        Statement * dtor;
+
         ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
         ConstructorInit( const ConstructorInit &other );
@@ -131 +133 @@
 
   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 //