Changes in / [37466ba0:c469f43]

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/PointerType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -233 +233 @@
                                 } else {
                                         // normalize possibly dtype-static parameter type
-                                        out.push_back( new TypeExpr{
+                                        out.push_back( new TypeExpr{ 
                                                 ScrubTyVars::scrubAll( paramType->get_type()->clone() ) } );
                                         gt |= genericType::concrete;
@@ -369 +369 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
-                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         StructInstType *newInst = new StructInstType( inst->get_qualifiers(), concDecl->get_name() );
@@ -424 +423 @@
                                 DeclMutator::addDeclaration( concDecl );
                                 insert( inst, typeSubs, concDecl );
-                                concDecl->acceptMutator( *this ); // recursively instantiate members
                         }
                         UnionInstType *newInst = new UnionInstType( inst->get_qualifiers(), concDecl->get_name() );

src/SymTab/Validate.cc

@@ -240 +240 @@
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
                 acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
-                acceptAll( translationUnit, epc ); // must happen before VerifyCtorDtorAssign, because void return objects should not exist
-                VerifyCtorDtorAssign::verify( translationUnit );  // must happen before autogen, because autogen examines existing ctor/dtors
                 Concurrency::applyKeywords( translationUnit );
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
                 Concurrency::implementMutexFuncs( translationUnit );
                 Concurrency::implementThreadStarter( translationUnit );
+                acceptAll( translationUnit, epc );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
                 acceptAll( translationUnit, pass3 );
+                VerifyCtorDtorAssign::verify( translationUnit );
                 ArrayLength::computeLength( translationUnit );
         }
@@ -817 +817 @@
                                 throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl );
                         }
-                        PointerType * ptrType = dynamic_cast< PointerType * >( params.front()->get_type() );
-                        if ( ! ptrType || ptrType->is_array() ) {
+                        if ( ! dynamic_cast< PointerType * >( params.front()->get_type() ) ) {
                                 throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a pointer ", funcDecl );
                         }

src/SynTree/PointerType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// PointerType.cc --
+// PointerType.cc -- 
 //
 // Author           : Richard C. Bilson
@@ -38 +38 @@
 void PointerType::print( std::ostream &os, int indent ) const {
         Type::print( os, indent );
-        if ( ! is_array() ) {
-                os << "pointer to ";
-        } else {
-                os << "decayed ";
-                if ( isStatic ) {
-                        os << "static ";
-                } // if
-                if ( isVarLen ) {
-                        os << "variable length array of ";
-                } else if ( dimension ) {
-                        os << "array of ";
-                        dimension->print( os, indent );
-                        os << " ";
-                } // if
-        }
+        os << "pointer to ";
+        if ( isStatic ) {
+                os << "static ";
+        } // if
+        if ( isVarLen ) {
+                os << "variable length array of ";
+        } else if ( dimension ) {
+                os << "array of ";
+                dimension->print( os, indent );
+        } // if
         if ( base ) {
                 base->print( os, indent );

src/SynTree/Type.h

@@ -247 +247 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
-        bool is_array() const { return isStatic || isVarLen || dimension; }
-
         virtual PointerType *clone() const { return new PointerType( *this ); }
         virtual void accept( Visitor & v ) { v.visit( this ); }