Skip to content

Commit 1701bc6

Browse files
committed
make sure translate only has one definition -- put-image
1 parent 99879d9 commit 1701bc6

File tree

3 files changed

+62
-3
lines changed

3 files changed

+62
-3
lines changed

src/web/arr/trove/starter2024.arr

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
use context empty-context
22

33
import lists as L
4-
import image as I
4+
import image as I
55
import arrays as A
66
import option as O
77
import constants as C
8-
import global as G
8+
import global as G
9+
10+
provide: negate end
911

1012
provide from L:
1113
all,
@@ -220,7 +222,6 @@ provide from I:
220222
star-sized,
221223
text,
222224
text-font,
223-
translate,
224225
triangle,
225226
triangle-aas,
226227
triangle-asa,
@@ -499,3 +500,5 @@ provide from G:
499500
data String,
500501
data Table
501502
end
503+
504+
fun negate(n :: Number) -> Number: n * -1 end
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
use context essentials2021
2+
3+
import constants as C
4+
5+
E = C.E
6+
shadow PI = C.PI
7+
8+
sqrt = num-sqrt
9+
expt = num-expt
10+
sqr = num-sqr
11+
abs = num-abs
12+
dilate = scale
13+
shadow translate = put-image
14+
cos = num-cos
15+
sin = num-sin
16+
tan = num-tan
17+
negate = lam(x): -1 * x end
18+
19+
img = text("Joe", 50, "purple")
20+
img2 = rectangle(1000, 200, "outline", "black")
21+
22+
check:
23+
sqrt(1) is 1
24+
expt(2, 3) is 8
25+
sqr(2) is 4
26+
abs(-7) is 7
27+
dilate(2, img) is scale(2, img)
28+
translate(img, 100, 200, img2) is put-image(img, 100, 200, img2)
29+
cos(0) is 1
30+
sin(0) is 0
31+
tan(0) is 0
32+
negate(-8) is 8
33+
cos(PI) is-roughly ~-1
34+
sin(PI / 2) is-roughly ~1
35+
num-exp(1) is-roughly E
36+
end
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
use context starter2024
2+
3+
img = text("Joe", 50, "purple")
4+
img2 = rectangle(1000, 200, "outline", "black")
5+
6+
check:
7+
sqrt(1) is 1
8+
expt(2, 3) is 8
9+
sqr(2) is 4
10+
abs(-7) is 7
11+
dilate(2, img) is scale(2, img)
12+
translate(img, 100, 200, img2) is put-image(img, 100, 200, img2)
13+
cos(0) is 1
14+
sin(0) is 0
15+
tan(0) is 0
16+
negate(-8) is 8
17+
cos(PI) is-roughly ~-1
18+
sin(PI / 2) is-roughly ~1
19+
num-exp(1) is-roughly E
20+
end

0 commit comments

Comments
 (0)