Changeset 66f8528 for src/prelude

Timestamp:

Dec 15, 2016, 5:16:42 PM (8 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

Location:

src/prelude

Files:

• Makefile.am (added)
• Makefile.in (added)
• builtins.c (moved) (moved from src/libcfa/builtins.c)
• builtins.def (moved) (moved from src/libcfa/builtins.def)
• extras.c (moved) (moved from src/libcfa/extras.c)
• extras.regx (moved) (moved from src/libcfa/extras.regx)
• prelude.cf (moved) (moved from src/libcfa/prelude.cf) (7 diffs)
• prototypes.awk (moved) (moved from src/libcfa/prototypes.awk)
• prototypes.c (moved) (moved from src/libcfa/prototypes.c)

src/prelude/prelude.cf

@@ -22 +22 @@
 // ------------------------------------------------------------
 
-const int 0, 1;
-
-forall ( dtype DT ) const DT * const    0;
-forall ( ftype FT ) FT * const          0;
+//We have none
 
 // ------------------------------------------------------------
@@ -249 +246 @@
 // ------------------------------------------------------------
 
-signed int ?==?( _Bool, _Bool ),                                        ?!=?( _Bool, _Bool );
-signed int ?==?( signed int, signed int ),                              ?!=?( signed int, signed int );
-signed int ?==?( unsigned int, unsigned int ),                          ?!=?( unsigned int, unsigned int );
-signed int ?==?( signed long int, signed long int ),                    ?!=?( signed long int, signed long int );
-signed int ?==?( unsigned long int, unsigned long int ),                ?!=?( unsigned long int, unsigned long int );
+signed int ?==?( _Bool, _Bool ),                                                        ?!=?( _Bool, _Bool );
+signed int ?==?( signed int, signed int ),                                      ?!=?( signed int, signed int );
+signed int ?==?( unsigned int, unsigned int ),                                  ?!=?( unsigned int, unsigned int );
+signed int ?==?( signed long int, signed long int ),                            ?!=?( signed long int, signed long int );
+signed int ?==?( unsigned long int, unsigned long int ),                        ?!=?( unsigned long int, unsigned long int );
 signed int ?==?( signed long long int, long long int  signed),          ?!=?( signed long long int, signed long long int );
 signed int ?==?( unsigned long long int, unsigned long long int ),      ?!=?( unsigned long long int, unsigned long long int );
-signed int ?==?( float, float ),                                        ?!=?( float, float );
-signed int ?==?( double, double ),                                      ?!=?( double, double );
-signed int ?==?( long double, long double ),                            ?!=?( long double, long double );
-signed int ?==?( float _Complex, float _Complex ),                      ?!=?( float _Complex, float _Complex );
-signed int ?==?( double _Complex, double _Complex ),                    ?!=?( double _Complex, double _Complex );
+signed int ?==?( float, float ),                                                        ?!=?( float, float );
+signed int ?==?( double, double ),                                                      ?!=?( double, double );
+signed int ?==?( long double, long double ),                                    ?!=?( long double, long double );
+signed int ?==?( float _Complex, float _Complex ),                              ?!=?( float _Complex, float _Complex );
+signed int ?==?( double _Complex, double _Complex ),                            ?!=?( double _Complex, double _Complex );
 signed int ?==?( long double _Complex, long double _Complex ),          ?!=?( long double _Complex, long double _Complex );
+signed int ?==?( zero_t, zero_t ),                                                      ?!=?( zero_t, zero_t );
+signed int ?==?( one_t, one_t ),                                                        ?!=?( one_t, one_t );
 
 forall( dtype DT ) signed int ?==?(                DT *,                DT * );
@@ -274 +273 @@
 forall( ftype FT ) signed int ?!=?( FT *, FT * );
 
-forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
-forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
-forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
-forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
-
-forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
-forall( dtype DT ) signed int ?==?( forall( dtype DT2 )const DT2 *, const volatile DT * );
-forall( ftype FT ) signed int ?==?( FT *, forall( ftype FT2 )FT2 * );
-forall( ftype FT ) signed int ?==?( forall( ftype FT2 )FT2 *, FT * );
-forall( dtype DT ) signed int ?!=?( const volatile DT *, forall( dtype DT2 )const DT2 * );
-forall( dtype DT ) signed int ?!=?( forall( dtype DT2 )const DT2 *, const volatile DT * );
-forall( ftype FT ) signed int ?!=?( FT *, forall( ftype FT2 )FT2 * );
-forall( ftype FT ) signed int ?!=?( forall( ftype FT2 )FT2 *, FT * );
+// forall( dtype DT ) signed int ?==?( const volatile DT   *, const volatile void * );
+// forall( dtype DT ) signed int ?==?( const volatile void *, const volatile DT * );
+// forall( dtype DT ) signed int ?!=?( const volatile DT   *, const volatile void * );
+// forall( dtype DT ) signed int ?!=?( const volatile void *, const volatile DT * );
+
+// forall( dtype DT ) signed int ?==?( const volatile DT *, forall( dtype DT2 )const DT2 * );
+// forall( dtype DT ) signed int ?==?( forall( dtype DT2 )const DT2 *, const volatile DT * );
+// forall( ftype FT ) signed int ?==?( FT *, forall( ftype FT2 )FT2 * );
+// forall( ftype FT ) signed int ?==?( forall( ftype FT2 )FT2 *, FT * );
+// forall( dtype DT ) signed int ?!=?( const volatile DT *, forall( dtype DT2 )const DT2 * );
+// forall( dtype DT ) signed int ?!=?( forall( dtype DT2 )const DT2 *, const volatile DT * );
+// forall( ftype FT ) signed int ?!=?( FT *, forall( ftype FT2 )FT2 * );
+// forall( ftype FT ) signed int ?!=?( forall( ftype FT2 )FT2 *, FT * );
 
 // ------------------------------------------------------------
@@ -458 +457 @@
 signed long long int    ?=?( signed long long int *, signed long long int ),    ?=?( volatile signed long long int *, signed long long int );
 unsigned long long int  ?=?( unsigned long long int *, unsigned long long int ), ?=?( volatile unsigned long long int *, unsigned long long int );
+zero_t          ?=?( zero_t *, zero_t );
+one_t                   ?=?( one_t *, one_t );
+
 
 _Bool                   ?*=?( _Bool *, _Bool ),                                 ?*=?( volatile _Bool *, _Bool );
@@ -654 +656 @@
 void    ?{}( double _Complex * );
 void    ?{}( long double _Complex * );
+void    ?{}( zero_t * );
+void    ?{}( one_t * );
 
 // copy ctor
@@ -674 +678 @@
 void    ?{}( double _Complex *, double _Complex);
 void    ?{}( long double _Complex *, long double _Complex);
+void    ?{}( zero_t *, zero_t );
+void    ?{}( one_t *, one_t );
 
 // dtor
@@ -694 +700 @@
 void    ^?{}( double _Complex * );
 void    ^?{}( long double _Complex * );
+void    ^?{}( zero_t * );
+void    ^?{}( one_t * );
 
 // // default ctor