Settled on or: and and:

Author: gabordemooij

base.c

@@ -328,7 +328,7 @@ ctr_object* ctr_bool_either_or(ctr_object* myself, ctr_argument* argumentList) {
  *
  * Usage:
  *
- * a && b
+ * a and: b
  *
  */
 ctr_object* ctr_bool_and(ctr_object* myself, ctr_argument* argumentList) {
@@ -360,7 +360,7 @@ ctr_object* ctr_bool_nor(ctr_object* myself, ctr_argument* argumentList) {
  *
  * Usage:
  *
- * a || b
+ * a or: b
  */
 ctr_object* ctr_bool_or(ctr_object* myself, ctr_argument* argumentList) {
 	ctr_object* other = ctr_internal_cast2bool(argumentList->object);

lexer.c

@@ -180,12 +180,6 @@ int ctr_clex_tok() {
 		if (((char)*(ctr_code) == '!') && ((char)*(ctr_code+1)=='=')){
 			ctr_code +=2; ctr_clex_tokvlen = 3; memcpy(ctr_clex_buffer, "≠", 3); return CTR_TOKEN_REF;
 		}
-		if (((char)*(ctr_code) == '|') && ((char)*(ctr_code+1)=='|')){
-			ctr_code +=2; ctr_clex_tokvlen = 3; memcpy(ctr_clex_buffer, "∨", 3); return CTR_TOKEN_REF;
-		}
-		if (((char)*(ctr_code) == '&') && ((char)*(ctr_code+1)=='&')){
-			ctr_code +=2; ctr_clex_tokvlen = 3; memcpy(ctr_clex_buffer, "∧", 3); return CTR_TOKEN_REF;
-		}
 		if (((char)*(ctr_code) == '<') && ((char)*(ctr_code+1)=='-')){
 			ctr_code +=2; ctr_clex_tokvlen = 3; memcpy(ctr_clex_buffer, "←", 3); return CTR_TOKEN_REF;
 		}

tests/test0027.ctr

@@ -1,6 +1,6 @@
 Pen write: 'Length is:' + 'ABCD' length.
 x := 'ABCDE'.
 Pen write: 'Length is:' + x length.
-(('ABC' length + 1 = 4) && (2!=3)) not not ifTrue: {\ Pen write: 'Yes'. }.
-(((3 > 4) || (4 > 2)) && (True xor: False) && (True xor: True) not) ifTrue: {\ Pen write: 'Yes'. }.
+(('ABC' length + 1 = 4) and: (2!=3)) not not ifTrue: {\ Pen write: 'Yes'. }.
+(((3 > 4) or: (4 > 2)) and: (True xor: False) and: (True xor: True) not) ifTrue: {\ Pen write: 'Yes'. }.
 {\ Pen write: 'Running'. } run.

tests/test0053.ctr

@@ -6,11 +6,11 @@
 	(x < 3) ifFalse: {\ Pen write: 'FAIL'. }.
 	(x>-1) ifFalse: {\ Pen write: 'FAIL'. }.
 	x := ((Boolean flip) toNumber).
-	(x = 0 || x = 1) ifFalse: {\ Pen write: 'FAIL'. }.
+	(x = 0 or: x = 1) ifFalse: {\ Pen write: 'FAIL'. }.
 	x := ((True flip) toNumber).
-	(x = 0 || x = 1) ifFalse: {\ Pen write: 'FAIL'. }.
+	(x = 0 or: x = 1) ifFalse: {\ Pen write: 'FAIL'. }.
 	x := (Boolean flip either: 'HEAD' or: 'TAIL').
-	(x = 'HEAD' || x = 'TAIL') ifFalse: {\ Pen write: 'FAIL'. }.
+	(x = 'HEAD' or: x = 'TAIL') ifFalse: {\ Pen write: 'FAIL'. }.
 }.
 Pen write: 'DONE'.
 

tests/test0062.ctr

@@ -5,8 +5,8 @@ o on: 'hello' do: {\}.
 {\ o on: 'test' do: 3.} catch: { e | Pen write: e, brk. }, run.
 {\ o on: 'hello' do: {\}.} catch: { e | Pen write: e, brk. }, run. #allowed
 {\ var z := 4 / 0. } catch: { e | Pen write: e, brk. }, run. 
-{\ (True && Nil) ifTrue: {\ Pen write: 'X'.}. } catch: { e | Pen write: e, brk. }, run. #allowed
-{\ ('' || 0) ifTrue: {\ Pen write: 'X'.}. } catch: { e | Pen write: e, brk. }, run. #allowed
+{\ (True and: Nil) ifTrue: {\ Pen write: 'X'.}. } catch: { e | Pen write: e, brk. }, run. #allowed
+{\ ('' or: 0) ifTrue: {\ Pen write: 'X'.}. } catch: { e | Pen write: e, brk. }, run. #allowed
 {\ (1 < '2') ifTrue: {\ Pen write: 'OK'. }. } catch: { e | Pen write: e, brk. }, run. #allowed, cast
 {\ (1 < '2.0') ifTrue: {\ Pen write: 'OK'. }. } catch: { e | Pen write: e, brk. }, run. #allowed, cast
 {\ (1 < 'x2.0') ifTrue: {\ Pen write: 'NO!'. }. } catch: { e | Pen write: e, brk. }, run. #allowed, cast

tests/test0102.ctr

@@ -2,7 +2,7 @@
 motive := False.
 opportunity := False.
 Pen write: (motive nor: opportunity).
-Pen write: (motive not && opportunity not).
+Pen write: (motive not and: opportunity not).
 #Test boolean equality messages
 Pen write: (True == True).
 Pen write: (True != True).

world.c

@@ -498,9 +498,9 @@ void ctr_initialize_world() {
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("continue", 8), &ctr_bool_continue);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("else:", 5), &ctr_bool_ifFalse);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("not", 3), &ctr_bool_not);
-	ctr_internal_create_func(CtrStdBool, ctr_build_string("∧", 3), &ctr_bool_and);
+	ctr_internal_create_func(CtrStdBool, ctr_build_string("and:", 4), &ctr_bool_and);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("nor:", 4), &ctr_bool_nor);
-	ctr_internal_create_func(CtrStdBool, ctr_build_string("∨", 3), &ctr_bool_or);
+	ctr_internal_create_func(CtrStdBool, ctr_build_string("or:", 3), &ctr_bool_or);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("xor:", 4), &ctr_bool_xor);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("=",1),&ctr_bool_eq);
 	ctr_internal_create_func(CtrStdBool, ctr_build_string("≠",3),&ctr_bool_neq);