Changeset ee6dbae for libcfa

Timestamp:

Jul 11, 2019, 1:34:37 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

302d84c2, 7870799

Parents:

d6a8aef (diff), 1d760934 (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:

libcfa

Files:

• prelude/builtins.c (modified) (3 diffs)
• src/bits/containers.hfa (modified) (4 diffs)
• src/executor.cfa (added)
• src/stdlib.cfa (modified) (2 diffs)

libcfa/prelude/builtins.c

@@ -10 +10 @@
 // Created On       : Fri Jul 21 16:21:03 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 26 23:10:36 2019
-// Update Count     : 95
+// Last Modified On : Tue Jun 25 18:06:52 2019
+// Update Count     : 97
 //
 
@@ -49 +49 @@
 void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
-// increment/decrement unification
+// implicit increment, decrement if += defined, and implicit not if != defined
 
 static inline {
@@ -63 +63 @@
         forall( dtype DT | sized(DT) | { void ?{}( DT &, DT ); void ^?{}( DT & ); DT & ?-=?( DT &, one_t ); } )
         DT & ?--( DT & x ) { DT tmp = x; x -= 1; return tmp; }
+
+        forall( dtype DT | { int ?!=?( const DT &, zero_t ); } )
+        int !?( const DT & x ) { return !( x != 0 ); }
 } // distribution
 

libcfa/src/bits/containers.hfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 16:38:50 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 26 08:52:20 2019
+// Update Count     : 4
 
 #pragma once
@@ -115 +115 @@
                 }
                 return top;
+        }
+
+        forall(dtype T | is_node(T))
+        static inline int ?!=?( const __stack(T) & this, __attribute__((unused)) zero_t zero ) {
+                return this.top != 0;
         }
 #endif
@@ -186 +191 @@
 
         forall(dtype T | is_node(T))
-        static inline bool ?!=?( __queue(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __queue(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }
@@ -268 +273 @@
 
         forall(dtype T | sized(T))
-        static inline bool ?!=?( __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 08:03:59 2018
-// Update Count     : 458
+// Last Modified On : Mon Jun 24 17:34:44 2019
+// Update Count     : 462
 //
 
@@ -65 +65 @@
 forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } )
 T * anew( size_t dim, Params p ) {
-        T *arr = alloc( dim );
+        T * arr = alloc( dim );
         for ( unsigned int i = 0; i < dim; i += 1 ) {
                 (arr[i]){ p };                                                                  // run constructor