Ignore:
Timestamp:
Dec 15, 2016, 5:16:42 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
43385ca, f7ff3fb
Parents:
5802a4f (diff), 596f987b (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' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:
1 moved

Legend:

Unmodified
Added
Removed
  • src/prelude/prelude.cf

    r5802a4f r66f8528  
    2222// ------------------------------------------------------------
    2323
    24 const int 0, 1;
    25 
    26 forall ( dtype DT ) const DT * const    0;
    27 forall ( ftype FT ) FT * const          0;
     24//We have none
    2825
    2926// ------------------------------------------------------------
     
    249246// ------------------------------------------------------------
    250247
    251 signed int ?==?( _Bool, _Bool ),                                        ?!=?( _Bool, _Bool );
    252 signed int ?==?( signed int, signed int ),                              ?!=?( signed int, signed int );
    253 signed int ?==?( unsigned int, unsigned int ),                          ?!=?( unsigned int, unsigned int );
    254 signed int ?==?( signed long int, signed long int ),                    ?!=?( signed long int, signed long int );
    255 signed int ?==?( unsigned long int, unsigned long int ),                ?!=?( unsigned long int, unsigned long int );
     248signed int ?==?( _Bool, _Bool ),                                                        ?!=?( _Bool, _Bool );
     249signed int ?==?( signed int, signed int ),                                      ?!=?( signed int, signed int );
     250signed int ?==?( unsigned int, unsigned int ),                                  ?!=?( unsigned int, unsigned int );
     251signed int ?==?( signed long int, signed long int ),                            ?!=?( signed long int, signed long int );
     252signed int ?==?( unsigned long int, unsigned long int ),                        ?!=?( unsigned long int, unsigned long int );
    256253signed int ?==?( signed long long int, long long int  signed),          ?!=?( signed long long int, signed long long int );
    257254signed int ?==?( unsigned long long int, unsigned long long int ),      ?!=?( unsigned long long int, unsigned long long int );
    258 signed int ?==?( float, float ),                                        ?!=?( float, float );
    259 signed int ?==?( double, double ),                                      ?!=?( double, double );
    260 signed int ?==?( long double, long double ),                            ?!=?( long double, long double );
    261 signed int ?==?( float _Complex, float _Complex ),                      ?!=?( float _Complex, float _Complex );
    262 signed int ?==?( double _Complex, double _Complex ),                    ?!=?( double _Complex, double _Complex );
     255signed int ?==?( float, float ),                                                        ?!=?( float, float );
     256signed int ?==?( double, double ),                                                      ?!=?( double, double );
     257signed int ?==?( long double, long double ),                                    ?!=?( long double, long double );
     258signed int ?==?( float _Complex, float _Complex ),                              ?!=?( float _Complex, float _Complex );
     259signed int ?==?( double _Complex, double _Complex ),                            ?!=?( double _Complex, double _Complex );
    263260signed int ?==?( long double _Complex, long double _Complex ),          ?!=?( long double _Complex, long double _Complex );
     261signed int ?==?( zero_t, zero_t ),                                                      ?!=?( zero_t, zero_t );
     262signed int ?==?( one_t, one_t ),                                                        ?!=?( one_t, one_t );
    264263
    265264forall( dtype DT ) signed int ?==?(                DT *,                DT * );
     
    274273forall( ftype FT ) signed int ?!=?( FT *, FT * );
    275274
    276 forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
    277 forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
    278 forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
    279 forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
    280 
    281 forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
    282 forall( dtype DT ) signed int ?==?( forall( dtype DT2 )const DT2 *, const volatile DT * );
    283 forall( ftype FT ) signed int ?==?( FT *, forall( ftype FT2 )FT2 * );
    284 forall( ftype FT ) signed int ?==?( forall( ftype FT2 )FT2 *, FT * );
    285 forall( dtype DT ) signed int ?!=?( const volatile DT *, forall( dtype DT2 )const DT2 * );
    286 forall( dtype DT ) signed int ?!=?( forall( dtype DT2 )const DT2 *, const volatile DT * );
    287 forall( ftype FT ) signed int ?!=?( FT *, forall( ftype FT2 )FT2 * );
    288 forall( ftype FT ) signed int ?!=?( forall( ftype FT2 )FT2 *, FT * );
     275// forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
     276// forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
     277// forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
     278// forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
     279
     280// forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
     281// forall( dtype DT ) signed int ?==?( forall( dtype DT2 )const DT2 *, const volatile DT * );
     282// forall( ftype FT ) signed int ?==?( FT *, forall( ftype FT2 )FT2 * );
     283// forall( ftype FT ) signed int ?==?( forall( ftype FT2 )FT2 *, FT * );
     284// forall( dtype DT ) signed int ?!=?( const volatile DT *, forall( dtype DT2 )const DT2 * );
     285// forall( dtype DT ) signed int ?!=?( forall( dtype DT2 )const DT2 *, const volatile DT * );
     286// forall( ftype FT ) signed int ?!=?( FT *, forall( ftype FT2 )FT2 * );
     287// forall( ftype FT ) signed int ?!=?( forall( ftype FT2 )FT2 *, FT * );
    289288
    290289// ------------------------------------------------------------
     
    458457signed long long int    ?=?( signed long long int *, signed long long int ),    ?=?( volatile signed long long int *, signed long long int );
    459458unsigned long long int  ?=?( unsigned long long int *, unsigned long long int ), ?=?( volatile unsigned long long int *, unsigned long long int );
     459zero_t          ?=?( zero_t *, zero_t );
     460one_t                   ?=?( one_t *, one_t );
     461
    460462
    461463_Bool                   ?*=?( _Bool *, _Bool ),                                 ?*=?( volatile _Bool *, _Bool );
     
    654656void    ?{}( double _Complex * );
    655657void    ?{}( long double _Complex * );
     658void    ?{}( zero_t * );
     659void    ?{}( one_t * );
    656660
    657661// copy ctor
     
    674678void    ?{}( double _Complex *, double _Complex);
    675679void    ?{}( long double _Complex *, long double _Complex);
     680void    ?{}( zero_t *, zero_t );
     681void    ?{}( one_t *, one_t );
    676682
    677683// dtor
     
    694700void    ^?{}( double _Complex * );
    695701void    ^?{}( long double _Complex * );
     702void    ^?{}( zero_t * );
     703void    ^?{}( one_t * );
    696704
    697705// // default ctor
Note: See TracChangeset for help on using the changeset viewer.