Changeset b3a0df6

Timestamp:

Dec 11, 2020, 3:44:02 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

a6e0e4c

Parents:

3e3f236

Message:

attempt to fix sizeType in new ast

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Expr.hpp (modified) (1 diff)
• Fwd.hpp (modified) (1 diff)
• TranslationUnit.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -55 +55 @@
 
 // these need to be accessed in new FixInit now
-ast::Type * sizeType = nullptr;
-ast::FunctionDecl * dereferenceOperator = nullptr;
-ast::StructDecl   * dtorStruct = nullptr;
-ast::FunctionDecl * dtorStructDestroy = nullptr;
+ast::ptr<ast::Type> sizeType = nullptr;
+const ast::FunctionDecl * dereferenceOperator = nullptr;
+const ast::StructDecl   * dtorStruct = nullptr;
+const ast::FunctionDecl * dtorStructDestroy = nullptr;
 
 }
@@ -2804 +2804 @@
         ConverterOldToNew c;
         ast::TranslationUnit unit;
+        if (Validate::SizeType) {
+                // this should be a BasicType.
+                auto old = strict_dynamic_cast<BasicType *>(Validate::SizeType);
+                ast::sizeType = new ast::BasicType{ (ast::BasicType::Kind)(unsigned)old->kind };
+        }
+
         for(auto d : translationUnit) {
                 d->accept( c );

src/AST/Expr.hpp

@@ -112 +112 @@
 
                 bool hasSlots() const { return data.resnSlots; }
+                bool hasParams() const { return data.inferParams; }
 
                 ResnSlots& resnSlots() {

src/AST/Fwd.hpp

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

src/AST/TranslationUnit.hpp

@@ -29 +29 @@
                 std::map< UniqueId, Decl * > idMap;
 
-                Type * sizeType;
-                FunctionDecl * dereference;
-                StructDecl * dtorStruct;
-                FunctionDecl * dtorDestroy;
+                const Type * sizeType;
+                const FunctionDecl * dereference;
+                const StructDecl * dtorStruct;
+                const FunctionDecl * dtorDestroy;
         } global;
 };