Changeset df626eb for src

Timestamp:

Oct 24, 2017, 1:09:33 PM (7 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:

b45d4b2

Parents:

85d340d

git-author:

Rob Schluntz <rschlunt@…> (10/24/17 13:08:34)

git-committer:

Rob Schluntz <rschlunt@…> (10/24/17 13:09:33)

Message:

Move inferred parameters to Exception base class

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SynTree/ApplicationExpr.cc (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -632 +632 @@
                                         std::cerr << std::endl;
                                 )
-                                ApplicationExpr *appExpr = static_cast< ApplicationExpr* >( newerAlt.expr );
                                 // follow the current assertion's ID chain to find the correct set of inferred parameters to add the candidate to (i.e. the set of inferred parameters belonging to the entity which requested the assertion parameter).
-                                InferredParams * inferParameters = &appExpr->get_inferParams();
+                                InferredParams * inferParameters = &newerAlt.expr->get_inferParams();
                                 for ( UniqueId id : cur->second.idChain ) {
                                         inferParameters = (*inferParameters)[ id ].inferParams.get();

src/SynTree/ApplicationExpr.cc

@@ -59 +59 @@
 
 ApplicationExpr::ApplicationExpr( const ApplicationExpr &other ) :
-                Expression( other ), function( maybeClone( other.function ) ), inferParams( other.inferParams ) {
+                Expression( other ), function( maybeClone( other.function ) ) {
         cloneAll( other.args, args );
 }

src/SynTree/Expression.cc

@@ -35 +35 @@
 Expression::Expression() : result( 0 ), env( 0 ) {}
 
-Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ) {
+Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ) {
 }
 

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;
 
@@ -73 +47 @@
         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;
 };
 
@@ -83 +86 @@
         Expression * function;
         std::list<Expression *> args;
-        InferredParams inferParams;
 
         ApplicationExpr( Expression * function, const std::list<Expression *> & args = std::list< Expression * >() );
@@ -92 +94 @@
         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 ); }