Changeset 9d85038
- Timestamp:
- Jun 16, 2017, 4:06:45 PM (7 years ago)
- 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:
- 3373f87
- Parents:
- 1bc9dcb (diff), 667c7da (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. - Location:
- src
- Files:
-
- 4 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/libcfa/containers/maybe
r1bc9dcb r9d85038 10 10 // Created On : Wed May 24 14:43:00 2017 11 11 // Last Modified By : Andrew Beach 12 // Last Modified On : Thr May 25 16:36:00 201713 // Update Count : 112 // Last Modified On : Fri Jun 16 15:42:00 2017 13 // Update Count : 2 14 14 // 15 15 … … 46 46 bool ?!=?(maybe(T) this, zero_t); 47 47 48 /* Waiting for bug#11 to be fixed. 48 49 forall(otype T) 49 50 maybe(T) maybe_value(T value); … … 51 52 forall(otype T) 52 53 maybe(T) maybe_none(); 54 */ 53 55 54 56 forall(otype T) -
src/libcfa/containers/result
r1bc9dcb r9d85038 10 10 // Created On : Wed May 24 14:45:00 2017 11 11 // Last Modified By : Andrew Beach 12 // Last Modified On : Thr May 25 16:39:00 201713 // Update Count : 112 // Last Modified On : Fri Jun 16 15:41:00 2017 13 // Update Count : 2 14 14 // 15 15 … … 55 55 bool ?!=?(result(T, E) this, zero_t); 56 56 57 /* Wating for bug#11 to be fixed. 57 58 forall(otype T, otype E) 58 59 result(T, E) result_value(T value); … … 60 61 forall(otype T, otype E) 61 62 result(T, E) result_error(E error); 63 */ 62 64 63 65 forall(otype T, otype E) -
src/libcfa/containers/result.c
r1bc9dcb r9d85038 74 74 forall(otype T, otype E) 75 75 bool ?!=?(result(T, E) this, zero_t) { 76 return !this.has_value;76 return this.has_value; 77 77 } 78 78 … … 100 100 forall(otype T, otype E) 101 101 E get_error(result(T, E) * this) { 102 assertf( this->has_value, "attempt to get from result without error");102 assertf(!this->has_value, "attempt to get from result without error"); 103 103 return this->error; 104 104 } -
src/tests/preempt_longrun/Makefile.am
r1bc9dcb r9d85038 32 32 all-local: ${TESTS:=.run} 33 33 34 % : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa34 % : %.c ${CC} 35 35 ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} 36 36 -
src/tests/preempt_longrun/Makefile.in
r1bc9dcb r9d85038 466 466 all-local: ${TESTS:=.run} 467 467 468 % : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa468 % : %.c ${CC} 469 469 ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@} 470 470
Note: See TracChangeset
for help on using the changeset viewer.