Changes in src/SynTree/Expression.h [df626eb:d29fa5f]

File:

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

src/SynTree/Expression.h

@@ -31 +31 @@
 
 
+/// Expression is the root type for all expressions
+class Expression : public BaseSyntaxNode{
+  public:
+        Type * result;
+        TypeSubstitution * env;
+        bool extension = false;
+
+        Expression();
+        Expression( const Expression & other );
+        virtual ~Expression();
+
+        Type *& get_result() { return result; }
+        const Type * get_result() const { return result; }
+        void set_result( Type * newValue ) { result = newValue; }
+
+        TypeSubstitution * get_env() const { return env; }
+        void set_env( TypeSubstitution * newValue ) { env = newValue; }
+        bool get_extension() const { return extension; }
+        Expression * set_extension( bool exten ) { extension = exten; return this; }
+
+        virtual Expression * clone() const override = 0;
+        virtual void accept( Visitor & v ) override = 0;
+        virtual Expression * acceptMutator( Mutator & m ) override = 0;
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 struct ParamEntry;
 
@@ -47 +73 @@
         Type * actualType;
         Type * formalType;
-        Expression * expr;
+        Expression* expr;
         std::unique_ptr< InferredParams > inferParams;
-};
-
-/// Expression is the root type for all expressions
-class Expression : public BaseSyntaxNode {
-  public:
-        Type * result;
-        TypeSubstitution * env;
-        bool extension = false;
-        InferredParams inferParams;
-
-        Expression();
-        Expression( const Expression & other );
-        virtual ~Expression();
-
-        Type *& get_result() { return result; }
-        const Type * get_result() const { return result; }
-        void set_result( Type * newValue ) { result = newValue; }
-
-        TypeSubstitution * get_env() const { return env; }
-        void set_env( TypeSubstitution * newValue ) { env = newValue; }
-        bool get_extension() const { return extension; }
-        Expression * set_extension( bool exten ) { extension = exten; return this; }
-
-        InferredParams & get_inferParams() { return inferParams; }
-
-        virtual Expression * clone() const override = 0;
-        virtual void accept( Visitor & v ) override = 0;
-        virtual Expression * acceptMutator( Mutator & m ) override = 0;
-        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
 };
 
@@ -86 +83 @@
         Expression * function;
         std::list<Expression *> args;
+        InferredParams inferParams;
 
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
@@ -94 +92 @@
         void set_function( Expression * newValue ) { function = newValue; }
         std::list<Expression *>& get_args() { return args; }
+        InferredParams & get_inferParams() { return inferParams; }
 
         virtual ApplicationExpr * clone() const { return new ApplicationExpr( * this ); }