Changeset b8524ca for src/InitTweak/InitTweak.h

Timestamp:

Jun 20, 2019, 6:50:42 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9af00d23

Parents:

234b1cb

Message:

new AST porting

• mostly InitTweak? autogeneration
• added some convenience methods
  • nullptr assignment for ast::ptr
  • convenience wrapper ctors for AddressExpr?, CastExpr? that draw location from first arg

File:

• src/InitTweak/InitTweak.h (modified) (3 diffs)

src/InitTweak/InitTweak.h

@@ -44 +44 @@
         /// transform Initializer into an argument list that can be passed to a call expression
         std::list< Expression * > makeInitList( Initializer * init );
+        std::vector< ast::ptr< ast::Expr > > makeInitList( const ast::Init * init );
 
         /// True if the resolver should try to construct dwt
@@ -101 +102 @@
         bool isConstExpr( Initializer * init );
 
-        class InitExpander {
+        class InitExpander_old {
         public:
                 // expand by stepping through init to get each list of arguments
-                InitExpander( Initializer * init );
+                InitExpander_old( Initializer * init );
 
                 // always expand to expr
-                InitExpander( Expression * expr );
+                InitExpander_old( Expression * expr );
 
                 // iterator-like interface
                 std::list< Expression * > operator*();
-                InitExpander & operator++();
+                InitExpander_old & operator++();
 
                 // builds statement which has the same semantics as a C-style list initializer
@@ -130 +131 @@
                 IndexList indices;
         };
+
+        class InitExpander_new {
+        public:
+                using IndexList = std::vector< ast::ptr< ast::Expr > >;
+                class ExpanderImpl;
+
+        private:
+                std::shared_ptr< ExpanderImpl > expander;
+                std::vector< ast::ptr< ast::Expr > > crnt;
+                // invariant: list of size 2N (elements come in pairs [index, dimension])
+                IndexList indices;
+
+        public:
+                /// Expand by stepping through init to get each list of arguments
+                InitExpander_new( const ast::Init * init );
+
+                /// Always expand to expression
+                InitExpander_new( const ast::Expr * expr );
+
+                std::vector< ast::ptr< ast::Expr > > operator* ();
+                InitExpander_new & 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
+                ast::ptr< ast::Stmt > buildListInit( const ast::UntypedExpr * callExpr );
+
+                void addArrayIndex( const ast::Expr * index, const ast::Expr * dimension );
+
+                void clearArrayIndices();
+
+                bool addReference();
+        };
 } // namespace