Removed references to the the graphics submodule due to the mysterious submodule error

This commit is contained in:
Jens Axel Søgaard 2012-06-20 23:02:24 +02:00
parent 0ee88d6310
commit 37bb90af0b
3 changed files with 253 additions and 260 deletions

View File

@ -1,5 +1,26 @@
#lang racket #lang racket
#;(module bracket-graphics racket
(require "../graphics/graphics.rkt")
(define-syntax (declare/provide-vars stx)
(syntax-case stx ()
[(_ id ...)
#'(begin
(define id 'id) ...
(provide id) ...)]))
(provide Graphics)
(declare/provide-vars
Blend Darker Hue Lighter
Circle Disk Line Point Rectangle
Text Thickness
; Colors
Red Blue Green Black White Yellow
; Options
ImageSize PlotRange))
;;; An ATOMIC EXPRESSION is an ;;; An ATOMIC EXPRESSION is an
; - number (integer, real, complex) ; - number (integer, real, complex)
; - reserved symbol (pi, e, i, inf, true, false) ; - reserved symbol (pi, e, i, inf, true, false)
@ -785,33 +806,15 @@
(values (map (curryr operand 0) (operands t=r-List)) (values (map (curryr operand 0) (operands t=r-List))
(map (curryr operand 1) (operands t=r-List))))) (map (curryr operand 1) (operands t=r-List)))))
(module bracket-graphics racket
(require "../graphics/graphics.rkt")
(define-syntax (declare/provide-vars stx)
(syntax-case stx ()
[(_ id ...)
#'(begin
(define id 'id) ...
(provide id) ...)]))
(provide Graphics)
(declare/provide-vars
Blend Darker Hue Lighter
Circle Disk Line Point Rectangle
Text Thickness
; Colors
Red Blue Green Black White Yellow
; Options
ImageSize PlotRange
))
(module bracket racket (module bracket racket
(require (submod ".." number-theory) (require (submod ".." number-theory)
(submod ".." expression) (submod ".." expression)
(submod ".." undefined) (submod ".." undefined)
(submod ".." equation-expression) (submod ".." equation-expression)
(submod ".." bracket-graphics)) ;(submod ".." bracket-graphics)
)
(provide ; (all-from-out (submod ".." symbolic-application)) (provide ; (all-from-out (submod ".." symbolic-application))
(rename-out [free-of Free-of] (rename-out [free-of Free-of]
[base Base] [base Base]
@ -820,7 +823,7 @@
[exponent Exponent] [exponent Exponent]
[before? Before?] [before? Before?]
[kind Kind]) [kind Kind])
(all-from-out (submod ".." bracket-graphics)) ;(all-from-out (submod ".." bracket-graphics))
Operand Operand
Operands Operands
Hold Hold

View File

@ -36,7 +36,8 @@
(strip-context (strip-context
#'(module anything bracket-lang #'(module anything bracket-lang
(require (submod bracket.rkt bracket) (require (submod bracket.rkt bracket)
(submod bracket.rkt symbolic-application)) (submod bracket.rkt symbolic-application)
#;(submod bracket.rkt bracket-graphics))
(define-syntax (#%infix stx) (define-syntax (#%infix stx)
(syntax-case stx () [(_ expr) #'expr])) (syntax-case stx () [(_ expr) #'expr]))
; This lists the operators used by the parser. ; This lists the operators used by the parser.

View File

@ -50,7 +50,7 @@
1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0" 1 0 32 #"(lib \"text-snipclass.ss\" \"xml\")\0"
1 0 15 #"test-case-box%\0" 1 0 15 #"test-case-box%\0"
2 0 1 6 #"wxloc\0" 2 0 1 6 #"wxloc\0"
0 0 63 0 1 #"\0" 0 0 65 0 1 #"\0"
0 75 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 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" #"Standard\0"
@ -236,7 +236,13 @@
-1 -1 2 1 #"\0" -1 -1 2 1 #"\0"
0 71 1 #"\0" 0 71 1 #"\0"
1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
-1 0 4352 0 26 3 12 #"#lang racket" -1 4 1 #"\0"
0 -1 1 #"\0"
1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 45 1 #"\0"
0 -1 1 #"\0"
1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
-1 -1 0 4335 0 26 3 12 #"#lang racket"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 1 #"(" 0 0 22 3 1 #"("
0 0 14 3 7 #"require" 0 0 14 3 7 #"require"
@ -2361,8 +2367,7 @@
0 0 22 3 1 #" " 0 0 22 3 1 #" "
0 0 14 3 1 #"r" 0 0 14 3 1 #"r"
0 0 22 3 3 #")) " 0 0 22 3 3 #")) "
0 0 17 3 10 #"; relative" 0 0 17 3 34 #"; relative to hor. range "
0 0 17 3 24 #" to hor. range "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 13 #" (" 0 0 22 3 13 #" ("
0 0 15 3 12 #"parameterize" 0 0 15 3 12 #"parameterize"
@ -2394,8 +2399,7 @@
0 0 22 3 1 #" " 0 0 22 3 1 #" "
0 0 14 3 1 #"r" 0 0 14 3 1 #"r"
0 0 22 3 3 #")) " 0 0 22 3 3 #")) "
0 0 17 3 10 #"; relative" 0 0 17 3 34 #"; relative to hor. range "
0 0 17 3 24 #" to hor. range "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 15 #" (" 0 0 22 3 15 #" ("
0 0 15 3 12 #"parameterize" 0 0 15 3 12 #"parameterize"
@ -3218,8 +3222,7 @@
0 0 14 3 5 #"Style" 0 0 14 3 5 #"Style"
0 0 22 3 1 #" " 0 0 22 3 1 #" "
0 0 19 3 1 #"\"" 0 0 19 3 1 #"\""
0 0 19 3 7 #"Unknown" 0 0 19 3 16 #"Unknown spec ~a\""
0 0 19 3 9 #" spec ~a\""
0 0 22 3 2 #" (" 0 0 22 3 2 #" ("
0 0 14 3 5 #"first" 0 0 14 3 5 #"first"
0 0 22 3 1 #" " 0 0 22 3 1 #" "
@ -3242,8 +3245,7 @@
0 0 22 3 1 #" " 0 0 22 3 1 #" "
0 0 19 3 1 #"\"" 0 0 19 3 1 #"\""
0 0 19 3 8 #"Internal" 0 0 19 3 8 #"Internal"
0 0 19 3 1 #" " 0 0 19 3 12 #" error: ~a \""
0 0 19 3 11 #"error: ~a \""
0 0 22 3 1 #" " 0 0 22 3 1 #" "
0 0 14 3 1 #"p" 0 0 14 3 1 #"p"
0 0 22 3 7 #")])])))" 0 0 22 3 7 #")])])))"
@ -4019,8 +4021,7 @@
0 0 17 3 2 #") " 0 0 17 3 2 #") "
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 1 #"(" 0 0 17 3 1 #"("
0 0 17 3 1 #"/" 0 0 17 3 14 #"/ x (* 2 pi)))"
0 0 17 3 13 #" x (* 2 pi)))"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -4033,8 +4034,7 @@
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 1 #"1" 0 0 17 3 1 #"1"
0 0 17 3 2 #" (" 0 0 17 3 2 #" ("
0 0 17 3 1 #"/" 0 0 17 3 15 #"/ x (* 2 pi))))"
0 0 17 3 14 #" x (* 2 pi))))"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 50 #"; (Rotate (Rectangle) ,x)))" 0 0 17 3 50 #"; (Rotate (Rectangle) ,x)))"
@ -4047,16 +4047,14 @@
0 0 17 3 1 #"0" 0 0 17 3 1 #"0"
0 0 17 3 2 #" (" 0 0 17 3 2 #" ("
0 0 17 3 1 #"*" 0 0 17 3 1 #"*"
0 0 17 3 1 #" " 0 0 17 3 20 #" 4 pi) (* 2/24 pi)))"
0 0 17 3 19 #"4 pi) (* 2/24 pi)))"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
0 0 17 3 3 #" " 0 0 17 3 3 #" "
0 0 17 3 1 #"'" 0 0 17 3 1 #"'"
0 0 17 3 2 #"((" 0 0 17 3 2 #"(("
0 0 17 3 5 #"Range" 0 0 17 3 24 #"Range ((-2 2) (-2 2)))))"
0 0 17 3 19 #" ((-2 2) (-2 2)))))"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -4265,8 +4263,7 @@
0 0 17 3 3 #"0.0" 0 0 17 3 3 #"0.0"
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 3 #"1.0" 0 0 17 3 33 #"1.0]>; given: -0.0416666666666663"
0 0 17 3 30 #"]>; given: -0.0416666666666663"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
@ -4386,8 +4383,7 @@
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 2 #" {" 0 0 17 3 2 #" {"
0 0 17 3 1 #"x" 0 0 17 3 1 #"x"
0 0 17 3 2 #", " 0 0 17 3 10 #", 0, 10}]]"
0 0 17 3 8 #"0, 10}]]"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 2 #"; " 0 0 17 3 2 #"; "
@ -5086,8 +5082,7 @@
0 0 17 3 1 #";" 0 0 17 3 1 #";"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 16 #";Graphics[Table["
0 0 17 3 15 #"Graphics[Table["
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -5099,8 +5094,7 @@
0 0 17 3 1 #"0" 0 0 17 3 1 #"0"
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 3 #"0.5" 0 0 17 3 28 #"0.5]}], ; black, opacity 50%"
0 0 17 3 25 #"]}], ; black, opacity 50%"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -5117,8 +5111,7 @@
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 1 #"1" 0 0 17 3 1 #"1"
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 1 #" " 0 0 17 3 7 #" 0.6], "
0 0 17 3 6 #"0.6], "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -5143,8 +5136,7 @@
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 2 #" (" 0 0 17 3 2 #" ("
0 0 17 3 3 #"8-r" 0 0 17 3 3 #"8-r"
0 0 17 3 1 #")" 0 0 17 3 7 #")/3]}, "
0 0 17 3 6 #"/3]}, "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -5154,8 +5146,7 @@
#" {" #" {"
) 0 0 17 3 1 #"r" ) 0 0 17 3 1 #"r"
0 0 17 3 1 #"," 0 0 17 3 1 #","
0 0 17 3 1 #" " 0 0 17 3 5 #" 6}, "
0 0 17 3 4 #"6}, "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 17 3 1 #";" 0 0 17 3 1 #";"
@ -5163,8 +5154,7 @@
( (
#" " #" "
#" {" #" {"
) 0 0 17 3 1 #"q" ) 0 0 17 3 8 #"q, 12}]]"
0 0 17 3 7 #", 12}]]"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 22 3 2 #" " 0 0 22 3 2 #" "
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
@ -5443,7 +5433,6 @@
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 1 #"0" 0 0 17 3 1 #"0"
0 0 17 3 1 #" " 0 0 17 3 1 #" "
0 0 17 3 1 #"0" 0 0 17 3 7 #"0) 5)))"
0 0 17 3 6 #") 5)))"
0 0 22 29 1 #"\n" 0 0 22 29 1 #"\n"
0 0 0 0