Ignore:
Timestamp:
Mar 19, 2019, 1:01:54 PM (3 years ago)
Author:
tdelisle <tdelisle@…>
Branches:
arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
2e041e27, be3416d
Parents:
9cb4fc8 (diff), 0c81320 (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
  • libcfa/prelude/prelude-gen.cc

    r9cb4fc8 rf1c1339  
    1010// Created On       : Sat Feb 16 08:44:58 2019
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Mar  8 16:00:22 2019
    13 // Update Count     : 26
     12// Last Modified On : Tue Mar 19 08:19:35 2019
     13// Update Count     : 28
    1414//
    1515
     
    208208                cout << "void ?{} (" << type << " &);" << endl;
    209209                cout << "void ?{} (" << type << " &, " << type << ");" << endl;
    210                 cout << type << "  ?=? (" << type << " &, " << type << ")";
     210                cout << type << " ?=? (" << type << " &, " << type << ")";
    211211                if ( do_volatile ) {
    212                         cout << ",  ?=?(volatile " << type << " &, " << type << ")";
     212                        cout << ", ?=?(volatile " << type << " &, " << type << ")";
    213213                }
    214214                cout << ";" << endl;
     
    217217
    218218        otype("zero_t");
     219        cout << endl;
    219220        otype("one_t");
     221        cout << endl;
    220222        otype("_Bool", true);
    221223        cout << endl;
     
    225227                cout << "void ?{}(" << type.name << " &, " << type.name << ");" << endl;
    226228                cout << "void ?{}(" << type.name << " &, zero_t);" << endl;
     229                cout << "void ?{}(" << type.name << " &, one_t);" << endl;
    227230                cout << "void ^?{}(" << type.name << " &);" << endl;
    228231                cout << endl;
Note: See TracChangeset for help on using the changeset viewer.