Changes in src/InitTweak/InitTweak.h [64071c2:f9cebb5]

File:

• src/InitTweak/InitTweak.h (modified) (1 diff)

src/InitTweak/InitTweak.h

@@ -26 +26 @@
 // helper functions for initialization
 namespace InitTweak {
-  /// transform Initializer into an argument list that can be passed to a call expression
-  std::list< Expression * > makeInitList( Initializer * init );
+        /// transform Initializer into an argument list that can be passed to a call expression
+        std::list< Expression * > makeInitList( Initializer * init );
 
-  /// True if the resolver should try to construct objDecl
-  bool tryConstruct( ObjectDecl * objDecl );
+        /// True if the resolver should try to construct objDecl
+        bool tryConstruct( ObjectDecl * objDecl );
 
-  /// True if the Initializer contains designations
-  bool isDesignated( Initializer * init );
+        /// True if the Initializer contains designations
+        bool isDesignated( Initializer * init );
 
-  /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.
-  /// Intended to be used for default ctor/dtor calls, but might have use elsewhere.
-  /// Currently has assertions that make it less than fully general.
-  bool isInstrinsicSingleArgCallStmt( Statement * expr );
+  /// Non-Null if expr is a call expression whose target function is intrinsic
+  ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
 
-  /// get the Ctor/Dtor call expression from a Statement that looks like a generated ctor/dtor call
-  Expression * getCtorDtorCall( Statement * stmt );
+        /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.
+        /// Intended to be used for default ctor/dtor calls, but might have use elsewhere.
+        /// Currently has assertions that make it less than fully general.
+        bool isIntrinsicSingleArgCallStmt( Statement * expr );
 
-  /// returns the name of the function being called
-  std::string getFunctionName( Expression * expr );
+        /// get all Ctor/Dtor call expressions from a Statement
+        void collectCtorDtorCalls( Statement * stmt, std::list< Expression * > & matches );
 
-  /// returns the argument to a call expression in position N indexed from 0
-  Expression *& getCallArg( Expression * callExpr, unsigned int pos );
+        /// get the Ctor/Dtor call expression from a Statement that looks like a generated ctor/dtor call
+        Expression * getCtorDtorCall( Statement * stmt );
 
-  /// returns the base type of a PointerType or ArrayType, else returns NULL
-  Type * getPointerBase( Type * );
+        /// returns the name of the function being called
+        std::string getFunctionName( Expression * expr );
 
-  /// returns the argument if it is a PointerType or ArrayType, else returns NULL
-  Type * isPointerType( Type * );
+        /// returns the argument to a call expression in position N indexed from 0
+        Expression *& getCallArg( Expression * callExpr, unsigned int pos );
+
+        /// returns the base type of a PointerType or ArrayType, else returns NULL
+        Type * getPointerBase( Type * );
+
+        /// returns the argument if it is a PointerType or ArrayType, else returns NULL
+        Type * isPointerType( Type * );
+
+        /// returns true if expr is trivially a compile-time constant
+        bool isConstExpr( Expression * expr );
+        bool isConstExpr( Initializer * init );
+
+        class InitExpander {
+        public:
+                // expand by stepping through init to get each list of arguments
+                InitExpander( Initializer * init );
+
+                // always expand to expr
+                InitExpander( Expression * expr );
+
+                // iterator-like interface
+                std::list< Expression * > operator*();
+                InitExpander & operator++();
+
+                // builds statement which has the same semantics as a C-style list initializer
+                // (for array initializers) using callExpr as the base expression to perform initialization
+                Statement * buildListInit( UntypedExpr * callExpr );
+                void addArrayIndex( Expression * index, Expression * dimension );
+                void clearArrayIndices();
+
+                class ExpanderImpl;
+        private:
+                std::shared_ptr< ExpanderImpl > expander;
+                std::list< Expression * > cur;
+
+                // invariant: list of size 2N (elements come in pairs [index, dimension])
+                typedef std::list< Expression * > IndexList;
+                IndexList indices;
+        };
 } // namespace