Changeset 224e52f


Ignore:
Timestamp:
Apr 8, 2016, 10:38:33 AM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
3da470c, adc6781
Parents:
8a34677 (diff), 3d9b5da (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

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/examples/rational.c

    r8a34677 r224e52f  
    1111// Created On       : Mon Mar 28 08:43:12 2016
    1212// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Wed Apr  6 18:02:02 2016
    14 // Update Count     : 19
     13// Last Modified On : Thu Apr  7 17:25:44 2016
     14// Update Count     : 20
    1515//
    1616
    1717#include <limits>
    1818#include <rational>
     19#include <fstream>
    1920
    2021int main() {
  • src/libcfa/limits.c

    r8a34677 r224e52f  
    1010// Created On       : Wed Apr  6 18:06:52 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Apr  6 21:12:17 2016
    13 // Update Count     : 10
     12// Last Modified On : Thu Apr  7 17:18:45 2016
     13// Update Count     : 11
    1414//
    1515
    16 #include <limits>
     16#include "limits"
    1717
    1818// Integral Constants
  • src/libcfa/rational

    r8a34677 r224e52f  
    1010// Created On       : Wed Apr  6 17:56:25 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Apr  6 21:51:42 2016
    13 // Update Count     : 8
     12// Last Modified On : Thu Apr  7 17:23:36 2016
     13// Update Count     : 9
    1414//
    1515
    16 #include <fstream>
     16#include "iostream"
    1717
    1818struct Rational {
     
    4444double widen( Rational r );
    4545Rational narrow( double f, long int md );
    46 ifstream * ?|?( ifstream *is, Rational *r );
    47 ofstream * ?|?( ofstream *os, Rational r );
     46forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, Rational * );
     47forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
    4848
    4949// Local Variables: //
  • src/libcfa/rational.c

    r8a34677 r224e52f  
    1111// Created On       : Wed Apr  6 17:54:28 2016
    1212// Last Modified By : Peter A. Buhr
    13 // Last Modified On : Wed Apr  6 21:52:16 2016
    14 // Update Count     : 7
     13// Last Modified On : Thu Apr  7 17:28:03 2016
     14// Update Count     : 12
    1515//
    1616
    1717#include "rational"
    18 #include <fstream>
    19 #include <stdlib>
     18#include "fstream"
     19#include "stdlib"
    2020
    2121extern "C" {
     
    188188} // narrow
    189189
    190 ifstream * ?|?( ifstream *is, Rational *r ) {
     190forall( dtype istype | istream( istype ) )
     191istype * ?|?( istype *is, Rational *r ) {
    191192        long int t;
    192193    is | &(r->numerator) | &(r->denominator);
     
    197198} // ?|?
    198199
    199 ofstream * ?|?( ofstream *os, Rational r ) {
     200forall( dtype ostype | ostream( ostype ) )
     201ostype * ?|?( ostype *os, Rational r ) {
    200202    return os | r.numerator | '/' | r.denominator;
    201203} // ?|?
Note: See TracChangeset for help on using the changeset viewer.