Changeset 97aca3df

Timestamp:

Dec 10, 2020, 4:52:49 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e4b6b7d3

Parents:

80444bb (diff), 3e3f236 (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

Files:

• AST/Convert.cpp (modified) (3 diffs)
• AST/Decl.hpp (modified) (2 diffs)
• AST/Pass.impl.hpp (modified) (2 diffs)
• AST/Print.cpp (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (6 diffs)
• Parser/TypeData.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (2 diffs)
• SynTree/NamedTypeDecl.cc (modified) (4 diffs)

src/AST/Convert.cpp

@@ -233 +233 @@
         const ast::Decl * namedTypePostamble( NamedTypeDecl * decl, const ast::NamedTypeDecl * node ) {
                 // base comes from constructor
-                decl->parameters = get<TypeDecl>().acceptL( node->params );
                 decl->assertions = get<DeclarationWithType>().acceptL( node->assertions );
                 declPostamble( decl, node );
@@ -1704 +1703 @@
                 cache.emplace( old, decl );
                 decl->assertions = GET_ACCEPT_V(assertions, DeclWithType);
-                decl->params     = GET_ACCEPT_V(parameters, TypeDecl);
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;
@@ -1720 +1718 @@
                 );
                 decl->assertions = GET_ACCEPT_V(assertions, DeclWithType);
-                decl->params     = GET_ACCEPT_V(parameters, TypeDecl);
                 decl->extension  = old->extension;
                 decl->uniqueId   = old->uniqueId;

src/AST/Decl.hpp

@@ -154 +154 @@
 public:
         ptr<Type> base;
-        std::vector<ptr<TypeDecl>> params;
         std::vector<ptr<DeclWithType>> assertions;
 
@@ -160 +159 @@
                 const CodeLocation & loc, const std::string & name, Storage::Classes storage,
                 const Type * b, Linkage::Spec spec = Linkage::Cforall )
-        : Decl( loc, name, storage, spec ), base( b ), params(), assertions() {}
+        : Decl( loc, name, storage, spec ), base( b ), assertions() {}
 
         /// Produces a name for the kind of alias

src/AST/Pass.impl.hpp

@@ -609 +609 @@
         VISIT({
                 guard_symtab guard { *this };
-                maybe_accept( node, &TypeDecl::params );
                 maybe_accept( node, &TypeDecl::base   );
         })
@@ -638 +637 @@
         VISIT({
                 guard_symtab guard { *this };
-                maybe_accept( node, &TypedefDecl::params );
                 maybe_accept( node, &TypedefDecl::base   );
         })

src/AST/Print.cpp

@@ -221 +221 @@
                         ++indent;
                         node->base->accept( *this );
-                        --indent;
-                }
-
-                if ( ! node->params.empty() ) {
-                        os << endl << indent << "... with parameters" << endl;
-                        ++indent;
-                        printAll( node->params );
                         --indent;
                 }

src/Common/PassVisitor.impl.h

@@ -835 +835 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->base      , *this );
         }
@@ -858 +857 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->base      , *this );
         }
@@ -880 +878 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->base      , *this );
         }
@@ -904 +901 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->base      , *this );
         }
@@ -921 +917 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeAccept_impl( node->parameters, *this );
                 maybeAccept_impl( node->base      , *this );
         }
@@ -938 +933 @@
         {
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
-                maybeMutate_impl( node->parameters, *this );
                 maybeMutate_impl( node->base      , *this );
         }

src/Parser/TypeData.cc

@@ -900 +900 @@
                 ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Dtype, true );
         } // if
-        buildList( td->symbolic.params, ret->get_parameters() );
         buildList( td->symbolic.assertions, ret->get_assertions() );
         ret->base->attributes.splice( ret->base->attributes.end(), attributes );

src/SynTree/Declaration.h

@@ -181 +181 @@
   public:
         Type * base;
-        std::list< TypeDecl * > parameters;
         std::list< DeclarationWithType * > assertions;
 
@@ -190 +189 @@
         Type * get_base() const { return base; }
         void set_base( Type * newValue ) { base = newValue; }
-        std::list< TypeDecl* > & get_parameters() { return parameters; }
         std::list< DeclarationWithType * >& get_assertions() { return assertions; }
 

src/SynTree/NamedTypeDecl.cc

@@ -29 +29 @@
 NamedTypeDecl::NamedTypeDecl( const NamedTypeDecl &other )
         : Parent( other ), base( maybeClone( other.base ) ) {
-        cloneAll( other.parameters, parameters );
         cloneAll( other.assertions, assertions );
 }
@@ -35 +34 @@
 NamedTypeDecl::~NamedTypeDecl() {
         delete base;
-        deleteAll( parameters );
         deleteAll( assertions );
 }
@@ -56 +54 @@
                 base->print( os, indent+1 );
         } // if
-        if ( ! parameters.empty() ) {
-                os << endl << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
-        } // if
         if ( ! assertions.empty() ) {
                 os << endl << indent << "... with assertions" << endl;
@@ -76 +70 @@
                 base->print( os, indent+1 );
         } // if
-        if ( ! parameters.empty() ) {
-                os << endl << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
-        } // if
 }