suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

expander: pay more attention to (error-print-source-location)

Browse Source 
When source locations are disabled, don't include a source location in
an error message from `raise-syntax-error`.
This commit is contained in:
Matthew Flatt 2018-02-28 13:08:22 -07:00
parent 25b0c23db7
commit 3c69a1296a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
racket/src/expander/syntax/error.rkt
View File

@ -69,8 +69,9 @@
(format "\n in: ~.s" (syntax->datum (datum->syntax #f expr)))) (format "\n in: ~.s" (syntax->datum (datum->syntax #f expr))))
"")) ""))
(define src-loc-str (define src-loc-str
(or (extract-source-location sub-expr) (or (and (error-print-source-location)
(extract-source-location expr) (or (extract-source-location sub-expr)
(extract-source-location expr)))
"")) ""))
(raise (exn:fail:syntax (raise (exn:fail:syntax
(string-append src-loc-str (string-append src-loc-str

11
racket/src/racket/src/startup.inc
View File

@ -12815,11 +12815,12 @@ static const char *startup_source =
" #f)))" " #f)))"
" (if or-part_151 or-part_151 \"\"))))" " (if or-part_151 or-part_151 \"\"))))"
"(let-values(((src-loc-str_0)" "(let-values(((src-loc-str_0)"
"(let-values(((or-part_152)(extract-source-location sub-expr_6)))" "(let-values(((or-part_152)"
"(if or-part_152" "(if(error-print-source-location)"
" or-part_152" "(let-values(((or-part_144)(extract-source-location sub-expr_6)))"
"(let-values(((or-part_144)(extract-source-location expr_8)))" "(if or-part_144 or-part_144(extract-source-location expr_8)))"
" (if or-part_144 or-part_144 \"\"))))))" " #f)))"
" (if or-part_152 or-part_152 \"\"))))"
"(raise" "(raise"
"(exn:fail:syntax_0" "(exn:fail:syntax_0"
" (string-append src-loc-str_0 name_26 \": \" message_12 at-message_0 in-message_0 message-suffix_2)" " (string-append src-loc-str_0 name_26 \": \" message_12 at-message_0 in-message_0 message-suffix_2)"