Goose  Diff

Differences From Artifact [bac521e0b8]:

  • File bs/ir/tostring.cpp — part of check-in [2348eb21ab] at 2018-10-30 21:00:54 on branch trunk — ir: add VecOfLength term. (user: achavasse size: 1520)

To Artifact [9832890caa]:

  • File bs/ir/tostring.cpp — part of check-in [b6219e03e5] at 2018-11-01 19:55:20 on branch trunk — ir: implemented Merge. (user: achavasse size: 1524)

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
    {
        // TODO need generator that spits out everything contained in a trie
        return out << "<or (nyi)>";
    }

    ostream& ToString( ostream& out, const ptr< Vector >& v )
    {
        if( v->m_vec.empty() && !v->repetitionTerm() )
            return out << "()";

        out << "( ";

        for( auto&& x : v->m_vec )
            ToString( out, x ) << ' ';

        if( v->repetitionTerm() )
        {
            out << '*';
            ToString( out, *v->repetitionTerm() );
            out << ' ';







|




|







36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
    {
        // TODO need generator that spits out everything contained in a trie
        return out << "<or (nyi)>";
    }

    ostream& ToString( ostream& out, const ptr< Vector >& v )
    {
        if( v->m_terms.empty() && !v->repetitionTerm() )
            return out << "()";

        out << "( ";

        for( auto&& x : v->m_terms )
            ToString( out, x ) << ' ';

        if( v->repetitionTerm() )
        {
            out << '*';
            ToString( out, *v->repetitionTerm() );
            out << ' ';