Changeset b3f9a0cb for src/libcfa


Ignore:
Timestamp:
Apr 4, 2016, 1:18:17 PM (10 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, stuck-waitfor-destruct, with_gc
Children:
afc1045
Parents:
89173242 (diff), 3cfe27f (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:
11 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • src/libcfa/Makefile.am

    r89173242 rb3f9a0cb  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Wed Feb  3 11:19:35 2016
    14 ## Update Count     : 117
     13## Last Modified On : Wed Mar  2 22:59:23 2016
     14## Update Count     : 119
    1515###############################################################################
    1616
    … …  
    6363libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
    6464
    65 cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math
     65cheaders = #  expat
    6666cfaheaders = limits
    6767include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}

  • src/libcfa/Makefile.in

    r89173242 rb3f9a0cb  
    215215libs = stdlib iostream fstream iterator
    216216libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
    217 cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math
     217cheaders = #  expat
    218218cfaheaders = limits
    219219include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}

  • src/libcfa/builtins.cf

    r89173242 rb3f9a0cb  
    584584int __builtin_LINE();
    585585extern const char *__PRETTY_FUNCTION__;
    586 typedef int wchar_t;

  • src/libcfa/iostream.c

    r89173242 rb3f9a0cb  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar  2 18:06:35 2016
    13 // Update Count     : 208
     12// Last Modified On : Mon Mar  7 13:51:23 2016
     13// Update Count     : 227
    1414//
    1515
    … …  
    133133forall( dtype ostype | ostream( ostype ) )
    134134ostype * ?|?( ostype *os, const char *cp ) {
     135        enum { Open = 1, Close, OpenClose };
     136        static const char mask[256] = {
     137                // opening delimiters
     138                ['('] : Open, ['['] : Open, ['{'] : Open,
     139                ['$'] : Open, [L'£'] : Open, [L'¥'] : Open, [L'¢'] : Open, [L'¿'] : Open, [L'«'] : Open,
     140                // closing delimiters
     141                [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
     142                [')'] : Close, [']'] : Close, ['}'] : Close,
     143                ['%'] : Close, [L'»'] : Close,
     144                // opening-closing delimiters
     145                ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
     146        }; // mask
     147
    135148        int len = strlen( cp );
    136149        // null string => no separator
    137150  if ( len == 0 ) { sepOff( os ); return os; }
    138         // first character NOT spacing or special punctuation => add left separator
    139         if ( sepPrt( os ) && isspace( cp[0] ) == 0 && cp[0] != '.' && cp[0] != ',' ) {
     151        // first character NOT spacing or closing punctuation => add left separator
     152        if ( sepPrt( os ) && isspace( cp[0] ) == 0 && mask[ cp[0] ] != Close && mask[ cp[0] ] != OpenClose ) {
    140153                prtfmt( os, "%s", sepGet( os ) );
    141154        } // if
    142         // last character is spacing or special punctuation => turn off separator for next item
     155        // last character IS spacing or opening punctuation => turn off separator for next item
    143156        unsigned int posn = len - 1;
    144         if ( isspace( cp[posn] ) || cp[posn] == ':' || cp[posn] == '$' ) {
     157        if ( isspace( cp[posn] ) || mask[ cp[posn] ] == Open || mask[ cp[posn] ] == OpenClose ) {
    145158                sepOff( os );
    146159        } else {

  • src/libcfa/stdlib

    r89173242 rb3f9a0cb  
    1010// Created On       : Thu Jan 28 17:12:35 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar  2 17:38:21 2016
    13 // Update Count     : 64
     12// Last Modified On : Tue Mar 22 22:34:24 2016
     13// Update Count     : 69
    1414//
    1515
    … …  
    1919#include <stddef.h>                                                                             // size_t
    2020} // extern "C"
    21 
    22 forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
    23 forall( otype T ) T * memset( T * ptr );                                        // remove when default value available
    2421
    2522forall( otype T ) T * malloc( void );
    … …  
    3431forall( otype T ) T * memalign( size_t alignment );             // deprecated
    3532forall( otype T ) int posix_memalign( T ** ptr, size_t alignment );
     33
     34forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
     35forall( otype T ) T * memset( T * ptr );                                // remove when default value available
    3636
    3737//---------------------------------------
    … …  
    9393//---------------------------------------
    9494
    95 void randseed( long int s );
    96 char random();
    97 int random();
    98 unsigned int random();
    99 long int random();
    100 unsigned long int random();
    101 float random();
    102 double random();
    103 float _Complex random();
    104 double _Complex random();
    105 long double _Complex random();
     95void rand48seed( long int s );
     96char rand48();
     97int rand48();
     98unsigned int rand48();
     99long int rand48();
     100unsigned long int rand48();
     101float rand48();
     102double rand48();
     103float _Complex rand48();
     104double _Complex rand48();
     105long double _Complex rand48();
    106106
    107107//---------------------------------------

  • src/libcfa/stdlib.c

    r89173242 rb3f9a0cb  
    1010// Created On       : Thu Jan 28 17:10:29 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar  2 17:38:47 2016
    13 // Update Count     : 143
     12// Last Modified On : Wed Mar 23 13:26:42 2016
     13// Update Count     : 146
    1414//
    1515
    … …  
    2626#include <complex.h>                                                                    // _Complex_I, cabsf, cabs, cabsl
    2727} // extern "C"
    28 
    29 forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
    30         printf( "memset1\n" );
    31     return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
    32 } // memset
    33 forall( otype T ) T * memset( T * ptr ) {                               // remove when default value available
    34         printf( "memset2\n" );
    35     return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
    36 } // memset
    3728
    3829forall( otype T ) T * malloc( void ) {
    … …  
    9182} // posix_memalign
    9283
     84forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
     85        printf( "memset1\n" );
     86    return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
     87} // memset
     88forall( otype T ) T * memset( T * ptr ) {                               // remove when default value available
     89        printf( "memset2\n" );
     90    return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
     91} // memset
     92
    9393//---------------------------------------
    9494
    … …  
    243243//---------------------------------------
    244244
    245 void randseed( long int s ) { srand48( s ); }
    246 char random() { return lrand48(); }
    247 int random() { return mrand48(); }
    248 unsigned int random() { return lrand48(); }
    249 long int random() { return mrand48(); }
    250 unsigned long int random() { return lrand48(); }
    251 float random() { return (float)drand48(); }                             // otherwise float uses lrand48
    252 double random() { return drand48(); }
    253 float _Complex random() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
    254 double _Complex random() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
    255 long double _Complex random() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
     245void rand48seed( long int s ) { srand48( s ); }
     246char rand48() { return mrand48(); }
     247int rand48() { return mrand48(); }
     248unsigned int rand48() { return lrand48(); }
     249long int rand48() { return mrand48(); }
     250unsigned long int rand48() { return lrand48(); }
     251float rand48() { return (float)drand48(); }                             // otherwise float uses lrand48
     252double rand48() { return drand48(); }
     253float _Complex rand48() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
     254double _Complex rand48() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
     255long double _Complex rand48() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
    256256
    257257//---------------------------------------
Note: See TracChangeset for help on using the changeset viewer.