Changes in src/libcfa/rational [561f730:f621a148]

File:

• src/libcfa/rational (modified) (2 diffs)

src/libcfa/rational

@@ -12 +12 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 14 16:49:13 2017
-// Update Count     : 78
+// Last Modified On : Mon May  1 08:25:06 2017
+// Update Count     : 33
 //
 
@@ -21 +21 @@
 #include "iostream"
 
-trait scalar( otype T ) {
-};
-
-trait arithmetic( otype T | scalar( T ) ) {
-        int !?( T );
-        int ?==?( T, T );
-        int ?!=?( T, T );
-        int ?<?( T, T );
-        int ?<=?( T, T );
-        int ?>?( T, T );
-        int ?>=?( T, T );
-        void ?{}( T *, zero_t );
-        void ?{}( T *, one_t );
-        T +?( T );
-        T -?( T );
-        T ?+?( T, T );
-        T ?-?( T, T );
-        T ?*?( T, T );
-        T ?/?( T, T );
-        T ?%?( T, T );
-        T ?/=?( T *, T );
-        T abs( T );
-};
-
 // implementation
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+typedef long int RationalImpl;
 struct Rational {
-        RationalImpl numerator, denominator;                            // invariant: denominator > 0
+        RationalImpl numerator, denominator;                                    // invariant: denominator > 0
 }; // Rational
 
+// constants
+extern struct Rational 0;
+extern struct Rational 1;
+
 // constructors
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, RationalImpl n );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, zero_t );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-void ?{}( Rational(RationalImpl) * r, one_t );
+void ?{}( Rational * r );
+void ?{}( Rational * r, RationalImpl n );
+void ?{}( Rational * r, RationalImpl n, RationalImpl d );
 
 // getter for numerator/denominator
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-RationalImpl numerator( Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-RationalImpl denominator( Rational(RationalImpl) r );
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src );
-
+RationalImpl numerator( Rational r );
+RationalImpl denominator( Rational r );
+[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src );
 // setter for numerator/denominator
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
+RationalImpl numerator( Rational r, RationalImpl n );
+RationalImpl denominator( Rational r, RationalImpl d );
 
 // comparison
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+int ?==?( Rational l, Rational r );
+int ?!=?( Rational l, Rational r );
+int ?<?( Rational l, Rational r );
+int ?<=?( Rational l, Rational r );
+int ?>?( Rational l, Rational r );
+int ?>=?( Rational l, Rational r );
 
 // arithmetic
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) +?( Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) -?( Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+Rational -?( Rational r );
+Rational ?+?( Rational l, Rational r );
+Rational ?-?( Rational l, Rational r );
+Rational ?*?( Rational l, Rational r );
+Rational ?/?( Rational l, Rational r );
 
 // conversion
-// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-// double widen( Rational(RationalImpl) r );
-// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-// Rational(RationalImpl) narrow( double f, RationalImpl md );
+double widen( Rational r );
+Rational narrow( double f, RationalImpl md );
 
 // I/O
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
-istype * ?|?( istype *, Rational(RationalImpl) * );
-
-forall ( otype RationalImpl | arithmetic( RationalImpl ) )
-forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
-ostype * ?|?( ostype *, Rational(RationalImpl ) );
+forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, Rational * );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
 
 #endif // RATIONAL_H