Changeset 0a208b8 for src/libcfa

Timestamp:

May 25, 2017, 11:10:42 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

e883a4b

Parents:

a8e64c4 (diff), 58ed882 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa

Files:

• containers/maybe (added)
• containers/maybe.c (added)
• containers/result (added)
• containers/result.c (added)
• math (modified) (2 diffs)
• math.c (modified) (2 diffs)
• stdlib (modified) (5 diffs)
• stdlib.c (modified) (2 diffs)

src/libcfa/math

@@ -10 +10 @@
 // Created On       : Mon Apr 18 23:37:04 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 24 12:45:02 2016
-// Update Count     : 59
+// Last Modified On : Wed May 24 17:40:39 2017
+// Update Count     : 60
 //
 
@@ -20 +20 @@
 #include <math.h>                                                                               // fpclassify, isfinite, isnormal, isnan, isinf
 } // extern "C"
-
-float fabs( float );
-// extern "C" { double fabs( double ); }
-long double fabs( long double );
-float cabs( float _Complex );
-// extern "C" { double cabs( double _Complex ); }
-long double cabs( long double _Complex );
 
 float ?%?( float, float );

src/libcfa/math.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 22:23:08 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 24 08:52:31 2016
-// Update Count     : 75
+// Last Modified On : Tue May 23 22:52:13 2017
+// Update Count     : 76
 //
 
@@ -19 +19 @@
 #include <complex.h>
 } // extern "C"
-
-float fabs( float x ) { return fabsf( x ); }
-long double fabs( long double x ) { return fabsl( x ); }
-float cabs( float _Complex x ) { return cabsf( x ); }
-long double cabs( long double _Complex x ) { return cabsl( x ); }
 
 float ?%?( float x, float y ) { return fmodf( x, y ); }

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May  9 08:42:44 2017
-// Update Count     : 107
+// Last Modified On : Wed May 24 18:06:27 2017
+// Update Count     : 115
 //
 
@@ -28 +28 @@
 //---------------------------------------
 
-extern "C" { void * malloc( size_t ); }                                 // use default C routine for void *
 forall( dtype T | sized(T) ) T * malloc( void );
 forall( dtype T | sized(T) ) T * malloc( char fill );
@@ -42 +41 @@
 forall( dtype T | sized(T) ) T * memalign( size_t alignment );          // deprecated
 forall( dtype T | sized(T) ) int posix_memalign( T ** ptr, size_t alignment );
-
-extern "C" {
-void * memset( void * ptr, int fill, size_t size );
-void free( void * ptr );
-} // extern "C"
 
 forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } ) T * new( Params p );
@@ -109 +103 @@
 double abs( double _Complex );
 long double abs( long double _Complex );
-forall ( otype T | { void ?{}( T *, zero_t ); int ?<?( T, T ); T -?( T ); } )
+forall( otype T | { void ?{}( T *, zero_t ); int ?<?( T, T ); T -?( T ); } )
 T abs( T );
 
@@ -115 +109 @@
 
 void rand48seed( long int s );
-char rand48();
-int rand48();
-unsigned int rand48();
-long int rand48();
-unsigned long int rand48();
-float rand48();
-double rand48();
-float _Complex rand48();
-double _Complex rand48();
-long double _Complex rand48();
+char rand48( void );
+int rand48( void );
+unsigned int rand48( void );
+long int rand48( void );
+unsigned long int rand48( void );
+float rand48( void );
+double rand48( void );
+float _Complex rand48( void );
+double _Complex rand48( void );
+long double _Complex rand48( void );
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May  9 08:43:00 2017
-// Update Count     : 191
+// Last Modified On : Wed May 24 18:13:15 2017
+// Update Count     : 198
 //
 
@@ -279 +279 @@
 
 void rand48seed( long int s ) { srand48( s ); }
-char rand48() { return mrand48(); }
-int rand48() { return mrand48(); }
-unsigned int rand48() { return lrand48(); }
-long int rand48() { return mrand48(); }
-unsigned long int rand48() { return lrand48(); }
-float rand48() { return (float)drand48(); }                             // otherwise float uses lrand48
-double rand48() { return drand48(); }
-float _Complex rand48() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
-double _Complex rand48() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
-long double _Complex rand48() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
+char rand48( void ) { return mrand48(); }
+int rand48( void ) { return mrand48(); }
+unsigned int rand48( void ) { return lrand48(); }
+long int rand48( void ) { return mrand48(); }
+unsigned long int rand48( void ) { return lrand48(); }
+float rand48( void ) { return (float)drand48(); }               // otherwise float uses lrand48
+double rand48( void ) { return drand48(); }
+float _Complex rand48( void ) { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
+double _Complex rand48( void ) { return drand48() + (double _Complex)(drand48() * _Complex_I); }
+long double _Complex rand48( void) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
 //---------------------------------------