Changes in src/InitTweak/InitTweak.cc [dcd73d1:9b4c936]

File:

• src/InitTweak/InitTweak.cc (modified) (6 diffs)

src/InitTweak/InitTweak.cc

@@ -7 +7 @@
 #include "SynTree/Attribute.h"
 #include "GenPoly/GenPoly.h"
-#include "ResolvExpr/typeops.h"
 
 namespace InitTweak {
@@ -23 +22 @@
                 };
 
-                class InitDepthChecker : public Visitor {
-                public:
-                        bool depthOkay = true;
-                        Type * type;
-                        int curDepth = 0, maxDepth = 0;
-                        InitDepthChecker( Type * type ) : type( type ) {
-                                Type * t = type;
-                                while ( ArrayType * at = dynamic_cast< ArrayType * >( t ) ) {
-                                        maxDepth++;
-                                        t = at->get_base();
-                                }
-                                maxDepth++;
-                        }
-                        virtual void visit( ListInit * listInit ) {
-                                curDepth++;
-                                if ( curDepth > maxDepth ) depthOkay = false;
-                                Visitor::visit( listInit );
-                                curDepth--;
-                        }
-                };
-
                 class InitFlattener : public Visitor {
                         public:
@@ -74 +52 @@
                 maybeAccept( init, finder );
                 return finder.hasDesignations;
-        }
-
-        bool checkInitDepth( ObjectDecl * objDecl ) {
-                InitDepthChecker checker( objDecl->get_type() );
-                maybeAccept( objDecl->get_init(), checker );
-                return checker.depthOkay;
         }
 
@@ -259 +231 @@
                 return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
                         (objDecl->get_init() == NULL ||
-                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
+                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() )) &&
+                        ! isDesignated( objDecl->get_init() )
                         && objDecl->get_storageClass() != DeclarationNode::Extern;
         }
@@ -417 +390 @@
                 virtual void visit( ApplicationExpr *applicationExpr ) { isConstExpr = false; }
                 virtual void visit( UntypedExpr *untypedExpr ) { isConstExpr = false; }
-                virtual void visit( NameExpr *nameExpr ) {
-                        // xxx - temporary hack, because 0 and 1 really should be constexprs, even though they technically aren't in Cforall today
-                        if ( nameExpr->get_name() != "0" && nameExpr->get_name() != "1" ) isConstExpr = false;
-                }
-                // virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
-                virtual void visit( AddressExpr *addressExpr ) {
-                        // address of a variable or member expression is constexpr
-                        Expression * arg = addressExpr->get_arg();
-                        if ( ! dynamic_cast< NameExpr * >( arg) && ! dynamic_cast< VariableExpr * >( arg ) && ! dynamic_cast< MemberExpr * >( arg ) && ! dynamic_cast< UntypedMemberExpr * >( arg ) ) isConstExpr = false;
-                }
+                virtual void visit( NameExpr *nameExpr ) { isConstExpr = false; }
+                virtual void visit( CastExpr *castExpr ) { isConstExpr = false; }
                 virtual void visit( LabelAddressExpr *labAddressExpr ) { isConstExpr = false; }
                 virtual void visit( UntypedMemberExpr *memberExpr ) { isConstExpr = false; }
                 virtual void visit( MemberExpr *memberExpr ) { isConstExpr = false; }
                 virtual void visit( VariableExpr *variableExpr ) { isConstExpr = false; }
+                virtual void visit( ConstantExpr *constantExpr ) { /* bottom out */ }
                 // these might be okay?
                 // virtual void visit( SizeofExpr *sizeofExpr );
@@ -473 +439 @@
         bool isDestructor( const std::string & str ) { return str == "^?{}"; }
         bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); }
-
-        FunctionDecl * isCopyConstructor( Declaration * decl ) {
-                FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
-                if ( ! function ) return 0;
-                if ( ! isConstructor( function->get_name() ) ) return 0;
-                FunctionType * ftype = function->get_functionType();
-                if ( ftype->get_parameters().size() != 2 ) return 0;
-
-                Type * t1 = ftype->get_parameters().front()->get_type();
-                Type * t2 = ftype->get_parameters().back()->get_type();
-                PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
-                assert( ptrType );
-
-                if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
-                        return function;
-                } else {
-                        return 0;
-                }
-        }
 }