Changeset 79b5869 for src/prelude/prelude.cf

Timestamp:

May 24, 2017, 5:27:07 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

d997f8e

Parents:

79308c8e (diff), cf0b892 (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

File:

• src/prelude/prelude.cf (modified) (3 diffs)

src/prelude/prelude.cf

@@ -309 +309 @@
 // 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 *, zero_t );
+// forall( dtype DT ) signed int ?==?( zero_t, const volatile DT * );
+// forall( ftype FT ) signed int ?==?( FT *, zero_t );
+// forall( ftype FT ) signed int ?==?( zero_t, FT * );
+// forall( dtype DT ) signed int ?!=?( const volatile DT *, zero_t );
+// forall( dtype DT ) signed int ?!=?( zero_t, const volatile DT * );
+// forall( ftype FT ) signed int ?!=?( FT *, zero_t );
+// forall( ftype FT ) signed int ?!=?( zero_t, FT * );
 
 // ------------------------------------------------------------
@@ -447 +447 @@
 const volatile void *   ?=?( const volatile void * volatile *, const volatile void * );
 
-//forall( dtype DT ) DT *                       ?=?(                DT *          *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) DT *                       ?=?(                DT * volatile *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) const DT *           ?=?( const          DT *          *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) const DT *           ?=?( const          DT * volatile *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) volatile DT *      ?=?( volatile       DT *          *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) volatile DT *      ?=?( volatile       DT * volatile *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile DT *          *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) const volatile DT *  ?=?( const volatile DT * volatile *, forall( dtype DT2 ) const DT2 * );
-
-forall( ftype FT ) FT *                 ?=?( FT *          *, forall( ftype FT2 ) FT2 * );
-forall( ftype FT ) FT *                 ?=?( FT * volatile *, forall( ftype FT2 ) FT2 * );
+// //forall( dtype DT ) DT *                    ?=?(                DT *          *, zero_t );
+// //forall( dtype DT ) DT *                    ?=?(                DT * volatile *, zero_t );
+// forall( dtype DT ) const DT *                ?=?( const          DT *          *, zero_t );
+// forall( dtype DT ) const DT *                ?=?( const          DT * volatile *, zero_t );
+// //forall( dtype DT ) volatile DT *   ?=?( volatile       DT *          *, zero_t );
+// //forall( dtype DT ) volatile DT *   ?=?( volatile       DT * volatile *,  );
+// forall( dtype DT ) const volatile DT *       ?=?( const volatile DT *          *, zero_t );
+// forall( dtype DT ) const volatile DT *       ?=?( const volatile DT * volatile *, zero_t );
+
+// forall( ftype FT ) FT *                      ?=?( FT *          *, zero_t );
+// forall( ftype FT ) FT *                      ?=?( FT * volatile *, zero_t );
 
 forall( dtype T | sized(T) ) T *                        ?+=?(                T *          *, ptrdiff_t );
@@ -799 +799 @@
 void    ?{}( const volatile void *          *, const volatile void * );
 
-//forall( dtype DT ) void ?{}(              DT *          *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) void ?{}(              DT * volatile *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) void ?{}( const          DT *          *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) void ?{}( volatile     DT *          *, forall( dtype DT2 ) const DT2 * );
-//forall( dtype DT ) void ?{}( volatile     DT * volatile *, forall( dtype DT2 ) const DT2 * );
-forall( dtype DT ) void ?{}( const volatile DT *          *, forall( dtype DT2 ) const DT2 * );
-
-forall( ftype FT ) void ?{}( FT *          *, forall( ftype FT2 ) FT2 * );
+// //forall( dtype DT ) void ?{}(                   DT *          *, zero_t );
+// //forall( dtype DT ) void ?{}(                   DT * volatile *, zero_t );
+// forall( dtype DT ) void ?{}( const       DT *          *, zero_t );
+// //forall( dtype DT ) void ?{}( volatile          DT *          *, zero_t );
+// //forall( dtype DT ) void ?{}( volatile          DT * volatile *, zero_t );
+// forall( dtype DT ) void ?{}( const volatile DT *       *, zero_t );
+
+// forall( ftype FT ) void      ?{}( FT *          *, zero_t );
 
 // default ctors