Changes in src/SynTree/Expression.h [65cdc1e:62423350]

File:

• src/SynTree/Expression.h (modified) (63 diffs)

src/SynTree/Expression.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  8 11:54:00 2017
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 30 16:44:00 2017
+// Update Count     : 41
 //
 
-#pragma once
+#ifndef EXPRESSION_H
+#define EXPRESSION_H
 
 #include <map>
@@ -29 +30 @@
 class Expression : public BaseSyntaxNode{
   public:
-        Type * result;
-        TypeSubstitution * env;
-        Expression * argName; // if expression is used as an argument, it can be "designated" by this name
-        bool extension = false;
-
         Expression( Expression * _aname = nullptr );
         Expression( const Expression & other );
@@ -54 +50 @@
         virtual Expression * acceptMutator( Mutator & m ) = 0;
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  protected:
+        Type * result;
+        TypeSubstitution * env;
+        Expression * argName; // if expression is used as an argument, it can be "designated" by this name
+        bool extension = false;
 };
 
@@ -79 +80 @@
 class ApplicationExpr : public Expression {
   public:
-        Expression * function;
-
-        ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
+        ApplicationExpr( Expression * function );
         ApplicationExpr( const ApplicationExpr & other );
         virtual ~ApplicationExpr();
@@ -94 +93 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-
-  private:
+  private:
+        Expression * function;
         std::list<Expression *> args;
         InferredParams inferParams;
@@ -105 +104 @@
 class UntypedExpr : public Expression {
   public:
-        Expression * function;
-        std::list<Expression*> args;
-
         UntypedExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >(), Expression *_aname = nullptr );
         UntypedExpr( const UntypedExpr & other );
@@ -128 +124 @@
         virtual void print( std::ostream & os, int indent = 0 ) const;
         virtual void printArgs(std::ostream & os, int indent = 0) const;
+  private:
+        Expression * function;
+        std::list<Expression*> args;
 };
 
@@ -133 +132 @@
 class NameExpr : public Expression {
   public:
-        std::string name;
-
         NameExpr( std::string name, Expression *_aname = nullptr );
         NameExpr( const NameExpr & other );
@@ -146 +143 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        std::string name;
 };
 
@@ -154 +153 @@
 class AddressExpr : public Expression {
   public:
-        Expression * arg;
-
         AddressExpr( Expression * arg, Expression *_aname = nullptr );
         AddressExpr( const AddressExpr & other );
@@ -167 +164 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * arg;
 };
 
@@ -172 +171 @@
 class LabelAddressExpr : public Expression {
   public:
-        Expression * arg;
-
         LabelAddressExpr( Expression * arg );
         LabelAddressExpr( const LabelAddressExpr & other );
@@ -185 +182 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * arg;
 };
 
@@ -190 +189 @@
 class CastExpr : public Expression {
   public:
-        Expression * arg;
-
         CastExpr( Expression * arg, Expression *_aname = nullptr );
         CastExpr( Expression * arg, Type * toType, Expression *_aname = nullptr );
@@ -198 +195 @@
 
         Expression * get_arg() const { return arg; }
-        void set_arg( Expression * newValue ) { arg = newValue; }
+        void set_arg(Expression * newValue ) { arg = newValue; }
 
         virtual CastExpr * clone() const { return new CastExpr( * this ); }
@@ -204 +201 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-};
-
-/// VirtualCastExpr repersents a virtual dynamic cast, e.g. (virtual exception)e
-class VirtualCastExpr : public Expression {
-  public:
+  private:
         Expression * arg;
-
-        VirtualCastExpr( Expression * arg, Type * toType );
-        VirtualCastExpr( const VirtualCastExpr & other );
-        virtual ~VirtualCastExpr();
-
-        Expression * get_arg() const { return arg; }
-        void set_arg( Expression * newValue ) { arg = newValue; }
-
-        virtual VirtualCastExpr * clone() const { return new VirtualCastExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
 };
 
@@ -227 +208 @@
 class UntypedMemberExpr : public Expression {
   public:
-        Expression * member;
-        Expression * aggregate;
-
         UntypedMemberExpr( Expression * member, Expression * aggregate, Expression *_aname = nullptr );
         UntypedMemberExpr( const UntypedMemberExpr & other );
@@ -243 +221 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * member;
+        Expression * aggregate;
 };
 
@@ -249 +230 @@
 class MemberExpr : public Expression {
   public:
-        DeclarationWithType * member;
-        Expression * aggregate;
-
         MemberExpr( DeclarationWithType * member, Expression * aggregate, Expression *_aname = nullptr );
         MemberExpr( const MemberExpr & other );
@@ -265 +243 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        DeclarationWithType * member;
+        Expression * aggregate;
 };
 
@@ -271 +252 @@
 class VariableExpr : public Expression {
   public:
-        DeclarationWithType * var;
-
         VariableExpr( DeclarationWithType * var, Expression *_aname = nullptr );
         VariableExpr( const VariableExpr & other );
@@ -284 +263 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        DeclarationWithType * var;
 };
 
@@ -289 +270 @@
 class ConstantExpr : public Expression {
   public:
-        Constant constant;
-
         ConstantExpr( Constant constant, Expression *_aname = nullptr );
         ConstantExpr( const ConstantExpr & other );
@@ -302 +281 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Constant constant;
 };
 
@@ -307 +288 @@
 class SizeofExpr : public Expression {
   public:
-        Expression * expr;
-        Type * type;
-        bool isType;
-
         SizeofExpr( Expression * expr, Expression *_aname = nullptr );
         SizeofExpr( const SizeofExpr & other );
@@ -327 +304 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-};
-
-/// AlignofExpr represents an alignof expression
-class AlignofExpr : public Expression {
-  public:
+  private:
         Expression * expr;
         Type * type;
         bool isType;
-
+};
+
+/// AlignofExpr represents an alignof expression
+class AlignofExpr : public Expression {
+  public:
         AlignofExpr( Expression * expr, Expression *_aname = nullptr );
         AlignofExpr( const AlignofExpr & other );
@@ -352 +329 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * expr;
+        Type * type;
+        bool isType;
 };
 
@@ -357 +338 @@
 class UntypedOffsetofExpr : public Expression {
   public:
-        Type * type;
-        std::string member;
-
         UntypedOffsetofExpr( Type * type, const std::string & member, Expression *_aname = nullptr );
         UntypedOffsetofExpr( const UntypedOffsetofExpr & other );
@@ -373 +351 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Type * type;
+        std::string member;
 };
 
@@ -378 +359 @@
 class OffsetofExpr : public Expression {
   public:
-        Type * type;
-        DeclarationWithType * member;
-
         OffsetofExpr( Type * type, DeclarationWithType * member, Expression *_aname = nullptr );
         OffsetofExpr( const OffsetofExpr & other );
@@ -394 +372 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Type * type;
+        DeclarationWithType * member;
 };
 
@@ -399 +380 @@
 class OffsetPackExpr : public Expression {
 public:
-        StructInstType * type;
-
         OffsetPackExpr( StructInstType * type_, Expression * aname_ = 0 );
         OffsetPackExpr( const OffsetPackExpr & other );
@@ -411 +390 @@
         virtual void accept( Visitor & v ) { v.visit( this ); }
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
+
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+
+private:
+        StructInstType * type;
 };
 
@@ -417 +400 @@
 class AttrExpr : public Expression {
   public:
-        Expression * attr;
-        Expression * expr;
-        Type * type;
-        bool isType;
-
         AttrExpr(Expression * attr, Expression * expr, Expression *_aname = nullptr );
         AttrExpr( const AttrExpr & other );
@@ -440 +418 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * attr;
+        Expression * expr;
+        Type * type;
+        bool isType;
 };
 
@@ -445 +428 @@
 class LogicalExpr : public Expression {
   public:
-        Expression * arg1;
-        Expression * arg2;
-
         LogicalExpr( Expression * arg1, Expression * arg2, bool andp = true, Expression *_aname = nullptr );
         LogicalExpr( const LogicalExpr & other );
@@ -462 +442 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
-
-  private:
+  private:
+        Expression * arg1;
+        Expression * arg2;
         bool isAnd;
 };
@@ -470 +451 @@
 class ConditionalExpr : public Expression {
   public:
-        Expression * arg1;
-        Expression * arg2;
-        Expression * arg3;
-
         ConditionalExpr( Expression * arg1, Expression * arg2, Expression * arg3, Expression *_aname = nullptr );
         ConditionalExpr( const ConditionalExpr & other );
@@ -489 +466 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * arg1;
+        Expression * arg2;
+        Expression * arg3;
 };
 
@@ -494 +475 @@
 class CommaExpr : public Expression {
   public:
-        Expression * arg1;
-        Expression * arg2;
-
         CommaExpr( Expression * arg1, Expression * arg2, Expression *_aname = nullptr );
         CommaExpr( const CommaExpr & other );
@@ -510 +488 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * arg1;
+        Expression * arg2;
 };
 
@@ -515 +496 @@
 class TypeExpr : public Expression {
   public:
-        Type * type;
-
         TypeExpr( Type * type );
         TypeExpr( const TypeExpr & other );
@@ -528 +507 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Type * type;
 };
 
@@ -533 +514 @@
 class AsmExpr : public Expression {
   public:
+        AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( const AsmExpr & other );
+        virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
+
+        Expression * get_inout() const { return inout; }
+        void set_inout( Expression * newValue ) { inout = newValue; }
+
+        ConstantExpr * get_constraint() const { return constraint; }
+        void set_constraint( ConstantExpr * newValue ) { constraint = newValue; }
+
+        Expression * get_operand() const { return operand; }
+        void set_operand( Expression * newValue ) { operand = newValue; }
+
+        virtual AsmExpr * clone() const { return new AsmExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        // https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints
         Expression * inout;
         ConstantExpr * constraint;
         Expression * operand;
-
-        AsmExpr( Expression * inout, ConstantExpr * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
-        AsmExpr( const AsmExpr & other );
-        virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
-
-        Expression * get_inout() const { return inout; }
-        void set_inout( Expression * newValue ) { inout = newValue; }
-
-        ConstantExpr * get_constraint() const { return constraint; }
-        void set_constraint( ConstantExpr * newValue ) { constraint = newValue; }
-
-        Expression * get_operand() const { return operand; }
-        void set_operand( Expression * newValue ) { operand = newValue; }
-
-        virtual AsmExpr * clone() const { return new AsmExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
-
-        // https://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Machine-Constraints.html#Machine-Constraints
 };
 
@@ -562 +542 @@
 class ImplicitCopyCtorExpr : public Expression {
 public:
+        ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
+        ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other );
+        virtual ~ImplicitCopyCtorExpr();
+
+        ApplicationExpr * get_callExpr() const { return callExpr; }
+        void set_callExpr( ApplicationExpr * newValue ) { callExpr = newValue; }
+
+        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
+        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
+        std::list< Expression * > & get_dtors() { return dtors; }
+
+        virtual ImplicitCopyCtorExpr * clone() const { return new ImplicitCopyCtorExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
         ApplicationExpr * callExpr;
         std::list< ObjectDecl * > tempDecls;
         std::list< ObjectDecl * > returnDecls;
         std::list< Expression * > dtors;
-
-        ImplicitCopyCtorExpr( ApplicationExpr * callExpr );
-        ImplicitCopyCtorExpr( const ImplicitCopyCtorExpr & other );
-        virtual ~ImplicitCopyCtorExpr();
-
-        ApplicationExpr * get_callExpr() const { return callExpr; }
-        void set_callExpr( ApplicationExpr * newValue ) { callExpr = newValue; }
-
-        std::list< ObjectDecl * > & get_tempDecls() { return tempDecls; }
-        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
-        std::list< Expression * > & get_dtors() { return dtors; }
-
-        virtual ImplicitCopyCtorExpr * clone() const { return new ImplicitCopyCtorExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
 };
 
@@ -587 +567 @@
 class ConstructorExpr : public Expression {
 public:
-        Expression * callExpr;
-
         ConstructorExpr( Expression * callExpr );
         ConstructorExpr( const ConstructorExpr & other );
@@ -600 +578 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
+        Expression * callExpr;
 };
 
@@ -605 +585 @@
 class CompoundLiteralExpr : public Expression {
   public:
-        Initializer * initializer;
-
         CompoundLiteralExpr( Type * type, Initializer * initializer );
         CompoundLiteralExpr( const CompoundLiteralExpr & other );
@@ -618 +596 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Initializer * initializer;
 };
 
@@ -623 +603 @@
 class RangeExpr : public Expression {
   public:
-        Expression * low, * high;
-
         RangeExpr( Expression * low, Expression * high );
         RangeExpr( const RangeExpr & other );
@@ -637 +615 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * low, * high;
 };
 
@@ -642 +622 @@
 class UntypedTupleExpr : public Expression {
   public:
-        std::list<Expression*> exprs;
-
         UntypedTupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         UntypedTupleExpr( const UntypedTupleExpr & other );
@@ -654 +632 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        std::list<Expression*> exprs;
 };
 
@@ -659 +639 @@
 class TupleExpr : public Expression {
   public:
-        std::list<Expression*> exprs;
-
         TupleExpr( const std::list< Expression * > & exprs, Expression *_aname = nullptr );
         TupleExpr( const TupleExpr & other );
@@ -671 +649 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        std::list<Expression*> exprs;
 };
 
@@ -676 +656 @@
 class TupleIndexExpr : public Expression {
   public:
-        Expression * tuple;
-        unsigned int index;
-
         TupleIndexExpr( Expression * tuple, unsigned int index );
         TupleIndexExpr( const TupleIndexExpr & other );
@@ -692 +669 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        Expression * tuple;
+        unsigned int index;
 };
 
@@ -697 +677 @@
 class TupleAssignExpr : public Expression {
   public:
-        StmtExpr * stmtExpr = nullptr;
-
         TupleAssignExpr( const std::list< Expression * > & assigns, const std::list< ObjectDecl * > & tempDecls, Expression * _aname = nullptr );
         TupleAssignExpr( const TupleAssignExpr & other );
@@ -710 +688 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+  private:
+        StmtExpr * stmtExpr = nullptr;
 };
 
@@ -715 +695 @@
 class StmtExpr : public Expression {
 public:
+        StmtExpr( CompoundStmt * statements );
+        StmtExpr( const StmtExpr & other );
+        virtual ~StmtExpr();
+
+        CompoundStmt * get_statements() const { return statements; }
+        StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
+
+        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
+        std::list< Expression * > & get_dtors() { return dtors; }
+
+        virtual StmtExpr * clone() const { return new StmtExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
         CompoundStmt * statements;
         std::list< ObjectDecl * > returnDecls; // return variable(s) for stmt expression
         std::list< Expression * > dtors; // destructor(s) for return variable(s)
-
-        StmtExpr( CompoundStmt * statements );
-        StmtExpr( const StmtExpr & other );
-        virtual ~StmtExpr();
-
-        CompoundStmt * get_statements() const { return statements; }
-        StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
-
-        std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
-        std::list< Expression * > & get_dtors() { return dtors; }
-
-        virtual StmtExpr * clone() const { return new StmtExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
 };
 
 class UniqueExpr : public Expression {
 public:
+        UniqueExpr( Expression * expr, long long idVal = -1 );
+        UniqueExpr( const UniqueExpr & other );
+        ~UniqueExpr();
+
+        Expression * get_expr() const { return expr; }
+        UniqueExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
+
+        ObjectDecl * get_object() const { return object; }
+        UniqueExpr * set_object( ObjectDecl * newValue ) { object = newValue; return this; }
+
+        VariableExpr * get_var() const { return var; }
+        UniqueExpr * set_var( VariableExpr * newValue ) { var = newValue; return this; }
+
+        int get_id() const { return id; }
+
+        virtual UniqueExpr * clone() const { return new UniqueExpr( * this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
         Expression * expr;
         ObjectDecl * object;
         VariableExpr * var;
-
-        UniqueExpr( Expression * expr, long long idVal = -1 );
-        UniqueExpr( const UniqueExpr & other );
-        ~UniqueExpr();
-
-        Expression * get_expr() const { return expr; }
-        UniqueExpr * set_expr( Expression * newValue ) { expr = newValue; return this; }
-
-        ObjectDecl * get_object() const { return object; }
-        UniqueExpr * set_object( ObjectDecl * newValue ) { object = newValue; return this; }
-
-        VariableExpr * get_var() const { return var; }
-        UniqueExpr * set_var( VariableExpr * newValue ) { var = newValue; return this; }
-
-        int get_id() const { return id; }
-
-        virtual UniqueExpr * clone() const { return new UniqueExpr( * this ); }
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, int indent = 0 ) const;
-
-private:
         int id;
         static long long count;
@@ -778 +756 @@
 class UntypedInitExpr : public Expression {
 public:
-        Expression * expr;
-        std::list<InitAlternative> initAlts;
-
         UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts );
         UntypedInitExpr( const UntypedInitExpr & other );
@@ -794 +769 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
+        Expression * expr;
+        std::list<InitAlternative> initAlts;
 };
 
 class InitExpr : public Expression {
 public:
-        Expression * expr;
-        Designation * designation;
-
         InitExpr( Expression * expr, Designation * designation );
         InitExpr( const InitExpr & other );
@@ -815 +790 @@
         virtual Expression * acceptMutator( Mutator & m ) { return m.mutate( this ); }
         virtual void print( std::ostream & os, int indent = 0 ) const;
+private:
+        Expression * expr;
+        Designation * designation;
 };
 
 
 std::ostream & operator<<( std::ostream & out, const Expression * expr );
+
+#endif // EXPRESSION_H
 
 // Local Variables: //