Changes in src/InitTweak/GenInit.cc [23c4aa8:a7c90d4]

File:

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

src/InitTweak/GenInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:57:53 2017
-// Update Count     : 167
+// Last Modified On : Tue Mar  7 07:51:38 2017
+// Update Count     : 179
 //
 
@@ -120 +120 @@
                 void hoist( Type * type );
 
-                DeclarationNode::StorageClass storageclass = DeclarationNode::NoStorageClass;
+                DeclarationNode::StorageClasses storageClasses;
                 bool inFunction = false;
         };
@@ -174 +174 @@
 
         DeclarationWithType * HoistArrayDimension::mutate( ObjectDecl * objectDecl ) {
-                storageclass = objectDecl->get_storageClass();
+                storageClasses = objectDecl->get_storageClasses();
                 DeclarationWithType * temp = Parent::mutate( objectDecl );
                 hoist( objectDecl->get_type() );
-                storageclass = DeclarationNode::NoStorageClass;
                 return temp;
         }
@@ -185 +184 @@
                 static UniqueName dimensionName( "_array_dim" );
 
-                // C doesn't allow variable sized arrays at global scope or for static variables,
-                // so don't hoist dimension.
+                // C doesn't allow variable sized arrays at global scope or for static variables, so don't hoist dimension.
                 if ( ! inFunction ) return;
-                if ( storageclass == DeclarationNode::Static ) return;
+                if ( storageClasses[ DeclarationNode::StaticClass] ) return;
 
                 if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
 
-                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential
-                        // for side effects.
+                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential for side effects.
                         if ( isConstExpr( arrayType->get_dimension() ) ) return;
 
-                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageclass, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
+                        ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
                         arrayDimension->get_type()->set_isConst( true );