Changeset aaeacf4 for src/AST

Timestamp:

Jun 12, 2019, 4:06:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

21300d7

Parents:

6e3e0717

Message:

Removed global look-up table from UniqueId to Decl

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Expr.hpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -579 +579 @@
                                 tgtInferParams[srcParam.first] = ParamEntry(
                                         srcParam.second.decl,
+                                        get<Declaration>().accept1(srcParam.second.declptr),
                                         get<Type>().accept1(srcParam.second.actualType),
                                         get<Type>().accept1(srcParam.second.formalType),
@@ -2004 +2005 @@
                                 tgt[old.first] = ast::ParamEntry(
                                         old.second.decl,
+                                        getAccept1<ast::Decl>(old.second.declptr),
                                         getAccept1<ast::Type>(old.second.actualType),
                                         getAccept1<ast::Type>(old.second.formalType),

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 ) {