Changeset 2a54479 for src/AST/Convert.cpp

Timestamp:

Jun 6, 2019, 10:55:00 AM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

546e712

Parents:

dd857bb

Message:

Convert persevers Validate::SizeType?. Removed the inCache checks I'm sure are duplicates.

File:

• src/AST/Convert.cpp (modified) (10 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 29 17:05:00 2019
-// Update Count     : 9
+// Last Modified On : Thu May 06 19:51:00 2019
+// Update Count     : 10
 //
 
@@ -49 +49 @@
 // 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.
+ast::Type * sizeType = nullptr;
 ast::FunctionDecl * dereferenceOperator = nullptr;
 ast::StructDecl   * dtorStruct = nullptr;
@@ -709 +710 @@
                 auto expr = visitBaseExpr( node,
                         new MemberExpr(
-                                inCache(node->member) ?
-                                        dynamic_cast<DeclarationWithType *>(this->node) :
-                                        get<DeclarationWithType>().accept1(node->member),
+                                get<DeclarationWithType>().accept1(node->member),
                                 get<Expression>().accept1(node->aggregate)
                         )
@@ -722 +721 @@
                 auto expr = visitBaseExpr( node,
                         new VariableExpr(
-                                inCache(node->var) ?
-                                        dynamic_cast<DeclarationWithType *>(this->node) :
-                                        get<DeclarationWithType>().accept1(node->var)
+                                get<DeclarationWithType>().accept1(node->var)
                         )
                 );
@@ -819 +816 @@
                         new OffsetofExpr(
                                 get<Type>().accept1(node->type),
-                                inCache(node->member) ?
-                                        dynamic_cast<DeclarationWithType *>(this->node) :
-                                        get<DeclarationWithType>().accept1(node->member)
+                                get<DeclarationWithType>().accept1(node->member)
                         )
                 );
@@ -1082 +1077 @@
 
         const ast::Type * visit( const ast::BasicType * node ) override final {
-                this->node = new BasicType{ cv( node ), (BasicType::Kind)(unsigned)node->kind };
+                auto type = new BasicType{ cv( node ), (BasicType::Kind)(unsigned)node->kind };
+                // I believe this should always be a BasicType.
+                if ( sizeType == node ) {
+                        Validate::SizeType = type;
+                }
+                this->node = type;
                 return nullptr;
         }
@@ -2092 +2092 @@
                         new ast::MemberExpr(
                                 old->location,
-                                inCache(old->member) ?
-                                        dynamic_cast<ast::DeclWithType *>(this->node) :
-                                        GET_ACCEPT_1(member, DeclWithType),
+                                GET_ACCEPT_1(member, DeclWithType),
                                 GET_ACCEPT_1(aggregate, Expr)
                         )
@@ -2104 +2102 @@
                         new ast::VariableExpr(
                                 old->location,
-                                inCache(old->var) ?
-                                        dynamic_cast<ast::DeclWithType *>(this->node) :
-                                        GET_ACCEPT_1(var, DeclWithType)
+                                GET_ACCEPT_1(var, DeclWithType)
                         )
                 );
@@ -2234 +2230 @@
                                 old->location,
                                 GET_ACCEPT_1(type, Type),
-                                inCache(old->member) ?
-                                        dynamic_cast<ast::DeclWithType *>(this->node) :
-                                        GET_ACCEPT_1(member, DeclWithType)
+                                GET_ACCEPT_1(member, DeclWithType)
                         )
                 );
@@ -2472 +2466 @@
 
         virtual void visit( BasicType * old ) override final {
-                this->node = new ast::BasicType{ (ast::BasicType::Kind)(unsigned)old->kind, cv( old ) };
+                auto type = new ast::BasicType{ (ast::BasicType::Kind)(unsigned)old->kind, cv( old ) };
+                // I believe this should always be a BasicType.
+                if ( Validate::SizeType == old ) {
+                        sizeType = type;
+                }
+                this->node = type;
         }