Changeset d60ccbf for src/SymTab

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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' into designate

Conflicts:

src/CodeGen/CodeGenerator.h

Location:

src/SymTab

Files:

• FixFunction.h (modified) (1 diff)
• Indexer.cc (modified) (4 diffs)
• Indexer.h (modified) (2 diffs)
• TypeEquality.cc (modified) (2 diffs)
• Validate.cc (modified) (14 diffs)
• Validate.h (modified) (1 diff)

src/SymTab/FixFunction.h

@@ -20 +20 @@
 
 namespace SymTab {
+        /// Replaces function and array types by equivalent pointer types.
         class FixFunction : public Mutator {
                 typedef Mutator Parent;

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  5 08:05:17 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 05 13:52:42 2015
+// Update Count     : 10
 //
 
@@ -26 +26 @@
 
 namespace SymTab {
+        template< typename Container, typename VisitorType >
+        inline void acceptAllNewScope( Container &container, VisitorType &visitor ) {
+                visitor.enterScope();
+                acceptAll( container, visitor );
+                visitor.leaveScope();
+        }
+
         Indexer::Indexer( bool useDebug ) : doDebug( useDebug ) {}
 
@@ -31 +38 @@
 
         void Indexer::visit( ObjectDecl *objectDecl ) {
+                enterScope();
                 maybeAccept( objectDecl->get_type(), *this );
+                leaveScope();
                 maybeAccept( objectDecl->get_init(), *this );
                 maybeAccept( objectDecl->get_bitfieldWidth(), *this );
@@ -149 +158 @@
                 leaveScope();
         }
+
+
+        void Indexer::visit( ApplicationExpr *applicationExpr ) {
+                acceptAllNewScope( applicationExpr->get_results(), *this );
+                maybeAccept( applicationExpr->get_function(), *this );
+                acceptAll( applicationExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( UntypedExpr *untypedExpr ) {
+                acceptAllNewScope( untypedExpr->get_results(), *this );
+                acceptAll( untypedExpr->get_args(), *this );
+        }
+
+        void Indexer::visit( NameExpr *nameExpr ) {
+                acceptAllNewScope( nameExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( AddressExpr *addressExpr ) {
+                acceptAllNewScope( addressExpr->get_results(), *this );
+                maybeAccept( addressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( LabelAddressExpr *labAddressExpr ) {
+                acceptAllNewScope( labAddressExpr->get_results(), *this );
+                maybeAccept( labAddressExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( CastExpr *castExpr ) {
+                acceptAllNewScope( castExpr->get_results(), *this );
+                maybeAccept( castExpr->get_arg(), *this );
+        }
+
+        void Indexer::visit( UntypedMemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( MemberExpr *memberExpr ) {
+                acceptAllNewScope( memberExpr->get_results(), *this );
+                maybeAccept( memberExpr->get_aggregate(), *this );
+        }
+
+        void Indexer::visit( VariableExpr *variableExpr ) {
+                acceptAllNewScope( variableExpr->get_results(), *this );
+        }
+
+        void Indexer::visit( ConstantExpr *constantExpr ) {
+                acceptAllNewScope( constantExpr->get_results(), *this );
+                maybeAccept( constantExpr->get_constant(), *this );
+        }
+
+        void Indexer::visit( SizeofExpr *sizeofExpr ) {
+                acceptAllNewScope( sizeofExpr->get_results(), *this );
+                if ( sizeofExpr->get_isType() ) {
+                        maybeAccept( sizeofExpr->get_type(), *this );
+                } else {
+                        maybeAccept( sizeofExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( AttrExpr *attrExpr ) {
+                acceptAllNewScope( attrExpr->get_results(), *this );
+                if ( attrExpr->get_isType() ) {
+                        maybeAccept( attrExpr->get_type(), *this );
+                } else {
+                        maybeAccept( attrExpr->get_expr(), *this );
+                }
+        }
+
+        void Indexer::visit( LogicalExpr *logicalExpr ) {
+                acceptAllNewScope( logicalExpr->get_results(), *this );
+                maybeAccept( logicalExpr->get_arg1(), *this );
+                maybeAccept( logicalExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( ConditionalExpr *conditionalExpr ) {
+                acceptAllNewScope( conditionalExpr->get_results(), *this );
+                maybeAccept( conditionalExpr->get_arg1(), *this );
+                maybeAccept( conditionalExpr->get_arg2(), *this );
+                maybeAccept( conditionalExpr->get_arg3(), *this );
+        }
+
+        void Indexer::visit( CommaExpr *commaExpr ) {
+                acceptAllNewScope( commaExpr->get_results(), *this );
+                maybeAccept( commaExpr->get_arg1(), *this );
+                maybeAccept( commaExpr->get_arg2(), *this );
+        }
+
+        void Indexer::visit( TupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( SolvedTupleExpr *tupleExpr ) {
+                acceptAllNewScope( tupleExpr->get_results(), *this );
+                acceptAll( tupleExpr->get_exprs(), *this );
+        }
+
+        void Indexer::visit( TypeExpr *typeExpr ) {
+                acceptAllNewScope( typeExpr->get_results(), *this );
+                maybeAccept( typeExpr->get_type(), *this );
+        }
+
+        void Indexer::visit( AsmExpr *asmExpr ) {
+                maybeAccept( asmExpr->get_inout(), *this );
+                maybeAccept( asmExpr->get_constraint(), *this );
+                maybeAccept( asmExpr->get_operand(), *this );
+        }
+
+        void Indexer::visit( UntypedValofExpr *valofExpr ) {
+                acceptAllNewScope( valofExpr->get_results(), *this );
+                maybeAccept( valofExpr->get_body(), *this );
+        }
+
 
         void Indexer::visit( ContextInstType *contextInst ) {

src/SymTab/Indexer.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:38:55 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:51:21 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 05 13:51:39 2015
+// Update Count     : 4
 //
 
@@ -43 +43 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+
+                virtual void visit( ApplicationExpr *applicationExpr );
+                virtual void visit( UntypedExpr *untypedExpr );
+                virtual void visit( NameExpr *nameExpr );
+                virtual void visit( CastExpr *castExpr );
+                virtual void visit( AddressExpr *addressExpr );
+                virtual void visit( LabelAddressExpr *labAddressExpr );
+                virtual void visit( UntypedMemberExpr *memberExpr );
+                virtual void visit( MemberExpr *memberExpr );
+                virtual void visit( VariableExpr *variableExpr );
+                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( SizeofExpr *sizeofExpr );
+                virtual void visit( AttrExpr *attrExpr );
+                virtual void visit( LogicalExpr *logicalExpr );
+                virtual void visit( ConditionalExpr *conditionalExpr );
+                virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( SolvedTupleExpr *tupleExpr );
+                virtual void visit( TypeExpr *typeExpr );
+                virtual void visit( AsmExpr *asmExpr );
+                virtual void visit( UntypedValofExpr *valofExpr );
 
                 virtual void visit( ContextInstType *contextInst );

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 09 11:18:46 2015
-// Update Count     : 36
+// Last Modified On : Mon Jul 20 14:16:11 2015
+// Update Count     : 37
 //
 
@@ -91 +91 @@
                         // and must both have a dimension expression or not have a dimension
                         result = result && arrayType->get_isVarLen() == at->get_isVarLen()
-                                && (arrayType->get_dimension() != 0 && at->get_dimension() != 0
-                                        || arrayType->get_dimension() == 0 && at->get_dimension() == 0);
+                                && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0)
+                                        || (arrayType->get_dimension() == 0 && at->get_dimension() == 0));
 
                         if ( vlaErr ) {

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:27:54 2015
-// Update Count     : 186
+// Last Modified On : Wed Aug 05 14:00:24 2015
+// Update Count     : 195
 //
 
@@ -60 +60 @@
         class HoistStruct : public Visitor {
           public:
+                /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
   
@@ -84 +85 @@
         };
 
+        /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers
         class Pass1 : public Visitor {
                 typedef Visitor Parent;
@@ -89 +91 @@
                 virtual void visit( FunctionType *func );
         };
-  
+
+        /// Associates forward declarations of aggregates with their definitions
         class Pass2 : public Indexer {
                 typedef Indexer Parent;
@@ -110 +113 @@
         };
 
+        /// Replaces array and function types in forall lists by appropriate pointer type
         class Pass3 : public Indexer {
                 typedef Indexer Parent;
@@ -123 +127 @@
         class AddStructAssignment : public Visitor {
           public:
+                /// Generates assignment operators for aggregate types as required
                 static void addStructAssignment( std::list< Declaration * > &translationUnit );
 
@@ -158 +163 @@
           public:
           EliminateTypedef() : scopeLevel( 0 ) {}
+            /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -163 +169 @@
                 virtual TypeDecl *mutate( TypeDecl *typeDecl );
                 virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual ObjectDecl *mutate( ObjectDecl *objDecl );
+                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
                 virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
                 virtual Type *mutate( TypeInstType *aggregateUseType );
@@ -399 +405 @@
                         } // for
                 } // for
+
+                if ( ctx->get_parameters().size() != contextInst->get_parameters().size() ) {
+                        throw SemanticError( "incorrect number of context parameters: ", contextInst );
+                } // if
+
                 applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), ctx->get_members().begin(), ctx->get_members().end(), back_inserter( contextInst->get_members() ) );
         }
@@ -444 +455 @@
         }
 
+        /// Fix up assertions
         void forallFixer( Type *func ) {
-                // Fix up assertions
                 for ( std::list< TypeDecl * >::iterator type = func->get_forall().begin(); type != func->get_forall().end(); ++type ) {
                         std::list< DeclarationWithType * > toBeDone, nextRound;
@@ -532 +543 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-
+  
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -610 +621 @@
                         delete assigns.front();
                         assigns.pop_front();
-                }
+                } // for
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -817 +828 @@
                         Type *ret = def->second.first->get_base()->clone();
                         ret->get_qualifiers() += typeInst->get_qualifiers();
+                        // place instance parameters on the typedef'd type
+                        if ( ! typeInst->get_parameters().empty() ) {
+                                ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
+                                if ( ! rtt ) {
+                                        throw SemanticError("cannot apply type parameters to base type of " + typeInst->get_name());
+                                }
+                                rtt->get_parameters().clear();
+                                cloneAll(typeInst->get_parameters(), rtt->get_parameters());
+                        } // if
                         delete typeInst;
                         return ret;
@@ -870 +890 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                ObjectDecl *ret = Mutator::mutate( objDecl );
+                DeclarationWithType *ret = Mutator::mutate( objDecl );
                 typedefNames = oldNames;
+                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
+                        return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
+                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
+                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
+                } // if
                 return ret;
         }

src/SymTab/Validate.h

@@ -23 +23 @@
         class Indexer;
 
+        /// Normalizes struct and function declarations
         void validate( std::list< Declaration * > &translationUnit, bool doDebug = false );
         void validateType( Type *type, const Indexer *indexer );