Changes in / [9d85038:1bc9dcb]

Location:

src

Files:

• libcfa/containers/maybe (modified) (3 diffs)
• libcfa/containers/result (modified) (3 diffs)
• libcfa/containers/result.c (modified) (2 diffs)
• tests/.expect/maybe.txt (deleted)
• tests/.expect/result.txt (deleted)
• tests/maybe.c (deleted)
• tests/preempt_longrun/Makefile.am (modified) (1 diff)
• tests/preempt_longrun/Makefile.in (modified) (1 diff)
• tests/result.c (deleted)

src/libcfa/containers/maybe

@@ -10 +10 @@
 // Created On       : Wed May 24 14:43:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 16 15:42:00 2017
-// Update Count     : 2
+// Last Modified On : Thr May 25 16:36:00 2017
+// Update Count     : 1
 //
 
@@ -46 +46 @@
 bool ?!=?(maybe(T) this, zero_t);
 
-/* Waiting for bug#11 to be fixed.
 forall(otype T)
 maybe(T) maybe_value(T value);
@@ -52 +51 @@
 forall(otype T)
 maybe(T) maybe_none();
-*/
 
 forall(otype T)

src/libcfa/containers/result

@@ -10 +10 @@
 // Created On       : Wed May 24 14:45:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 16 15:41:00 2017
-// Update Count     : 2
+// Last Modified On : Thr May 25 16:39:00 2017
+// Update Count     : 1
 //
 
@@ -55 +55 @@
 bool ?!=?(result(T, E) this, zero_t);
 
-/* Wating for bug#11 to be fixed.
 forall(otype T, otype E)
 result(T, E) result_value(T value);
@@ -61 +60 @@
 forall(otype T, otype E)
 result(T, E) result_error(E error);
-*/
 
 forall(otype T, otype E)

src/libcfa/containers/result.c

@@ -74 +74 @@
 forall(otype T, otype E)
 bool ?!=?(result(T, E) this, zero_t) {
-        return this.has_value;
+        return !this.has_value;
 }
 
@@ -100 +100 @@
 forall(otype T, otype E)
 E get_error(result(T, E) * this) {
-        assertf(!this->has_value, "attempt to get from result without error");
+        assertf(this->has_value, "attempt to get from result without error");
         return this->error;
 }

src/tests/preempt_longrun/Makefile.am

@@ -32 +32 @@
 all-local: ${TESTS:=.run}
 
-% : %.c ${CC}
+% : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
 

src/tests/preempt_longrun/Makefile.in

@@ -466 +466 @@
 all-local: ${TESTS:=.run}
 
-% : %.c ${CC}
+% : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}