Changes in / [b1e68d03:0dc954b]

Location:

src

Files:

• ResolvExpr/AdjustExprType.cc (modified) (2 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/Unify.cc (modified) (3 diffs)
• SymTab/FixFunction.cc (modified) (1 diff)
• SymTab/FixFunction.h (modified) (1 diff)
• SymTab/Validate.cc (modified) (4 diffs)
• SynTree/Type.h (modified) (1 diff)
• tests/.expect/castError.txt (modified) (2 diffs)
• tests/.expect/typedefRedef-ERR1.txt (deleted)
• tests/.expect/typedefRedef.txt (deleted)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)
• tests/typedefRedef.c (deleted)

src/ResolvExpr/AdjustExprType.cc

@@ -28 +28 @@
                 void premutate( BasicType * ) { visit_children = false; }
                 void premutate( PointerType * ) { visit_children = false; }
-                void premutate( ArrayType * ) { visit_children = false; }
                 void premutate( FunctionType * ) { visit_children = false; }
                 void premutate( StructInstType * ) { visit_children = false; }
@@ -60 +59 @@
 
         Type * AdjustExprType::postmutate( ArrayType * arrayType ) {
+                // need to recursively mutate the base type in order for multi-dimensional arrays to work.
                 PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base );
                 arrayType->base = nullptr;

src/ResolvExpr/AlternativeFinder.cc

@@ -180 +180 @@
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
                 }
+                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
+                        if ( adjust ) {
+                                adjustExprType( i->expr->get_result(), i->env, indexer );
+                        }
+                }
                 if ( prune ) {
                         PRINT(
@@ -201 +206 @@
                                 std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
                         )
-                }
-                // adjust types after pruning so that types substituted by pruneAlternatives are correctly adjusted
-                for ( AltList::iterator i = alternatives.begin(); i != alternatives.end(); ++i ) {
-                        if ( adjust ) {
-                                adjustExprType( i->expr->get_result(), i->env, indexer );
-                        }
                 }
 

src/ResolvExpr/Unify.cc

@@ -17 +17 @@
 #include <iterator>               // for back_insert_iterator, back_inserter
 #include <map>                    // for _Rb_tree_const_iterator, _Rb_tree_i...
-#include <memory>                 // for unique_ptr
+#include <memory>                 // for unique_ptr, auto_ptr
 #include <set>                    // for set
 #include <string>                 // for string, operator==, operator!=, bas...
@@ -170 +170 @@
                                 Type *common = 0;
                                 // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
-                                std::unique_ptr< Type > newType( curClass.type->clone() );
+                                std::auto_ptr< Type > newType( curClass.type->clone() );
                                 newType->get_qualifiers() = typeInst->get_qualifiers();
                                 if ( unifyInexact( newType.get(), other, env, needAssertions, haveAssertions, openVars, widenMode & WidenMode( curClass.allowWidening, true ), indexer, common ) ) {
@@ -459 +459 @@
                 if ( otherArray && arrayType->get_isVarLen() == otherArray->get_isVarLen() ) {
 
+                        // not positive this is correct in all cases, but it's needed for typedefs
+                        if ( arrayType->get_isVarLen() || otherArray->get_isVarLen() ) {
+                                return;
+                        }
+
                         if ( ! arrayType->get_isVarLen() && ! otherArray->get_isVarLen() &&
                                 arrayType->get_dimension() != 0 && otherArray->get_dimension() != 0 ) {

src/SymTab/FixFunction.cc

@@ -50 +50 @@
 
         void FixFunction::premutate(FunctionDecl *) { visit_children = false; }
-        void FixFunction::premutate(ArrayType *) { visit_children = false; }
         void FixFunction::premutate(BasicType *) { visit_children = false; }
         void FixFunction::premutate(PointerType *) { visit_children = false; }

src/SymTab/FixFunction.h

@@ -31 +31 @@
                 Type * postmutate(ArrayType * arrayType);
 
-                void premutate(ArrayType * arrayType);
                 void premutate(VoidType * voidType);
                 void premutate(BasicType * basicType);

src/SymTab/Validate.cc

@@ -668 +668 @@
                 }
                 filter( translationUnit, isTypedef, true );
+
         }
 
@@ -675 +676 @@
                 TypedefMap::const_iterator def = typedefNames.find( typeInst->get_name() );
                 if ( def != typedefNames.end() ) {
-                        Type *ret = def->second.first->base->clone();
+                        Type *ret = def->second.first->get_base()->clone();
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // place instance parameters on the typedef'd type
-                        if ( ! typeInst->parameters.empty() ) {
+                        if ( ! typeInst->get_parameters().empty() ) {
                                 ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
                                 if ( ! rtt ) {
-                                        throw SemanticError("Cannot apply type parameters to base type of " + typeInst->name);
+                                        throw SemanticError("cannot apply type parameters to base type of " + typeInst->get_name());
                                 }
                                 rtt->get_parameters().clear();
-                                cloneAll( typeInst->parameters, rtt->parameters );
-                                mutateAll( rtt->parameters, *visitor );  // recursively fix typedefs on parameters
+                                cloneAll( typeInst->get_parameters(), rtt->get_parameters() );
+                                mutateAll( rtt->get_parameters(), *visitor );  // recursively fix typedefs on parameters
                         } // if
                         delete typeInst;
@@ -691 +692 @@
                 } else {
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
-                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->name.c_str() );
+                        assertf( base != typedeclNames.end(), "Cannot find typedecl name %s", typeInst->get_name().c_str() );
                         typeInst->set_baseType( base->second );
                 } // if
                 return typeInst;
-        }
-
-        struct VarLenChecker : WithShortCircuiting {
-                void previsit( FunctionType * ) { visit_children = false; }
-                void previsit( ArrayType * at ) {
-                        isVarLen |= at->isVarLen;
-                }
-                bool isVarLen = false;
-        };
-
-        bool isVariableLength( Type * t ) {
-                PassVisitor<VarLenChecker> varLenChecker;
-                maybeAccept( t, varLenChecker );
-                return varLenChecker.pass.isVarLen;
         }
 
@@ -719 +706 @@
                         Type * t2 = typedefNames[ tyDecl->get_name() ].first->get_base();
                         if ( ! ResolvExpr::typesCompatible( t1, t2, Indexer() ) ) {
-                                throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
-                        }
-                        // cannot redefine VLA typedefs
-                        if ( isVariableLength( t1 ) || isVariableLength( t2 ) ) {
-                                throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
+                                throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
                         }
                 } else {

src/SynTree/Type.h

@@ -298 +298 @@
         void set_isStatic( bool newValue ) { isStatic = newValue; }
 
-        // array types are complete if they have a dimension expression or are
-        // VLAs ('*' in parameter declaration), and incomplete otherwise.
-        // See 6.7.6.2
-        virtual bool isComplete() const override { return dimension || isVarLen; }
+        virtual bool isComplete() const override { return ! isVarLen; }
 
         virtual ArrayType *clone() const override { return new ArrayType( *this ); }

src/tests/.expect/castError.txt

@@ -4 +4 @@
 ... to:
   charAlternatives are:
+Cost ( 1, 0, 0, 0 ): Cast of:
+     Variable Expression: f: function
+       accepting unspecified arguments
+     ... returning nothing 
+
+   ... to:
+     char
+ (types:
+   char
+ )
+ Environment: 
+
 Cost ( 1, 0, 0, 0 ): Cast of:
      Variable Expression: f: signed int
@@ -22 +34 @@
  Environment: 
 
-Cost ( 1, 0, 0, 0 ): Cast of:
-     Variable Expression: f: function
-       accepting unspecified arguments
-     ... returning nothing 
 
-   ... to:
-     char
- (types:
-   char
- )
- Environment: 
-
-

src/tests/Makefile.am

@@ -138 +138 @@
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}

src/tests/Makefile.in

@@ -892 +892 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.