Changeset aaeacf4 for src/SynTree

Timestamp:

Jun 12, 2019, 4:06:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

21300d7

Parents:

6e3e0717

Message:

Removed global look-up table from UniqueId to Decl

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (4 diffs)
• Declaration.cc (modified) (2 diffs)
• Declaration.h (modified) (1 diff)
• Expression.cc (modified) (1 diff)
• Expression.h (modified) (2 diffs)

src/SynTree/ApplicationExpr.cc

@@ -29 +29 @@
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
+                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
 }
 
 ParamEntry &ParamEntry::operator=( const ParamEntry &other ) {
         if ( &other == this ) return *this;
-        decl = other.decl;
+        const_cast<UniqueId &>(decl) = other.decl;
+        const_cast<Declaration * &>(declptr) = maybeClone( other.declptr );
         // xxx - this looks like a memory leak
-        actualType = maybeClone( other.actualType );
-        formalType = maybeClone( other.formalType );
+        const_cast<Type * &>(actualType) = maybeClone( other.actualType );
+        const_cast<Type * &>(formalType) = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
         // *inferParams = *other.inferParams;
@@ -44 +45 @@
 
 ParamEntry::~ParamEntry() {
+        delete declptr;
         delete actualType;
         delete formalType;
@@ -50 +52 @@
 
 ParamEntry::ParamEntry( ParamEntry && other ) :
-                decl( other.decl ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr )/*, inferParams( std::move( other.inferParams ) )*/ {
-        other.actualType = nullptr;
-        other.formalType = nullptr;
+                decl( other.decl ), declptr( other.declptr ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr )/*, inferParams( std::move( other.inferParams ) )*/ {
+        const_cast<Declaration * &>(other.declptr) = nullptr;
+        const_cast<Type * &>(other.actualType) = nullptr;
+        const_cast<Type * &>(other.formalType) = nullptr;
         other.expr = nullptr;
 }
@@ -58 +61 @@
 ParamEntry & ParamEntry::operator=( ParamEntry && other ) {
         if ( &other == this ) return *this;
+        delete declptr;
         delete actualType;
         delete formalType;
         delete expr;
-        decl = other.decl;
-        actualType = other.actualType;
-        formalType = other.formalType;
+        const_cast<UniqueId &>(decl) = other.decl;
+        const_cast<Declaration * &>(declptr) = other.declptr;
+        const_cast<Type * &>(actualType) = other.actualType;
+        const_cast<Type * &>(formalType) = other.formalType;
         expr = other.expr;
-        other.actualType = nullptr;
-        other.formalType = nullptr;
+        const_cast<Declaration * &>(other.declptr) = nullptr;
+        const_cast<Type * &>(other.actualType) = nullptr;
+        const_cast<Type * &>(other.formalType) = nullptr;
         other.expr = nullptr;
         // inferParams = std::move( other.inferParams );

src/SynTree/Declaration.cc

@@ -27 +27 @@
 
 static UniqueId lastUniqueId = 0;
-typedef std::map< UniqueId, Declaration* > IdMapType;
-static IdMapType idMap;
 
 Declaration::Declaration( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage )
@@ -45 +43 @@
         if ( uniqueId ) return;
         uniqueId = ++lastUniqueId;
-        idMap[ uniqueId ] = this;
 }
-
-Declaration *Declaration::declFromId( UniqueId id ) {
-        IdMapType::const_iterator i = idMap.find( id );
-        return i != idMap.end() ? i->second : 0;
-}
-
-void Declaration::dumpIds( std::ostream &os ) {
-        for ( IdMapType::const_iterator i = idMap.begin(); i != idMap.end(); ++i ) {
-                os << i->first << " -> ";
-                i->second->printShort( os );
-                os << std::endl;
-        } // for
-}
-
 
 AsmDecl::AsmDecl( AsmStmt *stmt ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), stmt( stmt ) {

src/SynTree/Declaration.h

@@ -68 +68 @@
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const = 0;
 
-        static void dumpIds( std::ostream &os );
-        static Declaration *declFromId( UniqueId id );
-
         UniqueId uniqueId;
         Type::StorageClasses storageClasses;

src/SynTree/Expression.cc

@@ -38 +38 @@
                 for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
                         os << indent+1;
-                        Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
+                        assert(i->second.declptr);
+                        i->second.declptr->printShort( os, indent+1 );
                         os << std::endl;
                         printInferParams( i->second.expr->inferParams, os, indent+1, level+1 );

src/SynTree/Expression.h

@@ -39 +39 @@
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
-        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 )/*, inferParams( new InferredParams )*/ {}
-        ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr )/*, inferParams( new InferredParams )*/ {}
+        ParamEntry(): decl( 0 ), declptr(nullptr), actualType( 0 ), formalType( 0 ), expr( 0 )/*, inferParams( new InferredParams )*/ {}
+        ParamEntry( UniqueId decl, Declaration * declptr, Type * actualType, Type * formalType, Expression* expr )
+                : decl( decl ), declptr( declptr ), actualType( actualType ), formalType( formalType ), expr( expr )/*, inferParams( new InferredParams )*/ {
+        }
         ParamEntry( const ParamEntry & other );
         ParamEntry( ParamEntry && other );
@@ -47 +49 @@
         ParamEntry & operator=( ParamEntry && other );
 
-        UniqueId decl;
-        Type * actualType;
-        Type * formalType;
+        UniqueId const decl;
+        Declaration * const declptr;
+        Type * const actualType;
+        Type * const formalType;
         Expression * expr;
         // std::unique_ptr< InferredParams > inferParams;