Change symbols for bitwise operators.

gabordemooij · Aug 7, 2024 · e907d6b · e907d6b
1 parent 5f9c078
commit e907d6b
Show file tree

Hide file tree

Showing 45 changed files with 75 additions and 75 deletions.
diff --git a/base.c b/base.c
@@ -1483,32 +1483,32 @@ ctr_object* ctr_number_log(ctr_object* myself, ctr_argument* argumentList) {
 
 /**
  * @def
- * [ Number ] bit-and: [ Number ]
+ * [ Number ] & [ Number ]
  *
  * @example
- * ✎ write: (8 bit-and: 10), stop.
+ * ✎ write: (8 & 10), stop.
  */
 ctr_object* ctr_number_bit_and(ctr_object* myself, ctr_argument* argumentList) {
 	return ctr_build_number_from_float((int)myself->value.nvalue & (int)ctr_tonum(argumentList->object));
 }
 
 /**
  * @def
- * [ Number ] bit-or: [ Number ]
+ * [ Number ] | [ Number ]
  *
  * @example
- * ✎ write: (8 bit-or: 10), stop.
+ * ✎ write: (8 | 10), stop.
  */
 ctr_object* ctr_number_bit_or(ctr_object* myself, ctr_argument* argumentList) {
 	return ctr_build_number_from_float((int)myself->value.nvalue | (int)ctr_tonum(argumentList->object));
 }
 
 /**
  * @def
- * [ Number ] bit-xor: [ Number ]
+ * [ Number ] ^ [ Number ]
  *
  * @example
- * ✎ write: (8 bit-xor: 10), stop.
+ * ✎ write: (8 ^ 10), stop.
  */
 ctr_object* ctr_number_bit_xor(ctr_object* myself, ctr_argument* argumentList) {
 	return ctr_build_number_from_float((int)myself->value.nvalue ^ (int)ctr_tonum(argumentList->object));

diff --git a/i18n/xx/dictionary.h b/i18n/xx/dictionary.h
@@ -36,8 +36,8 @@
 #define CTR_DICT_UNEQUALS_SYMBOL                 "≠"
 #define CTR_DICT_NEW             "new"
 #define CTR_DICT_EQUALS          "equals:"
-#define CTR_DICT_AND             "&:"
-#define CTR_DICT_OR              "|:"
+#define CTR_DICT_AND             "&&:"
+#define CTR_DICT_OR              "||:"
 #define CTR_DICT_MODULO          "modulo:"
 #define CTR_DICT_NOR             "nor:"
 #define CTR_DICT_ONDO            "on:do:"

diff --git a/tests/test0027.ctr b/tests/test0027.ctr
@@ -1,11 +1,11 @@
 Boolean on: ‘xor:’ do: { :b
-	↲ ((⛏ &: b not) |: (⛏ not &: b)).
+	↲ ((⛏ &&: b not) ||: (⛏ not &&: b)).
 }.
 
 ✎ write: ‘Length is:’ + ‘ABCD’ length.
 ☞ x ≔ ‘ABCDE’.
 
 ✎ write: ‘Length is:’ + x length.
-((‘ABC’ length + 1 = 4) &: (2 ≠ 3)) not not true: { ✎ write: ‘Yes’. }.
-(((3 > 4) |: (4 > 2)) &: (True |: False), &: (True xor: True) not ) true: { ✎ write: ‘Yes’. }.
+((‘ABC’ length + 1 = 4) &&: (2 ≠ 3)) not not true: { ✎ write: ‘Yes’. }.
+(((3 > 4) ||: (4 > 2)) &&: (True ||: False), &&: (True xor: True) not ) true: { ✎ write: ‘Yes’. }.
 { ✎ write: ‘Running’. } run.
diff --git a/tests/test0053.ctr b/tests/test0053.ctr
@@ -6,11 +6,11 @@
 	(x < 3) false: { ✎ write: ‘FAIL’. }.
 	(x>-1) false: { ✎ write: ‘FAIL’. }.
 	x ≔ ((Boolean flip) number).
-	(x = 0 |: x = 1) false: { ✎ write: ‘FAIL’. }.
+	(x = 0 ||: x = 1) false: { ✎ write: ‘FAIL’. }.
 	x ≔ ((True flip) number).
-	(x = 0 |: x = 1) false: { ✎ write: ‘FAIL’. }.
+	(x = 0 ||: x = 1) false: { ✎ write: ‘FAIL’. }.
 	x ≔ (Boolean flip either: ‘HEAD’ or: ‘TAIL’).
-	((x = ‘HEAD’) |: (x = ‘TAIL’)) false: { ✎ write: ‘FAIL’. }.
+	((x = ‘HEAD’) ||: (x = ‘TAIL’)) false: { ✎ write: ‘FAIL’. }.
 }.
 ✎ write: ‘DONE’.
 
diff --git a/tests/test0062.ctr b/tests/test0062.ctr
@@ -1,5 +1,5 @@
 Boolean on: ‘xor:’ do: { :a :b
-	↲ ((a &: b not) |: (a not &: b)).
+	↲ ((a &&: b not) ||: (a not &&: b)).
 }.
 
 ☞ o ≔ Object new.
@@ -8,7 +8,7 @@ o on: ‘hello’ do: { ‘Empty’. }.
 { o on: ‘test’ do: 3.} catch: { :e ✎ write: e, stop. }, run.
 { o on: ‘hello’ do: { ‘Empty’. }.} catch: { :e ✎ write: e, stop. }, run. 
 { ☞ z ≔ 4 ÷ 0. } catch: { :e ✎ write: e, stop. }, run. 
-{ (True &: Nil) true: { ✎ write: ‘X’.}. } catch: { :e ✎ write: e, stop. }, run. 
+{ (True &&: Nil) true: { ✎ write: ‘X’.}. } catch: { :e ✎ write: e, stop. }, run. 
 { (‘’ xor: 0) true: { ✎ write: ‘X’.}. } catch: { :e ✎ write: e, stop. }, run. 
 { (1 < ‘2’) true: { ✎ write: ‘OK’. }. } catch: { :e ✎ write: e, stop. }, run. 
 { (1 < ‘2.0’) true: { ✎ write: ‘OK’. }. } catch: { :e ✎ write: e, stop. }, run. 

diff --git a/tests/test0089.ctr b/tests/test0089.ctr
@@ -4,7 +4,7 @@
 	☞ x ≔ Nil.
 	{
 		x ≔ Number between: a and: b.
-		((x < minimum) |: (x > maximum)) true: { 
+		((x < minimum) ||: (x > maximum)) true: { 
 			✎ write: (‘Invalid value!’).
 			Program end.
 		}.

diff --git a/tests/test0117.ctr b/tests/test0117.ctr
@@ -7,8 +7,8 @@
 (t = False) true: { ✎ write: ‘F’. }.
 ✎ write: ‘|’.
 ☞ f ≔ True.
-(t = True &: f = False) true: { ✎ write: ‘T’. }.
-(t = False &: f = True) true: { ✎ write: ‘F’. }.
+(t = True &&: f = False) true: { ✎ write: ‘T’. }.
+(t = False &&: f = True) true: { ✎ write: ‘F’. }.
 ✎ write: ‘|’.
 ☞ n ≔ Nil.
 (n Nil?) true: { ✎ write: ‘T’. }.

diff --git a/tests/test0157.ctr b/tests/test0157.ctr
@@ -23,7 +23,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3 ,&: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3 ,&&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0159.ctr b/tests/test0159.ctr
@@ -27,7 +27,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0160.ctr b/tests/test0160.ctr
@@ -23,7 +23,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0161.ctr b/tests/test0161.ctr
@@ -47,7 +47,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0162.ctr b/tests/test0162.ctr
@@ -32,7 +32,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0163.ctr b/tests/test0163.ctr
@@ -36,7 +36,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0164.ctr b/tests/test0164.ctr
@@ -30,7 +30,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0165.ctr b/tests/test0165.ctr
@@ -38,7 +38,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0166.ctr b/tests/test0166.ctr
@@ -38,7 +38,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0167.ctr b/tests/test0167.ctr
@@ -38,7 +38,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0168.ctr b/tests/test0168.ctr
@@ -34,7 +34,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0170.ctr b/tests/test0170.ctr
@@ -29,7 +29,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0171.ctr b/tests/test0171.ctr
@@ -34,7 +34,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0172.ctr b/tests/test0172.ctr
@@ -34,7 +34,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0173.ctr b/tests/test0173.ctr
@@ -80,7 +80,7 @@ a each: { :i :e ✎ write: ( i - 1 ), stop. }.
 Program clean memory.
 usedMemory3 ≔ (Program memory ? 1).
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0174.ctr b/tests/test0174.ctr
@@ -63,7 +63,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0175.ctr b/tests/test0175.ctr
@@ -47,7 +47,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0176.ctr b/tests/test0176.ctr
@@ -36,7 +36,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0177.ctr b/tests/test0177.ctr
@@ -36,7 +36,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0178.ctr b/tests/test0178.ctr
@@ -54,7 +54,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0179.ctr b/tests/test0179.ctr
@@ -33,7 +33,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0180.ctr b/tests/test0180.ctr
@@ -51,7 +51,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0181.ctr b/tests/test0181.ctr
@@ -36,7 +36,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0182.ctr b/tests/test0182.ctr
@@ -45,7 +45,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0183.ctr b/tests/test0183.ctr
@@ -48,7 +48,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0184.ctr b/tests/test0184.ctr
@@ -89,7 +89,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0185.ctr b/tests/test0185.ctr
@@ -43,7 +43,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0186.ctr b/tests/test0186.ctr
@@ -60,7 +60,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0187.ctr b/tests/test0187.ctr
@@ -50,7 +50,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.

diff --git a/tests/test0188.ctr b/tests/test0188.ctr
@@ -69,7 +69,7 @@ usedMemory3 ≔ (Program memory ? 1).
 
 
 
-( usedMemory1 = usedMemory2 &: usedMemory1 = usedMemory3, &: usedMemory2 = usedMemory3 ) true: {
+( usedMemory1 = usedMemory2 &&: usedMemory1 = usedMemory3, &&: usedMemory2 = usedMemory3 ) true: {
 	✎ write: ‘No memory leaks here’.
 }, false: {
 	✎ write: ‘Leaking memory...’.