Changeset 7b91c0e for libcfa/src/rational.hfa

Timestamp:

Jan 21, 2021, 2:24:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7d01186d

Parents:

5869cea (diff), 1adab3e (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:

• libcfa/src/rational.hfa (modified) (4 diffs)

libcfa/src/rational.hfa

@@ -20 +20 @@
 #include "iostream.hfa"
 
-trait scalar( otype T ) {
+trait scalar( T ) {
 };
 
-trait arithmetic( otype T | scalar( T ) ) {
+trait arithmetic( T | scalar( T ) ) {
         int !?( T );
         int ?==?( T, T );
@@ -46 +46 @@
 // implementation
 
-forall( otype RationalImpl | arithmetic( RationalImpl ) ) {
+forall( RationalImpl | arithmetic( RationalImpl ) ) {
         struct Rational {
                 RationalImpl numerator, denominator;                    // invariant: denominator > 0
@@ -89 +89 @@
 
         // I/O
-        forall( dtype istype | istream( istype ) | { istype & ?|?( istype &, RationalImpl & ); } )
+        forall( istype & | istream( istype ) | { istype & ?|?( istype &, RationalImpl & ); } )
         istype & ?|?( istype &, Rational(RationalImpl) & );
 
-        forall( dtype ostype | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } ) {
+        forall( ostype & | ostream( ostype ) | { ostype & ?|?( ostype &, RationalImpl ); } ) {
                 ostype & ?|?( ostype &, Rational(RationalImpl) );
                 void ?|?( ostype &, Rational(RationalImpl) );
@@ -98 +98 @@
 } // distribution
 
-forall( otype RationalImpl | arithmetic( RationalImpl ) |{RationalImpl ?\?( RationalImpl, unsigned long );} )
+forall( RationalImpl | arithmetic( RationalImpl ) |{RationalImpl ?\?( RationalImpl, unsigned long );} )
 Rational(RationalImpl) ?\?( Rational(RationalImpl) x, long int y );
 
 // conversion
-forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
+forall( RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl ); } )
 double widen( Rational(RationalImpl) r );
-forall( otype RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
+forall( RationalImpl | arithmetic( RationalImpl ) | { double convert( RationalImpl );  RationalImpl convert( double );} )
 Rational(RationalImpl) narrow( double f, RationalImpl md );