Changeset 39d8950 for src/AST

Timestamp:

Mar 16, 2022, 4:41:01 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

f7496c5

Parents:

9d8124f

Message:

Thread global information through resolution. Non-top-level calls to the resolver have a bit of a hack but improvements would require changes to the Pass helpers.

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Fwd.hpp (modified) (1 diff)
• TranslationUnit.hpp (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/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/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;
 };