Changeset f53acdf8 for src/AST/Type.hpp


Ignore:
Timestamp:
Jul 19, 2019, 2:16:01 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
4eb43fa
Parents:
1f1c102 (diff), 8ac3b0e (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' into new-ast

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Type.hpp

    r1f1c102 rf53acdf8  
    3535
    3636template< typename T > class Pass;
    37 class ForallSubstitutor;
     37
     38struct ForallSubstitutor;
    3839
    3940class Type : public Node {
     
    167168        static const char *typeNames[];
    168169
    169         BasicType( Kind k, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} ) 
     170        BasicType( Kind k, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    170171        : Type(q, std::move(as)), kind(k) {}
    171172
     
    274275public:
    275276        using ForallList = std::vector<ptr<TypeDecl>>;
    276        
     277
    277278        ForallList forall;
    278279
     
    338339        bool hoistType = false;
    339340
    340         ReferenceToType( 
     341        ReferenceToType(
    341342                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    342343        : ParameterizedType(q, std::move(as)), params(), name(n) {}
     
    359360        readonly<StructDecl> base;
    360361
    361         StructInstType( 
     362        StructInstType(
    362363                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    363364        : ReferenceToType( n, q, std::move(as) ), base() {}
    364365
    365         StructInstType( 
     366        StructInstType(
    366367                const StructDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
    367368
     
    381382        readonly<UnionDecl> base;
    382383
    383         UnionInstType( 
     384        UnionInstType(
    384385                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    385386        : ReferenceToType( n, q, std::move(as) ), base() {}
    386387
    387         UnionInstType( 
     388        UnionInstType(
    388389                const UnionDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
    389390
     
    403404        readonly<EnumDecl> base;
    404405
    405         EnumInstType( 
     406        EnumInstType(
    406407                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    407408        : ReferenceToType( n, q, std::move(as) ), base() {}
    408409
    409         EnumInstType( 
     410        EnumInstType(
    410411                const EnumDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
    411412
     
    425426        readonly<TraitDecl> base;
    426427
    427         TraitInstType( 
     428        TraitInstType(
    428429                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
    429430        : ReferenceToType( n, q, std::move(as) ), base() {}
    430        
    431         TraitInstType( 
     431
     432        TraitInstType(
    432433                const TraitDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
    433434
     
    449450        TypeVar::Kind kind;
    450451
    451         TypeInstType( 
     452        TypeInstType(
    452453                const std::string& n, const TypeDecl * b, CV::Qualifiers q = {},
    453454                std::vector<ptr<Attribute>> && as = {} )
    454455        : ReferenceToType( n, q, std::move(as) ), base( b ), kind( b->kind ) {}
    455        
    456         TypeInstType( 
     456
     457        TypeInstType(
    457458                const std::string& n, TypeVar::Kind k, CV::Qualifiers q = {},
    458459                std::vector<ptr<Attribute>> && as = {} )
Note: See TracChangeset for help on using the changeset viewer.