Changeset d76f32c


Ignore:
Timestamp:
Jun 13, 2019, 2:32:02 PM (2 years ago)
Author:
Andrew Beach <ajbeach@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
6896548
Parents:
d60780c
Message:

ast::UniqueExpr? was not having one of its fields initialized.

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Expr.cpp

    rd60780c rd76f32c  
    99// Author           : Aaron B. Moss
    1010// Created On       : Wed May 15 17:00:00 2019
    11 // Last Modified By : Aaron B. Moss
    12 // Created On       : Wed May 15 17:00:00 2019
    13 // Update Count     : 1
     11// Last Modified By : Andrew Beach
     12// Created On       : Thr Jun 13 13:38:00 2019
     13// Update Count     : 2
    1414//
    1515
     
    382382
    383383UniqueExpr::UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i )
    384 : Expr( loc, e->result ), id( i ) {
     384: Expr( loc, e->result ), expr( e ), id( i ) {
    385385        assert( expr );
    386386        if ( id == -1ull ) {
  • src/AST/Expr.hpp

    rd60780c rd76f32c  
    693693        unsigned long long id;
    694694
    695         UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i = -1 );
     695        UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i = -1ull );
    696696
    697697        const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
  • src/ResolvExpr/Candidate.hpp

    rd60780c rd76f32c  
    99// Author           : Aaron B. Moss
    1010// Created On       : Wed Jun 5 14:30:00 2019
    11 // Last Modified By : Aaron B. Moss
    12 // Last Modified On : Wed Jun 5 14:30:00 2019
    13 // Update Count     : 1
     11// Last Modified By : Andrew Beach
     12// Last Modified On : Wed Jun 12 14:15:00 2019
     13// Update Count     : 2
    1414//
    1515
     
    4949
    5050        Candidate() : expr(), cost( Cost::zero ), cvtCost( Cost::zero ), env(), open(), need() {}
    51        
     51
    5252        Candidate( const ast::Expr * x, const ast::TypeEnvironment & e )
    5353        : expr( x ), cost( Cost::zero ), cvtCost( Cost::zero ), env( e ), open(), need() {}
    5454
    5555        Candidate( const Candidate & o, const ast::Expr * x )
    56         : expr( x ), cost( o.cost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ), 
     56        : expr( x ), cost( o.cost ), cvtCost( Cost::zero ), env( o.env ), open( o.open ),
    5757          need( o.need ) {}
    58        
    59         Candidate( 
    60                 const ast::Expr * x, ast::TypeEnvironment && e, ast::OpenVarSet && o, 
    61                 ast::AssertionSet && n, const Cost & c )
    62         : expr( x ), cost( c ), cvtCost( Cost::zero ), env( std::move( e ) ), open( std::move( o ) ),
     58
     59        Candidate(
     60                const ast::Expr * x, ast::TypeEnvironment && e, ast::OpenVarSet && o,
     61                ast::AssertionSet && n, const Cost & c, const Cost & cvt = Cost::zero )
     62        : expr( x ), cost( c ), cvtCost( cvt ), env( std::move( e ) ), open( std::move( o ) ),
    6363          need( n.begin(), n.end() ) {}
    6464};
Note: See TracChangeset for help on using the changeset viewer.