Changeset 561f730 for src/libcfa/rational

Timestamp:

May 14, 2017, 6:30:20 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a32cfc90

Parents:

4c8f86b3

Message:

first attempt converting rational numbers to generic type

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 : Mon May  1 08:25:06 2017
-// Update Count     : 33
+// Last Modified On : Sun May 14 16:49:13 2017
+// Update Count     : 78
 //
 
@@ -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
-typedef long int RationalImpl;
+
+forall ( otype RationalImpl | arithmetic( 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
 
-// constructors
-void ?{}( Rational * r );
-void ?{}( Rational * r, RationalImpl n );
-void ?{}( Rational * r, RationalImpl n, RationalImpl d );
+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 );
 
 // getter for numerator/denominator
-RationalImpl numerator( Rational r );
-RationalImpl denominator( Rational r );
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src );
+
+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 );
+
 // setter for numerator/denominator
-RationalImpl numerator( Rational r, RationalImpl n );
-RationalImpl denominator( Rational r, RationalImpl d );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
 
 // comparison
-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 );
+
+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 );
 
 // arithmetic
-Rational -?( Rational r );
-Rational ?+?( Rational l, Rational r );
-Rational ?-?( Rational l, Rational r );
-Rational ?*?( Rational l, Rational r );
-Rational ?/?( Rational l, Rational r );
+
+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 );
 
 // conversion
-double widen( Rational r );
-Rational narrow( double f, RationalImpl md );
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// double widen( Rational(RationalImpl) r );
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// Rational(RationalImpl) narrow( double f, RationalImpl md );
 
 // I/O
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, Rational * );
-forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
+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 ) );
 
 #endif // RATIONAL_H