Changeset 9d85038


Ignore:
Timestamp:
Jun 16, 2017, 4:06:45 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
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.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
src
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/containers/maybe

    r1bc9dcb r9d85038  
    1010// Created On       : Wed May 24 14:43:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Thr May 25 16:36:00 2017
    13 // Update Count     : 1
     12// Last Modified On : Fri Jun 16 15:42:00 2017
     13// Update Count     : 2
    1414//
    1515
     
    4646bool ?!=?(maybe(T) this, zero_t);
    4747
     48/* Waiting for bug#11 to be fixed.
    4849forall(otype T)
    4950maybe(T) maybe_value(T value);
     
    5152forall(otype T)
    5253maybe(T) maybe_none();
     54*/
    5355
    5456forall(otype T)
  • src/libcfa/containers/result

    r1bc9dcb r9d85038  
    1010// Created On       : Wed May 24 14:45:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Thr May 25 16:39:00 2017
    13 // Update Count     : 1
     12// Last Modified On : Fri Jun 16 15:41:00 2017
     13// Update Count     : 2
    1414//
    1515
     
    5555bool ?!=?(result(T, E) this, zero_t);
    5656
     57/* Wating for bug#11 to be fixed.
    5758forall(otype T, otype E)
    5859result(T, E) result_value(T value);
     
    6061forall(otype T, otype E)
    6162result(T, E) result_error(E error);
     63*/
    6264
    6365forall(otype T, otype E)
  • src/libcfa/containers/result.c

    r1bc9dcb r9d85038  
    7474forall(otype T, otype E)
    7575bool ?!=?(result(T, E) this, zero_t) {
    76         return !this.has_value;
     76        return this.has_value;
    7777}
    7878
     
    100100forall(otype T, otype E)
    101101E 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");
    103103        return this->error;
    104104}
  • src/tests/preempt_longrun/Makefile.am

    r1bc9dcb r9d85038  
    3232all-local: ${TESTS:=.run}
    3333
    34 % : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
     34% : %.c ${CC}
    3535        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
    3636
  • src/tests/preempt_longrun/Makefile.in

    r1bc9dcb r9d85038  
    466466all-local: ${TESTS:=.run}
    467467
    468 % : %.c /u0/tdelisle/workspace/cfa-cc/bin/cfa
     468% : %.c ${CC}
    469469        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
    470470
Note: See TracChangeset for help on using the changeset viewer.