Changeset 97aca3df for src/AST

Timestamp:

Dec 10, 2020, 4:52:49 PM (5 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/AST

Files:

• Convert.cpp (modified) (3 diffs)
• Decl.hpp (modified) (2 diffs)
• Pass.impl.hpp (modified) (2 diffs)
• Print.cpp (modified) (1 diff)

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;
                 }