Changes in / [863b34f:059531a6]

Files:

• Jenkinsfile (modified) (1 diff)
• src/examples/a.out (deleted)
• src/libcfa/stdlib (modified) (2 diffs)
• src/libcfa/stdlib.c (modified) (3 diffs)
• src/tests/dtor-early-exit.c (modified) (1 diff)
• src/tests/test.py (modified) (2 diffs)
• src/tests/tupleVariadic.c (modified) (1 diff)

Jenkinsfile

@@ -31 +31 @@
 
                 //Run the tests from the tests directory
-                dir ('src/tests') {
-                        if (full_build) {
-                                sh 'make all-tests debug=yes'
-                                sh 'make all-tests debug=no'
-                        }
-                        else {
-                                sh 'make'
-                        }
+                if (full_build) {
+                        sh 'make -C src/tests all-tests debug=yes'
+                        sh 'make -C src/tests all-tests debug=no'
+                }
+                else {
+                        sh 'make -C src/tests'
                 }
 

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/test.py

@@ -168 +168 @@
 
 def run_test_instance(t, generate, dry_run, debug) :
-        # print formated name
-        name_txt = "%20s  " % t.name
-
-        #run the test instance and collect the result
-        test_failed, error = run_single_test(t, generate, dry_run, debug)
-
-        # update output based on current action
-        if generate :
-                failed_txt = "ERROR"
-                success_txt = "Done"
-        else :
-                failed_txt = "FAILED"
-                success_txt = "PASSED"
-
-        #print result with error if needed
-        text = name_txt + (failed_txt if test_failed else success_txt)
-        out = sys.stdout
-        if error :
-                text = text + "\n" + error
-                out = sys.stderr
-
-        print(text, file = out);
-        sys.stdout.flush()
-        sys.stderr.flush()
-
-        return test_failed
+        try :
+                # print formated name
+                name_txt = "%20s  " % t.name
+
+                #run the test instance and collect the result
+                test_failed, error = run_single_test(t, generate, dry_run, debug)
+
+                # update output based on current action
+                if generate :
+                        failed_txt = "ERROR"
+                        success_txt = "Done"
+                else :
+                        failed_txt = "FAILED"
+                        success_txt = "PASSED"
+
+                #print result with error if needed
+                text = name_txt + (failed_txt if test_failed else success_txt)
+                out = sys.stdout
+                if error :
+                        text = text + "\n" + error
+                        out = sys.stderr
+
+                print(text, file = out);
+                sys.stdout.flush()
+                sys.stderr.flush()
+                return test_failed
+        
+        except KeyboardInterrupt:
+                test_failed = True
+
 
 # run the given list of tests with the given parameters
@@ -209 +213 @@
         pool = Pool(jobs)
         try :
-                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(99999999)
+                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(9999)
         except KeyboardInterrupt:
                 pool.terminate()

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);