From b96fd759f37d0748bfff21ad5d01c359a461247c Mon Sep 17 00:00:00 2001 From: Matthias Felleisen Date: Tue, 12 Aug 2008 12:56:30 +0000 Subject: [PATCH] =?UTF-8?q?ke=3D=3F=20changed=20to=20key=3D=3F?= svn: r11200 --- collects/htdp/Test/matrix-client.ss | 697 ++++++++++++++------------- collects/htdp/Test/world-add-line.ss | 2 +- collects/htdp/Test/world.ss | 8 +- collects/htdp/matrix-sig.ss | 2 +- collects/htdp/world.ss | 9 +- 5 files changed, 369 insertions(+), 349 deletions(-) diff --git a/collects/htdp/Test/matrix-client.ss b/collects/htdp/Test/matrix-client.ss index df4592d3b3..5357cea002 100644 --- a/collects/htdp/Test/matrix-client.ss +++ b/collects/htdp/Test/matrix-client.ss @@ -9,7 +9,7 @@ http://www.plt-scheme.org |# - 29 7 #"wxtext\0" + 45 7 #"wxtext\0" 3 1 6 #"wxtab\0" 1 1 8 #"wxmedia\0" 4 1 8 #"wximage\0" @@ -19,11 +19,27 @@ 1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0" 1 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0" 0 0 19 #"drscheme:sexp-snip\0" -0 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0" +0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0" +1 0 33 #"(lib \"bullet-snip.ss\" \"browser\")\0" 0 0 29 #"drscheme:bindings-snipclass%\0" -1 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0" 1 0 25 #"(lib \"matrix.ss\" \"htdp\")\0" 1 0 22 #"drscheme:lambda-snip%\0" +1 0 8 #"gb:core\0" +5 0 10 #"gb:canvas\0" +5 0 17 #"gb:editor-canvas\0" +5 0 10 #"gb:slider\0" +5 0 9 #"gb:gauge\0" +5 0 11 #"gb:listbox\0" +5 0 12 #"gb:radiobox\0" +5 0 10 #"gb:choice\0" +5 0 8 #"gb:text\0" +5 0 11 #"gb:message\0" +5 0 10 #"gb:button\0" +5 0 12 #"gb:checkbox\0" +5 0 18 #"gb:vertical-panel\0" +5 0 9 #"gb:panel\0" +5 0 20 #"gb:horizontal-panel\0" +5 0 33 #"(lib \"readable.ss\" \"guibuilder\")\0" 1 0 56 ( #"(lib \"hrule-snip.ss\" \"macro-debugger\" \"syntax-browse" @@ -45,7 +61,7 @@ 1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0" 1 0 15 #"test-case-box%\0" 2 0 1 6 #"wxloc\0" -00000000000 1 84 0 1 #"\0" +00000000000 1 85 0 1 #"\0" 0 75 1 #"\0" 0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9 #"Standard\0" @@ -134,8 +150,11 @@ 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31 #"drscheme:check-syntax:imported\0" 0 -1 1 #"\0" -1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 35 -#"profj:syntax-colors:scheme:keyword\0" +1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 41 +#"profj:syntax-colors:scheme:block-comment\0" +0 -1 1 #"\0" +1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2 +35 #"profj:syntax-colors:scheme:keyword\0" 0 -1 1 #"\0" 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1 #"\0" @@ -200,8 +219,11 @@ 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 1 #"\0" 0 71 1 #"\0" -1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 22 1 +1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 100 0 0 0 0 -1 -1 0 1 #"\0" +0 75 12 #"Courier New\0" +0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 22 +1 #"\0" 0 -1 1 #"\0" 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 15 1 #"\0" @@ -245,10 +267,7 @@ 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 17 1 #"\0" 0 -1 1 #"\0" -1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 0 1 -#"\0" -0 75 12 #"Courier New\0" -0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 4 1 +1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 4 1 #"\0" 0 -1 1 #"\0" 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1 17 @@ -294,7 +313,7 @@ #"\0" 0 -1 1 #"\0" 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1 -00000000002 0 00000000000 13 00000000000 803 0 4 3 85 +00000000002 0 00000000000 13 00000000000 802 0 4 3 85 ( #";; The first three lines of this file were inserted by DrScheme. Th" #"ey record metadata" @@ -304,236 +323,237 @@ #";; about the language level of this file in a form that our tools c" #"an easily process." ) 0 0 4 29 1 #"\n" -0 0 4 3 191 +0 0 4 3 261 ( #"#reader(lib \"htdp-intermediate-lambda-reader.ss\" \"lang\"" - #")((modname matrix-client) (read-case-sensitive #t) (teachpacks ()) " - #"(htdp-settings #(#t constructor repeating-decimal #f #t none #f ())" - #"))" + #")((modname matrix-client) (read-case-sensitive #t) (teachpacks ((li" + #"b \"world.ss\" \"teachpack\" \"htdp\"))) (htdp-settings" + #" #(#t constructor repeating-decimal #f #t none #f ((lib \"world.s" + #"s\" \"teachpack\" \"htdp\")))))" ) 0 0 4 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 7 #"require" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 3 #"lib" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 19 3 11 #"\"matrix.ss\"" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 19 3 6 #"\"htdp\"" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"make-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 4 #"list" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"a" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"b" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"c" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"d" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"e" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"f" 0 0 22 3 3 #")))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-set" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"x" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"a" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"b" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"c" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"d" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"e" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"f" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"m2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 1 #"x" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"make-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 1 #"(" 0 0 14 3 3 #"a00" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a01" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a02" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a10" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a11" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a12" 0 0 22 3 3 #")))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 9 #"matrix1-2" -0 0 4 3 1 #" " -0 0 4 29 1 #"\n" -0 0 4 3 2 #" " -0 13 00000000004 4 29469 +0 0 70 3 1 #" " +0 0 70 29 1 #"\n" +0 0 70 3 2 #" " +0 13 00000000004 70 29469 ( #"(((a00 a01 a02) (a10 a11 a12)) (#(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2" #"55 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 " @@ -976,583 +996,582 @@ #" 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255 0 " #"0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) 94 0 0))\0" ) 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 9 #"matrix1-2" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"r1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 2 #"((" 0 0 14 3 3 #"a00" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a01" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a02" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 13 #" " +0 0 70 29 1 #"\n" +0 0 70 3 13 #" " 0 0 22 3 1 #"(" 0 0 14 3 3 #"a10" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a11" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a12" 0 0 22 3 3 #")))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 17 #"rectangle->matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 2 #"r1" 0 0 22 3 3 #")))" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a00" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a01" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a02" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a10" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a11" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 14 3 3 #"a12" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 12 #"build-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 15 3 6 #"lambda" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 1 #"i" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"j" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"i" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"j" 0 0 22 3 4 #"))))" -0 0 4 29 1 #"\n" -0 0 4 3 14 #" " +0 0 70 29 1 #"\n" +0 0 70 3 14 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix1" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"make-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 1 #"(" 0 0 14 3 3 #"a00" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a01" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a10" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 3 #"a11" 0 0 22 3 3 #")))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 12 #"matrix-minor" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 3 14 #" " +0 0 70 29 1 #"\n" +0 0 70 3 14 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"make-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 1 #"(" 0 0 14 3 3 #"a11" 0 0 22 3 4 #"))))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 12 #"matrix-minor" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 3 14 #" " +0 0 70 29 1 #"\n" +0 0 70 3 14 #" " 0 0 22 3 1 #"(" 0 0 14 3 13 #"matrix-render" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"make-matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 1 #"(" 0 0 14 3 3 #"a00" 0 0 22 3 4 #"))))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 17 3 78 ( #";; ================================================================" #"===========" -) 0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +) 0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 17 3 20 #";; Matrix -> Number " -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 17 3 53 #";; compute the determinat of a square (n x n) matrix " -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"determinant" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"M" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 2 #" " +0 0 70 29 1 #"\n" +0 0 70 3 2 #" " 0 0 22 3 1 #"(" 0 0 15 3 5 #"local" -0 0 4 3 1 #" " -0 0 4 29 1 #"\n" -0 0 4 3 4 #" " +0 0 70 3 1 #" " +0 0 70 29 1 #"\n" +0 0 70 3 4 #" " 0 0 22 3 2 #"((" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"n" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"matrix-rows" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"M" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 3 5 #" " +0 0 70 29 1 #"\n" +0 0 70 3 5 #" " 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 6 #"series" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"i" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 7 #" " +0 0 70 29 1 #"\n" +0 0 70 3 7 #" " 0 0 22 3 1 #"(" 0 0 14 3 1 #"*" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 4 #"expt" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 2 #"-1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"i" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"M" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"i" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"determinant" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 12 #"matrix-minor" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"M" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"i" 0 0 22 3 5 #")))))" -0 0 4 29 1 #"\n" -0 0 4 3 4 #" " +0 0 70 29 1 #"\n" +0 0 70 3 4 #" " 0 0 22 3 1 #"(" 0 0 14 3 2 #"if" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 1 #"=" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"n" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 8 #" " +0 0 70 29 1 #"\n" +0 0 70 3 8 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-ref" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"M" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 8 #" " +0 0 70 29 1 #"\n" +0 0 70 3 8 #" " 0 0 22 3 1 #"(" 0 0 14 3 5 #"foldl" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"+" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"build-list" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"n" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 6 #"series" 0 0 22 3 5 #")))))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"determinant" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 17 #"rectangle->matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 2 #"((" 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 48 #" " +0 0 70 29 1 #"\n" +0 0 70 3 48 #" " 0 0 22 3 1 #"(" 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 4 #"))))" -0 0 4 29 1 #"\n" -0 0 4 3 14 #" " +0 0 70 29 1 #"\n" +0 0 70 3 14 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 11 #"determinant" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 17 #"rectangle->matrix" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"'" 0 0 22 3 2 #"((" 0 0 20 3 1 #"2" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 3 48 #" " +0 0 70 29 1 #"\n" +0 0 70 3 48 #" " 0 0 22 3 1 #"(" 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 4 #"))))" -0 0 4 29 1 #"\n" -0 0 4 3 14 #" " +0 0 70 29 1 #"\n" +0 0 70 3 14 #" " 0 0 20 3 1 #"1" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 17 3 78 ( #";; ================================================================" #"===========" -) 0 0 4 29 1 #"\n" +) 0 0 70 29 1 #"\n" 0 0 17 3 32 #";; matrix with structure inside " -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 13 #"define-struct" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"p" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 1 #"x" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 1 #"y" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix3" -0 0 4 3 1 #" " -0 0 4 29 1 #"\n" -0 0 4 3 2 #" " +0 0 70 3 1 #" " +0 0 70 29 1 #"\n" +0 0 70 3 2 #" " 0 0 22 3 1 #"(" 0 0 14 3 17 #"rectangle->matrix" -0 0 4 3 1 #" " -0 0 4 29 1 #"\n" -0 0 4 3 3 #" " +0 0 70 3 1 #" " +0 0 70 29 1 #"\n" +0 0 70 3 3 #" " 0 0 22 3 1 #"(" 0 0 14 3 4 #"list" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 4 #"list" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 6 #"make-p" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 6 #"make-p" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 3 9 #" " +0 0 70 29 1 #"\n" +0 0 70 3 9 #" " 0 0 22 3 1 #"(" 0 0 14 3 4 #"list" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 6 #"make-p" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" 0 0 22 3 1 #")" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 6 #"make-p" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"1" 0 0 22 3 5 #")))))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 15 3 6 #"define" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix4" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 22 3 1 #"(" 0 0 14 3 10 #"matrix-set" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 20 3 1 #"0" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 19 3 29 #"\"intentionally failing check\"" 0 0 22 3 2 #"))" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix3" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 22 3 1 #"(" 0 0 14 3 12 #"check-expect" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix3" -0 0 4 3 1 #" " +0 0 70 3 1 #" " 0 0 14 3 7 #"matrix4" 0 0 22 3 1 #")" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" 0 0 19 3 28 #"\"the above test should fail\"" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" -0 0 4 29 1 #"\n" +0 0 70 29 1 #"\n" +0 0 70 29 1 #"\n" 0 00000000000 diff --git a/collects/htdp/Test/world-add-line.ss b/collects/htdp/Test/world-add-line.ss index 0b4ce29687..123c2881cf 100644 --- a/collects/htdp/Test/world-add-line.ss +++ b/collects/htdp/Test/world-add-line.ss @@ -1,7 +1,7 @@ ;; The first three lines of this file were inserted by DrScheme. They record metadata ;; about the language level of this file in a form that our tools can easily process. #reader(lib "htdp-beginner-reader.ss" "lang")((modname world-add-line) (read-case-sensitive #t) (teachpacks ((lib "world.ss" "teachpack" "htdp"))) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ((lib "world.ss" "teachpack" "htdp"))))) -(require htdp/world) +;(require htdp/world) (define plain (empty-scene 100 100)) diff --git a/collects/htdp/Test/world.ss b/collects/htdp/Test/world.ss index ec0af84917..f86950f05f 100644 --- a/collects/htdp/Test/world.ss +++ b/collects/htdp/Test/world.ss @@ -23,11 +23,11 @@ (check-expect (key-event? 0) false) (check-expect (key-event? #\a) true) -(check-expect (ke=? 'a 'b) false) -(check-expect (ke=? 'a #\a) false) -(check-expect (ke=? 'left 'left) true) +(check-expect (key=? 'a 'b) false) +(check-expect (key=? 'a #\a) false) +(check-expect (key=? 'left 'left) true) -(check-error (ke=? 'a 0) "ke=?: expected as first argument, given: 0") +(check-error (key=? 'a 0) "key=?: expected as first argument, given: 0") ;; run world run diff --git a/collects/htdp/matrix-sig.ss b/collects/htdp/matrix-sig.ss index 5608053ceb..ca1904e418 100644 --- a/collects/htdp/matrix-sig.ss +++ b/collects/htdp/matrix-sig.ss @@ -27,7 +27,7 @@ make-matrix ;; Nat Nat [Listof X] -> [Matrix X] ;; NOTE: make-matrix would consume an optional number of entries, ;; if it were like make-vector -build-matrix ;; Nat Nat (Nat Nat -> Number) -> Matrix +build-matrix ;; Nat Nat (Nat Nat -> X) -> [Matrix X] ;; create a matrix from a function matrix-ref ;; [Matrix X] Nat Nat -> X diff --git a/collects/htdp/world.ss b/collects/htdp/world.ss index b1cf9bfa76..12bc52569c 100644 --- a/collects/htdp/world.ss +++ b/collects/htdp/world.ss @@ -12,6 +12,7 @@ (set! current-world new-world) (when (C current-world) (render (F current-world)))) |# +;; Tue Aug 12 08:54:45 EDT 2008: ke=? changed to key=? ;; Fri Jul 4 10:25:47 EDT 2008: added ke=? and key-event? ;; Mon Jun 16 15:38:14 EDT 2008: removed end-of-time and provided stop-when ;; also allow repeated setting of callbacks now @@ -130,7 +131,7 @@ Matthew (provide key-event? ;; Any -> Boolean - ke=? ;; KeyEvent KeyEvent -> Boolean + key=? ;; KeyEvent KeyEvent -> Boolean ) (provide-higher-order-primitive @@ -297,9 +298,9 @@ Matthew (define (key-event? k) (or (char? k) (symbol? k))) -(define (ke=? k m) - (check-arg 'ke=? (key-event? k) 'KeyEvent "first" k) - (check-arg 'ke=? (key-event? m) 'KeyEvent "first" m) +(define (key=? k m) + (check-arg 'key=? (key-event? k) 'KeyEvent "first" k) + (check-arg 'key=? (key-event? m) 'KeyEvent "first" m) (eqv? k m)) (define (on-key-event f)