Changeset 6380f78 for src/AST/Decl.hpp

Timestamp:

May 22, 2019, 3:40:36 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

76ed81f

Parents:

d8938622 (diff), f4c2f1a (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/AST/Decl.hpp (modified) (5 diffs)

src/AST/Decl.hpp

@@ -232 +232 @@
         AggregateDecl* set_body( bool b ) { body = b; return this; }
 
-private:
-        AggregateDecl * clone() const override = 0;
-        MUTATE_FRIEND
-
-protected:
         /// Produces a name for the kind of aggregate
         virtual std::string typeString() const = 0;
+
+private:
+        AggregateDecl * clone() const override = 0;
+        MUTATE_FRIEND
 };
 
@@ -256 +255 @@
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        std::string typeString() const override { return "struct"; }
+
 private:
         StructDecl * clone() const override { return new StructDecl{ *this }; }
         MUTATE_FRIEND
-
-        std::string typeString() const override { return "struct"; }
 };
 
@@ -271 +271 @@
 
         const Decl * accept( Visitor& v ) const override { return v.visit( this ); }
+
+        std::string typeString() const override { return "union"; }
+
 private:
         UnionDecl * clone() const override { return new UnionDecl{ *this }; }
         MUTATE_FRIEND
-
-        std::string typeString() const override { return "union"; }
 };
 
@@ -289 +290 @@
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        std::string typeString() const override { return "enum"; }
+
 private:
         EnumDecl * clone() const override { return new EnumDecl{ *this }; }
         MUTATE_FRIEND
-
-        std::string typeString() const override { return "enum"; }
 
         /// Map from names to enumerator values; kept private for lazy initialization
@@ -307 +309 @@
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+
+        std::string typeString() const override { return "trait"; }
+
 private:
         TraitDecl * clone() const override { return new TraitDecl{ *this }; }
         MUTATE_FRIEND
-
-        std::string typeString() const override { return "trait"; }
 };