Changeset 46f6134

Timestamp:

Aug 29, 2016, 12:20:45 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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, with_gc

Children:

ad4581b, b542bfb

Parents:

5e644d3e

Message:

Implemented owning scoped map for typedef elimination phase

Location:

src

Files:

• GenPoly/ScopedMap.h (modified) (8 diffs)
• SymTab/Validate.cc (modified) (8 diffs)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/NamedTypeDecl.cc (modified) (4 diffs)
• main.cc (modified) (4 diffs)

src/GenPoly/ScopedMap.h

@@ -42 +42 @@
                 typedef typename Scope::pointer pointer;
                 typedef typename Scope::const_pointer const_pointer;
-                
+
                 class iterator : public std::iterator< std::bidirectional_iterator_tag,
                                                        value_type > {
@@ -68 +68 @@
                         }
 
-                        iterator(scope_list const &_scopes, const wrapped_iterator &_it, size_type _i)
+                        iterator(scope_list &_scopes, const wrapped_iterator &_it, size_type _i)
                                 : scopes(&_scopes), it(_it), i(_i) {}
                 public:
@@ -76 +76 @@
                                 return *this;
                         }
-                        
+
                         reference operator* () { return *it; }
                         pointer operator-> () { return it.operator->(); }
@@ -109 +109 @@
 
                 private:
-                        scope_list const *scopes;
+                        scope_list *scopes;
                         wrapped_iterator it;
                         size_type i;
@@ -189 +189 @@
                         size_type i;
                 };
-                
+
                 /// Starts a new scope
                 void beginScope() {
-                        Scope scope;
-                        scopes.push_back(scope);
+                        scopes.emplace_back();
                 }
 
@@ -227 +226 @@
                                 return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->find( key ) );
                 }
-                
+
                 /// Finds the given key in the outermost scope inside the given scope where it occurs
                 iterator findNext( const_iterator &it, const Key &key ) {
@@ -247 +246 @@
                         return std::make_pair( iterator(scopes, res.first, scopes.size()-1), res.second );
                 }
+
+                std::pair< iterator, bool > insert( value_type &&value ) {
+                        std::pair< typename Scope::iterator, bool > res = scopes.back().insert( std::move( value ) );
+                        return std::make_pair( iterator(scopes, std::move( res.first ), scopes.size()-1), std::move( res.second ) );
+                }
+
                 std::pair< iterator, bool > insert( const Key &key, const Value &value ) { return insert( std::make_pair( key, value ) ); }
+                std::pair< iterator, bool > insert( const Key &key, Value &&value ) { return insert( std::make_pair( key, std::move( value ) ) ); }
 
                 Value& operator[] ( const Key &key ) {
@@ -254 +260 @@
                         return insert( key, Value() ).first->second;
                 }
+
+                iterator erase( iterator pos ) {
+                        Scope& scope = (*pos.scopes) [ pos.i ];
+                        const typename iterator::wrapped_iterator& new_it = scope.erase( pos.it );
+                        iterator it( *pos.scopes, new_it, pos.i );
+                        return it.next_valid();
+                }
+
+                size_type count( const Key &key ) const {
+                        size_type c = 0;
+                        auto it = find( key );
+                        auto end = cend();
+
+                        while(it != end) {
+                                c++;
+                                it = findNext(it, key);
+                        }
+
+                        return c;
+                }
+
         };
 } // namespace GenPoly

src/SymTab/Validate.cc

@@ -49 +49 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
+#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -162 +163 @@
                 void addImplicitTypedef( AggDecl * aggDecl );
 
-                typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
+                typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
+                typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
@@ -549 +551 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
                 } // if
 
@@ -567 +569 @@
                         return new EnumDecl( enumDecl->get_name() );
                 } else {
-                        return ret;
+                        return ret->clone();
                 } // if
         }
@@ -582 +584 @@
 
         DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
 
         DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 DeclarationWithType *ret = Mutator::mutate( objDecl );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 // is the type a function?
                 if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
@@ -603 +605 @@
 
         Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 Expression *ret = Mutator::mutate( castExpr );
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
 
         CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
-                TypedefMap oldNames = typedefNames;
+                typedefNames.beginScope();
                 scopeLevel += 1;
                 CompoundStmt *ret = Mutator::mutate( compoundStmt );
@@ -625 +627 @@
                         i = next;
                 } // while
-                typedefNames = oldNames;
+                typedefNames.endScope();
                 return ret;
         }
@@ -656 +658 @@
                                 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
-                        TypedefDecl * tyDecl = new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type );
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                        TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type ) );
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
                 } // if
         }

src/SynTree/Declaration.h

@@ -153 +153 @@
   public:
         NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
-        NamedTypeDecl( const TypeDecl &other );
+        NamedTypeDecl( const NamedTypeDecl &other );
         virtual ~NamedTypeDecl();
 

src/SynTree/NamedTypeDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// NamedTypeDecl.cc -- 
+// NamedTypeDecl.cc --
 //
 // Author           : Richard C. Bilson
@@ -21 +21 @@
         : Parent( name, sc, LinkageSpec::Cforall ), base( base ) {}
 
-NamedTypeDecl::NamedTypeDecl( const TypeDecl &other )
+NamedTypeDecl::NamedTypeDecl( const NamedTypeDecl &other )
         : Parent( other ), base( maybeClone( other.base ) ) {
         cloneAll( other.parameters, parameters );
@@ -35 +35 @@
 void NamedTypeDecl::print( std::ostream &os, int indent ) const {
         using namespace std;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";
@@ -59 +59 @@
 void NamedTypeDecl::printShort( std::ostream &os, int indent ) const {
         using namespace std;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";

src/main.cc

@@ -84 +84 @@
                  << " backtrace:" << endl;
 
-        char ** messages = backtrace_symbols( array, size );    
+        char ** messages = backtrace_symbols( array, size );
 
         // skip first stack frame (points here)
@@ -91 +91 @@
                 for ( char *p = messages[i]; *p; ++p ) {        // find parantheses and +offset
                         if (*p == '(') {
-                                mangled_name = p; 
+                                mangled_name = p;
                         } else if (*p == '+') {
                                 offset_begin = p;
@@ -109 +109 @@
                         char * real_name = __cxxabiv1::__cxa_demangle( mangled_name, 0, 0, &status );
                         if ( status == 0 ) {                                            // demangling successful ?
-                                cerr << "(" << i - 2 << ") " << messages[i] << " : " 
+                                cerr << "(" << i - 2 << ") " << messages[i] << " : "
                                          << real_name << "+" << offset_begin << offset_end << endl;
 
                         } else {                                                                        // otherwise, output mangled name
-                                cerr << "(" << i - 2 << ") " << messages[i] << " : " 
+                                cerr << "(" << i - 2 << ") " << messages[i] << " : "
                                          << mangled_name << "+" << offset_begin << offset_end << endl;
                         } // if
@@ -198 +198 @@
                 SymTab::validate( translationUnit, symtabp );
                 if ( symtabp ) {
+                        deleteAll( translationUnit );
                         return 0;
                 } // if