Changeset ee06e41b for libcfa/src/containers

Timestamp:

Feb 18, 2019, 1:04:30 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d08beee

Parents:

ada4575

Message:

add char, signed char, unsigned char to basic types in prologue

Location:

libcfa/src/containers

Files:

• maybe.cfa (modified) (2 diffs)
• result.cfa (modified) (2 diffs)

libcfa/src/containers/maybe.cfa

@@ -10 +10 @@
 // Created On       : Wed May 24 15:40:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:23:50 2017
-// Update Count     : 2
+// Last Modified On : Sun Feb 17 11:22:03 2019
+// Update Count     : 3
 //
 
@@ -39 +39 @@
 forall(otype T)
 maybe(T) ?=?(maybe(T) & this, maybe(T) that) {
-        if (this.has_value & that.has_value) {
+        if (this.has_value && that.has_value) {
                 this.value = that.value;
         } else if (this.has_value) {

libcfa/src/containers/result.cfa

@@ -10 +10 @@
 // Created On       : Wed May 24 15:40:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:23:58 2017
-// Update Count     : 2
+// Last Modified On : Sun Feb 17 11:24:04 2019
+// Update Count     : 3
 //
 
@@ -48 +48 @@
 forall(otype T, otype E)
 result(T, E) ?=?(result(T, E) & this, result(T, E) that) {
-        if (this.has_value & that.has_value) {
+        if (this.has_value && that.has_value) {
                 this.value = that.value;
         } else if (this.has_value) {