Changeset 59239b8

Timestamp:

Jan 30, 2017, 12:29:29 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:

1e6e231a

Parents:

f97b614

Message:

new, delete, malloc, etc. no longer require an otype, only a sized dtype

Location:

src

Files:

• libcfa/stdlib (modified) (2 diffs)
• libcfa/stdlib.c (modified) (3 diffs)
• tests/dtor-early-exit.c (modified) (1 diff)
• tests/tupleVariadic.c (modified) (1 diff)

src/libcfa/stdlib

@@ -29 +29 @@
 
 extern "C" { void * malloc( size_t ); }                                 // use default C routine for void *
-forall( otype T ) T * malloc( void );
-forall( otype T ) T * malloc( char fill );
-forall( otype T ) T * malloc( T * ptr, size_t size );
-forall( otype T ) T * malloc( T * ptr, size_t size, unsigned char fill );
+forall( dtype T | sized(T) ) T * malloc( void );
+forall( dtype T | sized(T) ) T * malloc( char fill );
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size );
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size, unsigned char fill );
 extern "C" { void * calloc( size_t nmemb, size_t size ); } // use default C routine for void *
-forall( otype T ) T * calloc( size_t nmemb );
+forall( dtype T | sized(T) ) T * calloc( size_t nmemb );
 extern "C" { void * realloc( void * ptr, size_t size ); } // use default C routine for void *
-forall( otype T ) T * realloc( T * ptr, size_t size );
-forall( otype T ) T * realloc( T * ptr, size_t size, unsigned char fill );
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size );
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size, unsigned char fill );
 
-forall( otype T ) T * aligned_alloc( size_t alignment );
-forall( otype T ) T * memalign( size_t alignment );             // deprecated
-forall( otype T ) int posix_memalign( T ** ptr, size_t alignment );
+forall( dtype T | sized(T) ) T * aligned_alloc( size_t alignment );
+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" {
@@ -48 +48 @@
 } // extern "C"
 
-forall( otype T, ttype Params | { void ?{}(T *, Params); } ) T * new( Params p );
+forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } ) T * new( Params p );
 forall( dtype T | { void ^?{}(T *); } ) void delete( T * ptr );
 

src/libcfa/stdlib.c

@@ -27 +27 @@
 } // extern "C"
 
-forall( otype T ) T * malloc( void ) {
+forall( dtype T | sized(T) ) T * malloc( void ) {
         //printf( "malloc1\n" );
     return (T *)malloc( sizeof(T) );
 } // malloc
-forall( otype T ) T * malloc( char fill ) {
+forall( dtype T | sized(T) ) T * malloc( char fill ) {
         //printf( "malloc3\n" );
         T * ptr = (T *)malloc( sizeof(T) );
@@ -37 +37 @@
 } // malloc
 
-forall( otype T ) T * calloc( size_t nmemb ) {
+forall( dtype T | sized(T) ) T * calloc( size_t nmemb ) {
         //printf( "calloc\n" );
     return (T *)calloc( nmemb, sizeof(T) );
 } // calloc
 
-forall( otype T ) T * realloc( T * ptr, size_t size ) {
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size ) {
         //printf( "realloc1\n" );
     return (T *)(void *)realloc( (void *)ptr, size );
 } // realloc
-forall( otype T ) T * realloc( T * ptr, size_t size, unsigned char fill ) {
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size, unsigned char fill ) {
         //printf( "realloc2\n" );
     char * nptr = (T *)(void *)realloc( (void *)ptr, size );
@@ -54 +54 @@
 } // realloc
 
-forall( otype T ) T * malloc( T * ptr, size_t size ) {
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size ) {
         //printf( "malloc4\n" );
     return (T *)realloc( ptr, size );
 } // malloc
-forall( otype T ) T * malloc( T * ptr, size_t size, unsigned char fill ) {
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size, unsigned char fill ) {
         //printf( "malloc5\n" );
     return (T *)realloc( ptr, size, fill );
 } // malloc
 
-forall( otype T ) T * aligned_alloc( size_t alignment ) {
+forall( dtype T | sized(T) ) T * aligned_alloc( size_t alignment ) {
         //printf( "aligned_alloc\n" );
     return (T *)memalign( alignment, sizeof(T) );
 } // aligned_alloc
 
-forall( otype T ) T * memalign( size_t alignment ) {
+forall( dtype T | sized(T) ) T * memalign( size_t alignment ) {
         //printf( "memalign\n" );
     return (T *)memalign( alignment, sizeof(T) );
 } // memalign
 
-forall( otype T ) int posix_memalign( T ** ptr, size_t alignment ) {
+forall( dtype T | sized(T) ) int posix_memalign( T ** ptr, size_t alignment ) {
         //printf( "posix_memalign\n" );
     return posix_memalign( (void **)ptr, alignment, sizeof(T) );
 } // posix_memalign
 
-forall( otype T, ttype Params | { void ?{}(T *, Params); } )
+forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } )
 T * new( Params p ) {
         return ((T*)malloc()){ p };

src/tests/dtor-early-exit.c

@@ -28 +28 @@
 // don't want these called
 void ?{}(A * a) { assert( false ); }
-void ?{}(A * a, char * name) { a->name = name; sout | "construct " | name | endl; a->x = malloc(); }
+void ?{}(A * a, char * name) { a->name = name; sout | "construct " | name | endl; a->x = (int*)malloc(); }
 void ?{}(A * a, char * name, int * ptr) { assert( false ); }
 
 A ?=?(A * a, A a) {  sout | "assign " | a->name | " " | a.name; return a; }
-void ?{}(A * a, A a) { sout | "copy construct " | a.name | endl; a->x = malloc(); }
+void ?{}(A * a, A a) { sout | "copy construct " | a.name | endl; a->x = (int*)malloc(); }
 void ^?{}(A * a) { sout | "destruct " | a->name | endl; free(a->x); }
 

src/tests/tupleVariadic.c

@@ -29 +29 @@
 }
 
-forall(otype T, ttype Params | { void ?{}(T *, Params); })
+forall( dtype T, ttype Params | sized(T) | { void ?{}(T *, Params); } )
 T * new(Params p);