Changes in / [a6e0e4c:4422579]

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::ptr<ast::Type> sizeType = nullptr;
-const ast::FunctionDecl * dereferenceOperator = nullptr;
-const ast::StructDecl   * dtorStruct = nullptr;
-const ast::FunctionDecl * dtorStructDestroy = nullptr;
+ast::Type * sizeType = nullptr;
+ast::FunctionDecl * dereferenceOperator = nullptr;
+ast::StructDecl   * dtorStruct = nullptr;
+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 ptr<Type> sizeType;
-extern const FunctionDecl * dereferenceOperator;
-extern const StructDecl   * dtorStruct;
-extern const FunctionDecl * dtorStructDestroy;
+extern Type * sizeType;
+extern FunctionDecl * dereferenceOperator;
+extern StructDecl   * dtorStruct;
+extern FunctionDecl * dtorStructDestroy;
 
 }

src/AST/TranslationUnit.hpp

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