diff options
| -rw-r--r-- | scheme/guile/geiser/evaluation.scm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/scheme/guile/geiser/evaluation.scm b/scheme/guile/geiser/evaluation.scm index 537e145..de08d17 100644 --- a/scheme/guile/geiser/evaluation.scm +++ b/scheme/guile/geiser/evaluation.scm @@ -67,7 +67,7 @@ (set! error #t) (apply handle-error captured-stack args)) (lambda args - (set! captured-stack (make-stack #t 1 13))))))))) + (set! captured-stack (make-stack #t 2 15))))))))) (write `(,(if error result (cons 'result result)) (output . ,output))) (newline)))) @@ -78,22 +78,17 @@ (set-current-module module) (compile form)))) -(define (ge:eval form module-name) - (evaluate form module-name eval)) - +(define ge:eval ge:compile) (define (ge:compile form module-name) (evaluate form module-name eval-compile)) (define (ge:compile-file path) - "Compile and load file, given its full @var{path}." - (evaluate `(and (compile-file ,path) - (load-compiled ,(compiled-file-name path))) - '(system base compile) - eval-compile)) + "Compile a file, given its full @var{path}." + (ge:compile `(compile-and-load ,path) '(geiser evaluation))) (define (ge:load-file path) "Load file, given its full @var{path}." - (evaluate `(load ,path) #f eval)) + (ge:compile `(load-compiled ,(compiled-file-name path)) '(geiser evaluation))) (define (ge:macroexpand form . all) (let ((all (and (not (null? all)) (car all)))) |