Changeset 53449a4 for src/AST/Decl.hpp


Ignore:
Timestamp:
Dec 16, 2020, 4:01:57 PM (12 months ago)
Author:
Colby Alexander Parsons <caparsons@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
8ba363e, c8025a21
Parents:
b3c8496 (diff), 3e5dd913 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Decl.hpp

    rb3c8496 r53449a4  
    132132        std::vector< ptr<Expr> > withExprs;
    133133
     134        std::vector<ptr<TypeDecl>> type_params;
     135        std::vector<ptr<DeclWithType>> assertions;
     136
    134137        FunctionDecl( const CodeLocation & loc, const std::string & name, std::vector<ptr<TypeDecl>>&& forall,
    135138                std::vector<ptr<DeclWithType>>&& params, std::vector<ptr<DeclWithType>>&& returns,
     
    154157public:
    155158        ptr<Type> base;
    156         std::vector<ptr<TypeDecl>> params;
    157159        std::vector<ptr<DeclWithType>> assertions;
    158160
     
    160162                const CodeLocation & loc, const std::string & name, Storage::Classes storage,
    161163                const Type * b, Linkage::Spec spec = Linkage::Cforall )
    162         : Decl( loc, name, storage, spec ), base( b ), params(), assertions() {}
     164        : Decl( loc, name, storage, spec ), base( b ), assertions() {}
    163165
    164166        /// Produces a name for the kind of alias
Note: See TracChangeset for help on using the changeset viewer.