Changeset 2162c2c for src/libcfa

Timestamp:

Jan 11, 2017, 4:11:02 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

075734f

Parents:

bb82c03 (diff), d3a85240 (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/libcfa

Files:

• math.c (modified) (4 diffs)
• stdlib (modified) (1 diff)
• stdlib.c (modified) (4 diffs)

src/libcfa/math.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// math.c -- 
-// 
+//
+// math.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Apr 19 22:23:08 2016
@@ -12 +12 @@
 // Last Modified On : Sun Apr 24 08:52:31 2016
 // Update Count     : 75
-// 
+//
 
 #include "math"
@@ -34 +34 @@
 long double remainder( long double x, long double y ) { return remainderl( x, y ); }
 
-// [ int, float ] remquo( float x, float y ) { int quo; x = remquof( x, y, &quo ); return [ quo, x ]; }
+[ int, float ] remquo( float x, float y ) { int quo; x = remquof( x, y, &quo ); return [ quo, x ]; }
 float remquo( float x, float y, int *quo ) { return remquof( x, y, quo ); }
-// [ int, double ] remquo( double x, double y ) { int quo; x = remquo( x, y, &quo ); return [ quo, x ]; }
-// [ int, long double ] remquo( long double x, long double y ) { int quo; x = remquol( x, y, &quo ); return [ quo, x ]; }
+[ int, double ] remquo( double x, double y ) { int quo; x = remquo( x, y, &quo ); return [ quo, x ]; }
+[ int, long double ] remquo( long double x, long double y ) { int quo; x = remquol( x, y, &quo ); return [ quo, x ]; }
 long double remquo( long double x, long double y, int *quo ) { return remquol( x, y, quo ); }
 
-// [ int, float ] div( float x, float y ) { int quo; x = remquof( x, y, &quo ); return [ quo, x ]; }
+[ int, float ] div( float x, float y ) { int quo; x = remquof( x, y, &quo ); return [ quo, x ]; }
 float div( float x, float y, int *quo ) { return remquof( x, y, quo ); }
-// [ int, double ] div( double x, double y ) { int quo; x = remquo( x, y, &quo ); return [ quo, x ]; }
-// [ int, long double ] div( long double x, long double y ) { int quo; x = remquol( x, y, &quo ); return [ quo, x ]; }
+[ int, double ] div( double x, double y ) { int quo; x = remquo( x, y, &quo ); return [ quo, x ]; }
+[ int, long double ] div( long double x, long double y ) { int quo; x = remquol( x, y, &quo ); return [ quo, x ]; }
 long double div( long double x, long double y, int *quo ) { return remquol( x, y, quo ); }
 
@@ -278 +278 @@
 long double ldexp( long double x, int exp2 ) { return ldexpl( x, exp2 ); }
 
-// [ float, float ] modf( float x ) { float i; x = modff( x, &i ); return [ i, x ]; }
+[ float, float ] modf( float x ) { float i; x = modff( x, &i ); return [ i, x ]; }
 float modf( float x, float *i ) { return modff( x, i ); }
-// [ double, double ] modf( double x ) { double i; x = modf( x, &i ); return [ i, x ]; }
-// [ long double, long double ] modf( long double x ) { long double i; x = modfl( x, &i ); return [ i, x ]; }
+[ double, double ] modf( double x ) { double i; x = modf( x, &i ); return [ i, x ]; }
+[ long double, long double ] modf( long double x ) { long double i; x = modfl( x, &i ); return [ i, x ]; }
 long double modf( long double x, long double *i ) { return modfl( x, i ); }
 

src/libcfa/stdlib

@@ -47 +47 @@
 void free( void * ptr );
 } // extern "C"
+
+forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
+forall( dtype T | { void ^?{}(T *); } ) void delete( T * ptr );
+
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// algorithm.c -- 
+// algorithm.c --
 //
 // Author           : Peter A. Buhr
@@ -78 +78 @@
 } // posix_memalign
 
+forall( otype T, ttype Params | { void ?{}(T *, Params); } )
+T * new( Params p ) {
+        return ((T*)malloc()){ p };
+}
+
+forall( dtype T | { void ^?{}(T *); } )
+void delete( T * ptr ) {
+  if ( ptr ) {
+    ^ptr{};
+    free( ptr );
+  }
+}
+
 //---------------------------------------
 
@@ -141 +154 @@
         if ( sscanf( ptr, "%Lf%Lfi", &re, &im ) == EOF ) {}
         return re + im * _Complex_I;
-}       
+}
 
 int strto( const char * sptr, char ** eptr, int base ) {
@@ -213 +226 @@
 //---------------------------------------
 
-// forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } )
-// [ T, T ] div( T t1, T t2 ) { return [ t1 / t2, t1 % t2 ]; }
+forall( otype T | { T ?/?( T, T ); T ?%?( T, T ); } )
+[ T, T ] div( T t1, T t2 ) { return [ t1 / t2, t1 % t2 ]; }
 
 //---------------------------------------