Changeset d60780c for src/AST/Expr.hpp

Timestamp:

Jun 13, 2019, 8:28:13 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d76f32c, dc5072f

Parents:

d7a02ae (diff), 21300d7 (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/Expr.hpp (modified) (3 diffs)

src/AST/Expr.hpp ¶

@@ -39 +39 @@
 struct ParamEntry {
         UniqueId decl;
+        ptr<Decl> declptr;
         ptr<Type> actualType;
         ptr<Type> formalType;
         ptr<Expr> expr;
 
-        ParamEntry() : decl( 0 ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
-        ParamEntry( UniqueId id, Type* actual, Type* formal, Expr* e )
-        : decl( id ), actualType( actual ), formalType( formal ), expr( e ) {}
+        ParamEntry() : decl( 0 ), declptr( nullptr ), actualType( nullptr ), formalType( nullptr ), expr( nullptr ) {}
+        ParamEntry( UniqueId id, Decl * declptr, Type* actual, Type* formal, Expr* e )
+        : decl( id ), declptr( declptr ), actualType( actual ), formalType( formal ), expr( e ) {}
 };
 
@@ -137 +138 @@
                 }
 
-                /// splices other InferUnion into this one. Will fail if one union is in `Slots` mode 
+                /// splices other InferUnion into this one. Will fail if one union is in `Slots` mode
                 /// and the other is in `Params`.
                 void splice( InferUnion && o ) {
@@ -145 +146 @@
 
                         if ( mode == Slots ){
-                                data.resnSlots.insert( 
+                                data.resnSlots.insert(
                                         data.resnSlots.end(), o.data.resnSlots.begin(), o.data.resnSlots.end() );
                         } else if ( mode == Params ) {