Changeset 2bfc6b2 for src/InitTweak/GenInit.cc

Timestamp:

Aug 30, 2018, 1:00:41 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

bcc0946

Parents:

a715b5c

Message:

Refactor FindSpecialDeclarations? and associated special declarations

File:

• src/InitTweak/GenInit.cc (modified) (3 diffs)

src/InitTweak/GenInit.cc

@@ -15 +15 @@
 #include "GenInit.h"
 
-#include <stddef.h>                // for NULL
-#include <algorithm>               // for any_of
-#include <cassert>                 // for assert, strict_dynamic_cast, assertf
-#include <iterator>                // for back_inserter, inserter, back_inse...
-#include <list>                    // for _List_iterator, list
+#include <stddef.h>                    // for NULL
+#include <algorithm>                   // for any_of
+#include <cassert>                     // for assert, strict_dynamic_cast, assertf
+#include <iterator>                    // for back_inserter, inserter, back_inse...
+#include <list>                        // for _List_iterator, list
 
 #include "CodeGen/OperatorTable.h"
-#include "Common/PassVisitor.h"    // for PassVisitor, WithGuards, WithShort...
-#include "Common/SemanticError.h"  // for SemanticError
-#include "Common/UniqueName.h"     // for UniqueName
-#include "Common/utility.h"        // for ValueGuard, maybeClone
-#include "GenPoly/GenPoly.h"       // for getFunctionType, isPolyType
-#include "GenPoly/ScopedSet.h"     // for ScopedSet, ScopedSet<>::const_iter...
-#include "InitTweak.h"             // for isConstExpr, InitExpander, checkIn...
-#include "Parser/LinkageSpec.h"    // for isOverridable, C
+#include "Common/PassVisitor.h"        // for PassVisitor, WithGuards, WithShort...
+#include "Common/SemanticError.h"      // for SemanticError
+#include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for ValueGuard, maybeClone
+#include "GenPoly/GenPoly.h"           // for getFunctionType, isPolyType
+#include "GenPoly/ScopedSet.h"         // for ScopedSet, ScopedSet<>::const_iter...
+#include "InitTweak.h"                 // for isConstExpr, InitExpander, checkIn...
+#include "Parser/LinkageSpec.h"        // for isOverridable, C
 #include "ResolvExpr/Resolver.h"
-#include "SymTab/Autogen.h"        // for genImplicitCall, SizeType
-#include "SymTab/Mangler.h"        // for Mangler
-#include "SynTree/Declaration.h"   // for ObjectDecl, DeclarationWithType
-#include "SynTree/Expression.h"    // for VariableExpr, UntypedExpr, Address...
-#include "SynTree/Initializer.h"   // for ConstructorInit, SingleInit, Initi...
-#include "SynTree/Label.h"         // for Label
-#include "SynTree/Mutator.h"       // for mutateAll
-#include "SynTree/Statement.h"     // for CompoundStmt, ImplicitCtorDtorStmt
-#include "SynTree/Type.h"          // for Type, ArrayType, Type::Qualifiers
-#include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
-#include "Tuples/Tuples.h"         // for maybeImpure
+#include "SymTab/Autogen.h"            // for genImplicitCall
+#include "SymTab/Mangler.h"            // for Mangler
+#include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"        // for VariableExpr, UntypedExpr, Address...
+#include "SynTree/Initializer.h"       // for ConstructorInit, SingleInit, Initi...
+#include "SynTree/Label.h"             // for Label
+#include "SynTree/Mutator.h"           // for mutateAll
+#include "SynTree/Statement.h"         // for CompoundStmt, ImplicitCtorDtorStmt
+#include "SynTree/Type.h"              // for Type, ArrayType, Type::Qualifiers
+#include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"             // for maybeImpure
+#include "Validate/FindSpecialDecls.h" // for SizeType
 
 namespace InitTweak {
@@ -186 +187 @@
 
                         // need to resolve array dimensions in order to accurately determine if constexpr
-                        ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
+                        ResolvExpr::findSingleExpression( arrayType->dimension, Validate::SizeType->clone(), indexer );
                         // array is variable-length when the dimension is not constexpr
                         arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
@@ -192 +193 @@
                         if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
 
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
+                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, Validate::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
                         arrayDimension->get_type()->set_const( true );