Skip to content

Allow controlling the #:readers value #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elibarzilay wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −5
Open

Allow controlling the #:readers value #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions handin-server/checker.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@
[requires* (get ':requires #''())]
[teachpacks* (get ':teachpacks #''())]
[allowed-requires* (get ':allowed-requires #'#f)]
[readers* (get ':readers #''auto)]
[create-text?* (get ':create-text? #'#t)]
[untabify?* (get ':untabify? #'#t)]
[textualize?* (get ':textualize? #'#f)]
Expand Down Expand Up @@ -421,6 +422,7 @@
[language language*]
[requires requires*]
[allowed-requires allowed-requires*]
[readers readers*]
[teachpacks teachpacks*]
[create-text? create-text?*]
[untabify? untabify?*]
Expand Down Expand Up @@ -523,6 +525,7 @@
(call-with-evaluator/submission
language (append requires teachpacks)
#:allowed-requires allowed-requires
#:readers readers
submission values)))])
(set-run-status "running tests")
(parameterize ([submission-eval (wrap-evaluator eval)])
Expand Down
15 changes: 10 additions & 5 deletions handin-server/utils.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,14 @@

;; Execution ----------------------------------------

(define (make-evaluator* lang reqs allowed-requires inp)
(define (make-evaluator* lang reqs allowed-requires readers inp)
(define-syntax-rule (w/readers f x ...)
(if (eq? readers 'auto) (f x ...) (f x ... #:readers readers)))
(reraise-exn-as-submission-problem
(lambda ()
(if (and (list? lang) (= 2 (length lang)) (eq? 'module (car lang)))
(make-module-evaluator inp #:language (cadr lang) #:allow-read reqs
#:allow-syntactic-requires allowed-requires)
(w/readers make-module-evaluator inp #:language (cadr lang) #:allow-read reqs
#:allow-syntactic-requires allowed-requires)
(make-evaluator lang inp #:requires reqs
#:allow-syntactic-requires allowed-requires)))))

Expand All @@ -72,7 +74,7 @@

(define (make-evaluator/submission language requires str)
(let-values ([(defs interacts) (unpack-submission str)])
(make-evaluator* language requires (open-input-text-editor defs))))
(make-evaluator* language requires 'auto (open-input-text-editor defs))))

(define (evaluate-all source port eval)
(let loop ()
Expand Down Expand Up @@ -180,6 +182,7 @@

(define (call-with-evaluator lang requires program-port
#:allowed-requires [allowed-requires #f]
#:readers [readers 'auto]
go)
(parameterize ([error-value->string-handler (lambda (v s)
((current-value-printer) v))]
Expand All @@ -188,14 +191,16 @@
(equal? lang '(special beginner-abbr))))])
(reraise-exn-as-submission-problem
(lambda ()
(let ([e (make-evaluator* lang requires allowed-requires program-port)])
(let ([e (make-evaluator* lang requires allowed-requires readers program-port)])
(set-run-status "executing your code")
(go e))))))

(define (call-with-evaluator/submission lang requires str
#:allowed-requires [allowed-requires #f]
#:readers [readers 'auto]
go)
(let-values ([(defs interacts) (unpack-submission str)])
(call-with-evaluator lang requires (open-input-text-editor defs)
#:allowed-requires allowed-requires
#:readers readers
go)))