Allow character inputs in some bit operations.

* arith.c (logand, logior, logxor): Allow one operand to be a
character, if the opposite opernad is a fixnum integer.
The result is a character.
(bit): Allow the value being tested to be a character.

* txr.1: Updated.

1 files changed, 28 insertions, 0 deletions

diff --git a/arith.c b/arith.c
index 7700ea07..abf9f1be 100644
--- a/arith.c
+++ b/arith.c
@@ -2241,6 +2241,15 @@ val logand(val a, val b)
     return zero;
 
   switch (TYPE_PAIR(type(a), type(b))) {
+  case TYPE_PAIR(NUM, CHR):
+  case TYPE_PAIR(CHR, NUM):
+    if (a == b) {
+      return a;
+    } else {
+      cnum ac = c_num(a);
+      cnum bc = c_num(b);
+      return chr(ac & bc);
+    }
   case TYPE_PAIR(NUM, NUM):
     if (a == b) {
       return a;
@@ -2282,6 +2291,15 @@ val logior(val a, val b)
     return zero;
 
   switch (TYPE_PAIR(type(a), type(b))) {
+  case TYPE_PAIR(NUM, CHR):
+  case TYPE_PAIR(CHR, NUM):
+    if (a == b) {
+      return a;
+    } else {
+      cnum ac = c_num(a);
+      cnum bc = c_num(b);
+      return chr(ac | bc);
+    }
   case TYPE_PAIR(NUM, NUM):
     if (a == b) {
       return a;
@@ -2323,6 +2341,15 @@ val logxor(val a, val b)
     return zero;
 
   switch (TYPE_PAIR(type(a), type(b))) {
+  case TYPE_PAIR(NUM, CHR):
+  case TYPE_PAIR(CHR, NUM):
+    if (a == b) {
+      return a;
+    } else {
+      cnum ac = c_num(a);
+      cnum bc = c_num(b);
+      return chr(ac ^ bc);
+    }
   case TYPE_PAIR(NUM, NUM):
     if (a == b) {
       return a;
@@ -2593,6 +2620,7 @@ val bit(val a, val bit)
 
   switch (type(a)) {
   case NUM:
+  case CHR:
     {
       cnum an = c_num(a);
       if (bn < (SIZEOF_PTR * CHAR_BIT))