Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-19 13:49:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Justin Ethier 2020-07-21 21:45:26 -04:00
parent 7794cbd98f
commit de1a97fbe7
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cyclone.scm
View file

@ -949,16 +949,21 @@ Debug options:
(else (else
(with-handler (with-handler
(lambda (err) (lambda (err)
;(parameterize ((current-input-port (current-error-port)))) ;; Top-level exception handler for the compiler.
(display "Error: " (current-error-port)) ;;
(display (car err) (current-error-port)) ;; We set this up since call history is generally
(newline (current-error-port)) ;; pointless for users of the compiler, so we don't
;; want to display it.
(parameterize ((current-output-port (current-error-port)))
(display "Error: ")
(display (car err))
(newline)
(for-each (for-each
(lambda (obj) (lambda (obj)
(write obj (current-error-port)) (write obj)
(newline (current-error-port))) (newline))
(cdr err)) (cdr err))
(newline (current-error-port)) (newline)
(exit 1) ) (exit 1)))
(run-compiler non-opts compile? cc-prog cc-exec cc-lib cc-so cc-linker-opts append-dirs prepend-dirs))))) (run-compiler non-opts compile? cc-prog cc-exec cc-lib cc-so cc-linker-opts append-dirs prepend-dirs)))))

6
scheme/base.sld
View file

@ -236,14 +236,10 @@
(begin (begin
(define *source-loc-lis* '()) (define *source-loc-lis* '())
(define (error/loc reason expr) (define (error/loc reason expr)
;(Cyc-write expr (current-error-port))
;(Cyc-display #\newline (current-error-port))
(let* ((found (assoc expr *source-loc-lis*)) (let* ((found (assoc expr *source-loc-lis*))
(loc-vec (if found (loc-vec (if found
(cdr found) ;; Get value (cdr found) ;; Get value
#f))) #f)))
;(Cyc-display loc-vec (current-error-port))
;(Cyc-display #\newline (current-error-port))
(if loc-vec (if loc-vec
(error (error
(string-append (string-append
@ -253,7 +249,7 @@
(vector-ref loc-vec 0) (vector-ref loc-vec 0)
" line " " line "
(number->string (vector-ref loc-vec 1)) (number->string (vector-ref loc-vec 1))
", char " ", column "
(number->string (vector-ref loc-vec 2))) (number->string (vector-ref loc-vec 2)))
expr) expr)
(error (error