Changeset d672350 for src/AST

Timestamp:

Mar 21, 2022, 1:44:06 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

a76202d

Parents:

ef3c383 (diff), dbe2533 (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

Location:

src/AST

Files:

• AssertAcyclic.cpp (deleted)
• AssertAcyclic.hpp (deleted)
• Convert.cpp (modified) (2 diffs)
• Decl.cpp (modified) (1 diff)
• Fwd.hpp (modified) (1 diff)
• GenericSubstitution.cpp (modified) (1 diff)
• TranslationUnit.hpp (modified) (2 diffs)
• TypeSubstitution.hpp (modified) (4 diffs)
• Util.cpp (added)
• Util.hpp (added)
• module.mk (modified) (2 diffs)

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 13:19:22 2022
-// Update Count     : 41
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Mar 16 15:01:00 2022
+// Update Count     : 42
 //
 
@@ -49 +49 @@
 //================================================================================================
 namespace ast {
-
-// This is to preserve the FindSpecialDecls hack. It does not (and perhaps should not)
-// allow us to use the same stratagy in the new ast.
-// xxx - since convert back pass works, this concern seems to be unnecessary.
-
-// these need to be accessed in new FixInit now
-ast::ptr<ast::Type> sizeType = nullptr;
-const ast::FunctionDecl * dereferenceOperator = nullptr;
-const ast::StructDecl   * dtorStruct = nullptr;
-const ast::FunctionDecl * dtorStructDestroy = nullptr;
+// These are the shared local information used by ConverterNewToOld and
+// ConverterOldToNew to update the global information in the two versions.
+
+static ast::ptr<ast::Type> sizeType = nullptr;
+static const ast::FunctionDecl * dereferenceOperator = nullptr;
+static const ast::StructDecl   * dtorStruct = nullptr;
+static const ast::FunctionDecl * dtorStructDestroy = nullptr;
 
 }

src/AST/Decl.cpp

@@ -39 +39 @@
         if ( uniqueId ) return;  // ensure only set once
         uniqueId = ++lastUniqueId;
-        idMap[ uniqueId ] = this;
+        // The extra readonly pointer is causing some reference counting issues.
+        // idMap[ uniqueId ] = this;
 }
 
 readonly<Decl> Decl::fromId( UniqueId id ) {
+        // Right now this map is always empty, so don't use it.
+        assert( false );
         IdMapType::const_iterator i = idMap.find( id );
         if ( i != idMap.end() ) return i->second;

src/AST/Fwd.hpp

@@ -141 +141 @@
 
 class TranslationUnit;
-// TODO: Get from the TranslationUnit:
-extern ptr<Type> sizeType;
-extern const FunctionDecl * dereferenceOperator;
-extern const StructDecl   * dtorStruct;
-extern const FunctionDecl * dtorStructDestroy;
+class TranslationGlobal;
 
 }

src/AST/GenericSubstitution.cpp

@@ -45 +45 @@
                         visit_children = false;
                         const AggregateDecl * aggr = ty->aggr();
-                        sub = TypeSubstitution{ aggr->params.begin(), aggr->params.end(), ty->params.begin() };
+                        sub = TypeSubstitution( aggr->params, ty->params );
                 }
 

src/AST/TranslationUnit.hpp

@@ -10 +10 @@
 // Created On       : Tue Jun 11 15:30:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 11 15:42:00 2019
-// Update Count     : 0
+// Last Modified On : Tue Mar 11 11:19:00 2022
+// Update Count     : 1
 //
 
@@ -23 +23 @@
 namespace ast {
 
+class TranslationGlobal {
+public:
+        std::map< UniqueId, Decl * > idMap;
+
+        ptr<Type> sizeType;
+        const FunctionDecl * dereference;
+        const StructDecl * dtorStruct;
+        const FunctionDecl * dtorDestroy;
+};
+
 class TranslationUnit {
 public:
         std::list< ptr< Decl > > decls;
-
-        struct Global {
-                std::map< UniqueId, Decl * > idMap;
-
-                ptr<Type> sizeType;
-                const FunctionDecl * dereference;
-                const StructDecl * dtorStruct;
-                const FunctionDecl * dtorDestroy;
-        } global;
+        TranslationGlobal global;
 };
 

src/AST/TypeSubstitution.hpp

@@ -37 +37 @@
   public:
         TypeSubstitution();
+        template< typename FormalContainer, typename ActualContainer >
+        TypeSubstitution( FormalContainer formals, ActualContainer actuals );
         template< typename FormalIterator, typename ActualIterator >
         TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
@@ -76 +78 @@
         bool empty() const;
 
+        template< typename FormalContainer, typename ActualContainer >
+        void addAll( FormalContainer formals, ActualContainer actuals );
         template< typename FormalIterator, typename ActualIterator >
-        void add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
+        void addAll( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin );
 
         /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
@@ -112 +116 @@
 };
 
+template< typename FormalContainer, typename ActualContainer >
+TypeSubstitution::TypeSubstitution( FormalContainer formals, ActualContainer actuals ) {
+        assert( formals.size() == actuals.size() );
+        addAll( formals.begin(), formals.end(), actuals.begin() );
+}
+
+template< typename FormalIterator, typename ActualIterator >
+TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
+        addAll( formalBegin, formalEnd, actualBegin );
+}
+
+template< typename FormalContainer, typename ActualContainer >
+void TypeSubstitution::addAll( FormalContainer formals, ActualContainer actuals ) {
+        assert( formals.size() == actuals.size() );
+        addAll( formals.begin(), formals.end(), actuals.begin() );
+}
+
 // this is the only place where type parameters outside a function formal may be substituted.
 template< typename FormalIterator, typename ActualIterator >
-void TypeSubstitution::add( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
+void TypeSubstitution::addAll( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
         // FormalIterator points to a TypeDecl
         // ActualIterator points to a Type
@@ -129 +150 @@
                         } // if
                 } else {
-                        
+                        // Is this an error?
                 } // if
         } // for
 }
-
-
-
-template< typename FormalIterator, typename ActualIterator >
-TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
-        add( formalBegin, formalEnd, actualBegin );
-}
-
 
 } // namespace ast

src/AST/module.mk

@@ -16 +16 @@
 
 SRC_AST = \
-        AST/AssertAcyclic.cpp \
-        AST/AssertAcyclic.hpp \
         AST/Attribute.cpp \
         AST/Attribute.hpp \
@@ -64 +62 @@
         AST/TypeSubstitution.cpp \
         AST/TypeSubstitution.hpp \
+        AST/Util.cpp \
+        AST/Util.hpp \
         AST/Visitor.hpp