Commit 686960c4da1cc9e532a2959431338abead1977de - Robin

Rewrite boolean operators as functions. Chris Pressey 4 years ago

4 changed file(s) with 17 addition(s) and 27 deletion(s). Raw diff Collapse all Expand all

-7

stdlib/and.robin less more

22	22	? abort
23	23
24	24	\| (and #t #f #f)
25		? abort (illegal-arguments (#t #f #f))
	25	? abort (illegal-arguments
26	26
27	27	`and` expects both of its arguments to be booleans.
28	28

41	41
42	42	'<<SPEC'
43	43
44		(define and (fexpr (args env)
45		(if (equal? (tail (tail args)) ())
46		(if (eval env (head args))
47		(if (eval env (head (tail args))) #t #f)
48		#f)
49		(abort (list (literal illegal-arguments) args)))))
	44	(define and (fun (a b)
	45	(if a (if b #t #f) #f)))

-8

stdlib/boolean-p.robin less more

17	17	exactly one argument.
18	18
19	19	\| (boolean? #t #f)
20		? abort (illegal-arguments (#t #f))
	20	? abort (illegal-arguments
21	21
22	22	\| (boolean?)
23		? abort (illegal-arguments ())
	23	? abort (illegal-arguments
24	24
25	25	'<<SPEC'
26	26
27		(define boolean? (fexpr (args env)
28		(bind-args (b) args env
29		(if (equal? b #t)
	27	(define boolean? (fun (b)
	28	(if (equal? b #t)
	29	#t
	30	(if (equal? b #f)
30	31	#t
31		(if (equal? b #f)
32		#t
33		#f)))))
	32	#f))))

-7

stdlib/or.robin less more

22	22	? abort
23	23
24	24	\| (or #t #f #f)
25		? abort (illegal-arguments (#t #f #f))
	25	? abort (illegal-arguments
26	26
27	27	`or` expects both of its arguments to be booleans.
28	28

41	41
42	42	'<<SPEC'
43	43
44		(define or (fexpr (args env)
45		(if (equal? (tail (tail args)) ())
46		(if (eval env (head args))
47		#t
48		(if (eval env (head (tail args))) #t #f))
49		(abort (list (literal illegal-arguments) args)))))
	44	(define or (fun (a b)
	45	(if a #t (if b #t #f))))

-5

stdlib/xor.robin less more

19	19	`xor` expects exactly two arguments.
20	20
21	21	\| (xor #f)
22		? abort (illegal-arguments (#f))
	22	? abort (illegal-arguments
23	23
24	24	\| (xor #t #f #f)
25		? abort (illegal-arguments (#t #f #f))
	25	? abort (illegal-arguments
26	26
27	27	`xor` expects both of its arguments to be booleans.
28	28

40	40
41	41	'<<SPEC'
42	42
43		(define xor (fexpr (args env)
44		(bind-args (a b) args env
45		(or (and a (not b)) (and (not a) b)))))
	43	(define xor (fun (a b)
	44	(or (and a (not b)) (and (not a) b))))