Changeset 58b6d1b for libcfa


Ignore:
Timestamp:
Aug 6, 2018, 4:33:35 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
524ed86
Parents:
73abe95
Message:

Fixed tests after headers change

Location:
libcfa/src
Files:
31 edited
1 moved

Legend:

Unmodified
Added
Removed

  • libcfa/src/Makefile.am

    r73abe95 r58b6d1b  
    6767        bits/debug.hfa         \
    6868        bits/locks.hfa         \
    69         concurrency/invoke.hfa
     69        concurrency/invoke.h
    7070
    7171MOSTLYCLEANFILES = prelude.c

  • libcfa/src/Makefile.in

    r73abe95 r58b6d1b  
    343343AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
    344344
     345#----------------------------------------------------------------------------------------------------------------
     346
    345347# not all platforms support concurrency, add option do disable it
    346 headers = fstream iostream iterator limits rational time stdlib common \
    347         containers/maybe containers/pair containers/result \
    348         containers/vector concurrency/coroutine concurrency/thread \
    349         concurrency/kernel concurrency/monitor concurrency/mutex
    350 libobjs = ${headers:=.o}
     348headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
     349        rational.hfa time.hfa stdlib.hfa common.hfa \
     350        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
     351        containers/vector.hfa concurrency/coroutine.hfa \
     352        concurrency/thread.hfa concurrency/kernel.hfa \
     353        concurrency/monitor.hfa concurrency/mutex.hfa
     354libobjs = ${headers:.hfa=.o}
    351355
    352356# not all platforms support concurrency, add option do disable it
    353357libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    354         exception.c virtual.c heap.cfa ${headers:=.cfa} \
     358        exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    355359        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    356360        concurrency/invoke.c concurrency/preemption.cfa
    … …  
    359363cfa_includedir = $(CFA_INCDIR)
    360364nobase_cfa_include_HEADERS = \
    361         ${headers}              \
    362         ${stdhdr}               \
    363         math                    \
    364         gmp                     \
    365         time_t.h                \
    366         bits/align.h            \
    367         bits/containers.h       \
    368         bits/defs.h             \
    369         bits/debug.h            \
    370         bits/locks.h            \
     365        ${headers}             \
     366        ${stdhdr}              \
     367        math.hfa               \
     368        gmp.hfa                \
     369        time_t.hfa             \
     370        bits/align.hfa         \
     371        bits/containers.hfa    \
     372        bits/defs.hfa          \
     373        bits/debug.hfa         \
     374        bits/locks.hfa         \
    371375        concurrency/invoke.h
    372376
    373 CLEANFILES = prelude.c
     377MOSTLYCLEANFILES = prelude.c
    374378all: all-am
    375379
    … …  
    670674        fi
    671675mostlyclean-generic:
     676        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    672677
    673678clean-generic:
    674         -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    675679
    676680distclean-generic:
    … …  
    783787        $(am__mv) $$depbase.Tpo $$depbase.Po
    784788
    785 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
    786 # SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
    787 % : %.c
    788         echo "Dummy rule, should never be called"
    789         false
    790 
    791 # This rule should always match headers and since it has no prerequisite it will never be called
    792 $(addprefix $(srcdir)/,$(headers)):
    793         echo "Dummy rule, should never be called"
    794         false
    795 
    796 ${libobjs} : ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    797 
     789#----------------------------------------------------------------------------------------------------------------
     790# add dependency to cfa-cpp so all libraries are rebuilt with new translator
     791${libobjs} : ${cfalib_DATA}
     792
     793#----------------------------------------------------------------------------------------------------------------
    798794maintainer-clean-local:
    799795        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}

  • libcfa/src/bits/signal.hfa

    r73abe95 r58b6d1b  
    2222#include <errno.h>
    2323#define __USE_GNU
    24 #include <signal.hfa>
     24#include <signal.h>
    2525#undef __USE_GNU
    2626#include <stdlib.h>

  • libcfa/src/common.cfa

    r73abe95 r58b6d1b  
    1 //                               -*- Mode: C -*- 
    2 // 
     1//                               -*- Mode: C -*-
     2//
    33// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    44//
    55// The contents of this file are covered under the licence agreement in the
    66// file "LICENCE" distributed with Cforall.
    7 // 
    8 // common.c -- 
    9 // 
     7//
     8// common.c --
     9//
    1010// Author           : Peter A. Buhr
    1111// Created On       : Thu Jul 12 08:02:29 2018
    … …  
    1313// Last Modified On : Thu Jul 12 08:38:47 2018
    1414// Update Count     : 3
    15 // 
     15//
    1616
    17 #include "common"
     17#include "common.hfa"
    1818#include <stdlib.h>                                     // div_t, *div
    1919

  • libcfa/src/concurrency/alarm.hfa

    r73abe95 r58b6d1b  
    2121#include <assert.h>
    2222
    23 #include "time"
     23#include "time.hfa"
    2424
    2525struct thread_desc;

  • libcfa/src/concurrency/coroutine.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "coroutine"
     16#include "coroutine.hfa"
    1717
    1818extern "C" {

  • libcfa/src/concurrency/kernel.cfa

    r73abe95 r58b6d1b  
    2222#include <fenv.h>
    2323#include <sys/resource.h>
    24 #include <signal.hfa>
     24#include <signal.h>
    2525#include <unistd.h>
    2626}
    2727
    2828//CFA Includes
    29 #include "time"
     29#include "time.hfa"
    3030#include "kernel_private.hfa"
    3131#include "preemption.hfa"

  • libcfa/src/concurrency/kernel_private.hfa

    r73abe95 r58b6d1b  
    1616#pragma once
    1717
    18 #include "kernel"
    19 #include "thread"
     18#include "kernel.hfa"
     19#include "thread.hfa"
    2020
    2121#include "alarm.hfa"

  • libcfa/src/concurrency/monitor.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "monitor"
     16#include "monitor.hfa"
    1717
    1818#include <stdlib.hfa>
    … …  
    2121#include "kernel_private.hfa"
    2222
    23 #include "bits/algorithms.hfa"
     23#include "bits/algorithm.hfa"
    2424
    2525//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/monitor.hfa

    r73abe95 r58b6d1b  
    2020#include <assert.h>
    2121#include "invoke.h"
    22 #include "stdlib"
     22#include "stdlib.hfa"
    2323
    2424trait is_monitor(dtype T) {

  • libcfa/src/concurrency/mutex.cfa

    r73abe95 r58b6d1b  
    1616//
    1717
    18 #include "mutex"
     18#include "mutex.hfa"
    1919
    2020#include "kernel_private.hfa"

  • libcfa/src/concurrency/mutex.hfa

    r73abe95 r58b6d1b  
    2020#include <stdbool.h>
    2121
    22 #include "bits/algorithms.hfa"
     22#include "bits/algorithm.hfa"
    2323#include "bits/locks.hfa"
    2424

  • libcfa/src/concurrency/thread.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "thread"
     16#include "thread.hfa"
    1717
    1818#include "kernel_private.hfa"

  • libcfa/src/concurrency/thread.hfa

    r73abe95 r58b6d1b  
    1919#include "invoke.h"
    2020
    21 #include "coroutine"
    22 #include "kernel"
    23 #include "monitor"
     21#include "coroutine.hfa"
     22#include "kernel.hfa"
     23#include "monitor.hfa"
    2424
    2525//-----------------------------------------------------------------------------

  • libcfa/src/containers/maybe.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include <containers/maybe>
     16#include <containers/maybe.hfa>
    1717#include <assert.h>
    1818

  • libcfa/src/containers/pair.cfa

    r73abe95 r58b6d1b  
    1111//
    1212
    13 #include <containers/pair>
     13#include <containers/pair.hfa>
    1414
    15 forall(otype R, otype S 
     15forall(otype R, otype S
    1616        | { int ?==?(R, R); int ?<?(R, R); int ?<?(S, S); })
    1717int ?<?(pair(R, S) p, pair(R, S) q) {
    … …  
    1919}
    2020
    21 forall(otype R, otype S 
     21forall(otype R, otype S
    2222        | { int ?==?(R, R); int ?<?(R, R); int ?<=?(S, S); })
    2323int ?<=?(pair(R, S) p, pair(R, S) q) {
    … …  
    3535}
    3636
    37 forall(otype R, otype S 
     37forall(otype R, otype S
    3838        | { int ?==?(R, R); int ?>?(R, R); int ?>?(S, S); })
    3939int ?>?(pair(R, S) p, pair(R, S) q) {
    … …  
    4141}
    4242
    43 forall(otype R, otype S 
     43forall(otype R, otype S
    4444        | { int ?==?(R, R); int ?>?(R, R); int ?>=?(S, S); })
    4545int ?>=?(pair(R, S) p, pair(R, S) q) {

  • libcfa/src/containers/result.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include <containers/result>
     16#include <containers/result.hfa>
    1717#include <assert.h>
    1818

  • libcfa/src/containers/vector.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include <containers/vector>
     16#include <containers/vector.hfa>
    1717
    1818#include <stdlib.hfa>

  • libcfa/src/fstream.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "fstream"
     16#include "fstream.hfa"
    1717
    1818#include <stdio.h>                                                                              // vfprintf, vfscanf

  • libcfa/src/fstream.hfa

    r73abe95 r58b6d1b  
    1616#pragma once
    1717
    18 #include "iostream"
     18#include "iostream.hfa"
    1919
    2020enum { sepSize = 16 };

  • libcfa/src/heap.cfa

    r73abe95 r58b6d1b  
    2626#include "bits/locks.hfa"                                                                       // __spinlock_t
    2727#include "startup.hfa"                                                                  // STARTUP_PRIORITY_MEMORY
    28 #include "stdlib"                                                                               // bsearchl
     28#include "stdlib.hfa"                                                                           // bsearchl
    2929#include "malloc.h"
    3030

  • libcfa/src/interpose.cfa

    r73abe95 r58b6d1b  
    1818#include <unistd.h>                                                                             // _exit, getpid
    1919#define __USE_GNU
    20 #include <signal.hfa>
     20#include <signal.h>
    2121#undef __USE_GNU
    2222extern "C" {

  • libcfa/src/iostream.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "iostream"
     16#include "iostream.hfa"
    1717
    1818extern "C" {

  • libcfa/src/iostream.hfa

    r73abe95 r58b6d1b  
    1616#pragma once
    1717
    18 #include "iterator"
     18#include "iterator.hfa"
    1919
    2020trait ostream( dtype ostype ) {

  • libcfa/src/iterator.cfa

    r73abe95 r58b6d1b  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // iterator.c -- 
     7// iterator.c --
    88//
    99// Author           : Richard C. Bilson
    … …  
    1414//
    1515
    16 #include "iterator"
     16#include "iterator.hfa"
    1717
    1818forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) )

  • libcfa/src/limits.cfa

    r73abe95 r58b6d1b  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // limits.c -- 
    8 // 
     6//
     7// limits.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed Apr  6 18:06:52 2016
    … …  
    1212// Last Modified On : Thu Mar  1 16:22:51 2018
    1313// Update Count     : 74
    14 // 
     14//
    1515
    1616#include <limits.h>
    … …  
    1919#include <math.h>
    2020#include <complex.h>
    21 #include "limits"
     21#include "limits.hfa"
    2222
    2323// Integral Constants

  • libcfa/src/math.hfa

    r73abe95 r58b6d1b  
    350350//---------------------------------------
    351351
    352 #include "common"
     352#include "common.hfa"
    353353
    354354//---------------------------------------

  • libcfa/src/rational.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "rational"
    17 #include "fstream"
    18 #include "stdlib"
     16#include "rational.hfa"
     17#include "fstream.hfa"
     18#include "stdlib.hfa"
    1919
    2020forall( otype RationalImpl | arithmetic( RationalImpl ) ) {

  • libcfa/src/rational.hfa

    r73abe95 r58b6d1b  
    1818#pragma once
    1919
    20 #include "iostream"
     20#include "iostream.hfa"
    2121
    2222trait scalar( otype T ) {

  • libcfa/src/stdlib.cfa

    r73abe95 r58b6d1b  
    1414//
    1515
    16 #include "stdlib"
     16#include "stdlib.hfa"
    1717
    1818//---------------------------------------

  • libcfa/src/stdlib.hfa

    r73abe95 r58b6d1b  
    251251//---------------------------------------
    252252
    253 #include "common"
     253#include "common.hfa"
    254254
    255255// Local Variables: //

  • libcfa/src/time.cfa

    r73abe95 r58b6d1b  
    1 // 
     1//
    22// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // time.c -- 
    8 // 
     6//
     7// time.c --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Tue Mar 27 13:33:14 2018
    … …  
    1212// Last Modified On : Sun May  6 22:26:00 2018
    1313// Update Count     : 37
    14 // 
     14//
    1515
    16 #include "time"
    17 #include "iostream"
     16#include "time.hfa"
     17#include "iostream.hfa"
    1818#include <stdio.h>                                                                              // snprintf
    1919#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.