Changeset 5f95b5f for src/ResolvExpr

Timestamp:

Feb 6, 2018, 10:29:52 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

69ce455

Parents:

7323573 (diff), 6bfe5cc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AdjustExprType.cc (modified) (3 diffs)
• Resolver.cc (modified) (1 diff)
• typeops.h (modified) (1 diff)

src/ResolvExpr/AdjustExprType.cc

@@ -24 +24 @@
         class AdjustExprType : public WithShortCircuiting {
           public:
-                AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                AdjustExprType( const TypeEnvironment & env, const SymTab::Indexer & indexer );
                 void premutate( VoidType * ) { visit_children = false; }
                 void premutate( BasicType * ) { visit_children = false; }
@@ -45 +45 @@
 
           private:
-                const TypeEnvironment &env;
-                const SymTab::Indexer &indexer;
+                const TypeEnvironment & env;
+                const SymTab::Indexer & indexer;
         };
 
@@ -53 +53 @@
                 Type *newType = type->acceptMutator( adjuster );
                 type = newType;
+        }
+
+        void adjustExprType( Type *& type ) {
+                TypeEnvironment env;
+                SymTab::Indexer indexer;
+                adjustExprType( type, env, indexer );
         }
 

src/ResolvExpr/Resolver.cc

@@ -280 +280 @@
                         std::list< Statement * > newStmts;
                         resolveWithExprs( functionDecl->withExprs, newStmts );
-                        functionDecl->statements->kids.splice( functionDecl->statements->kids.begin(), newStmts );
+                        if ( functionDecl->statements ) {
+                                functionDecl->statements->kids.splice( functionDecl->statements->kids.begin(), newStmts );
+                        } else {
+                                assertf( functionDecl->withExprs.empty() && newStmts.empty(), "Function %s without a body has with-clause and/or generated with declarations.", functionDecl->name.c_str() );
+                        }
                 }
         }

src/ResolvExpr/typeops.h

@@ -55 +55 @@
         /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function
         void adjustExprType( Type *&type, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+
+        /// Replaces array types with the equivalent pointer, and function types with a pointer-to-function using empty TypeEnvironment and Indexer
+        void adjustExprType( Type *& type );
 
         template< typename ForwardIterator >