Changeset 40e636a for src/ResolvExpr

Timestamp:

Jul 21, 2016, 11:19:24 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b81adcc4

Parents:

5f98ce5

Message:

only generate array dimension constant inside of functions, recursively mutate array types into pointer types in function parameter lists, fix bug where global compound literal object is lost

File:

• src/ResolvExpr/Resolver.cc (modified) (3 diffs)

src/ResolvExpr/Resolver.cc

@@ -42 +42 @@
 
                 virtual void visit( ArrayType * at );
+                virtual void visit( PointerType * at );
 
                 virtual void visit( ExprStmt *exprStmt );
@@ -60 +61 @@
           private:
         typedef std::list< Initializer * >::iterator InitIterator;
+
+                template< typename PtrType >
+                void handlePtrType( PtrType * type );
 
           void resolveAggrInit( AggregateDecl *, InitIterator &, InitIterator & );
@@ -193 +197 @@
         }
 
+        template< typename PtrType >
+        void Resolver::handlePtrType( PtrType * type ) {
+                if ( type->get_dimension() ) {
+                        CastExpr *castExpr = new CastExpr( type->get_dimension(), SymTab::SizeType->clone() );
+                        Expression *newExpr = findSingleExpression( castExpr, *this );
+                        delete type->get_dimension();
+                        type->set_dimension( newExpr );
+                }
+        }
+
         void Resolver::visit( ArrayType * at ) {
-                if ( at->get_dimension() ) {
-                        CastExpr *castExpr = new CastExpr( at->get_dimension(), SymTab::SizeType->clone() );
-                        Expression *newExpr = findSingleExpression( castExpr, *this );
-                        delete at->get_dimension();
-                        at->set_dimension( newExpr );
-                }
+                handlePtrType( at );
                 Visitor::visit( at );
+        }
+
+        void Resolver::visit( PointerType * pt ) {
+                handlePtrType( pt );
+                Visitor::visit( pt );
         }