Changes in src/AST/Decl.hpp [10a1225:9d6e7fa9]

File:

• src/AST/Decl.hpp (modified) (6 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"; }
 };
 
@@ -286 +287 @@
 
         /// gets the integer value for this enumerator, returning true iff value found
-        bool valueOf( Decl* enumerator, long long& value ) const;
-
-        const Decl * accept( Visitor & v ) const override { return v.visit( this ); }
+        bool valueOf( const Decl * enumerator, long long& value ) const;
+
+        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"; }
 };
 
@@ -329 +332 @@
 class StaticAssertDecl : public Decl {
 public:
-        ptr<Expr> condition;
+        ptr<Expr> cond;
         ptr<ConstantExpr> msg;   // string literal
 
         StaticAssertDecl( const CodeLocation & loc, const Expr * condition, const ConstantExpr * msg )
-        : Decl( loc, "", {}, {} ), condition( condition ), msg( msg ) {}
+        : Decl( loc, "", {}, {} ), cond( condition ), msg( msg ) {}
 
         const StaticAssertDecl * accept( Visitor &v ) const override { return v.visit( this ); }