Changeset 722c4831 for src/AST/Expr.cpp


Ignore:
Timestamp:
May 22, 2019, 5:32:46 PM (3 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
489bacf, f23de79
Parents:
893e106
Message:

Temporary patch around Pass issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Expr.cpp

    r893e106 r722c4831  
    159159        assert( aggregate->result );
    160160
    161 <<<<<<< HEAD
    162         // #warning Needs GenericSubsitution.cpp building to work correctly
    163         // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
    164 
    165         // take ownership of member type
    166         result = mem->get_type();
    167         // substitute aggregate generic parameters into member type
    168         genericSubsitution( aggregate->result ).apply( result );
    169         // ensure lvalue and appropriate restrictions from aggregate type
    170         result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
    171 =======
    172 //      assert(!"unimplemented; need TypeSubstitution, genericSubstitution");
    173 >>>>>>> ef5ef56042ce2b547da955746d9986e26cf628ca
     161        #warning Needs GenericSubsitution.cpp building to work correctly
     162        result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
     163
     164        // // take ownership of member type
     165        // result = mem->get_type();
     166        // // substitute aggregate generic parameters into member type
     167        // genericSubsitution( aggregate->result ).apply( result );
     168        // // ensure lvalue and appropriate restrictions from aggregate type
     169        // result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
    174170}
    175171
Note: See TracChangeset for help on using the changeset viewer.