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

keep the language repl if we get a syntax error

Browse Source 
svn: r10319
This commit is contained in:
Eli Barzilay 2008-06-17 17:45:53 +00:00
parent 4868fa672d
commit e3fa49cdff
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
collects/drscheme/private/module-language.ss
View File

@ -225,7 +225,7 @@
(apply raise-syntax-error '|Module Language| (apply raise-syntax-error '|Module Language|
(if (null? error-args) (if (null? error-args)
(list (string-append (list (string-append
"There must be a module in the\n" "There must be a valid module in the\n"
"definitions window. Try starting your program with\n" "definitions window. Try starting your program with\n"
"\n" "\n"
" #lang scheme\n" " #lang scheme\n"
@ -403,14 +403,32 @@
(values (values
v-name v-name
;; rewrite the module to use the scheme/base version of `module' ;; rewrite the module to use the scheme/base version of `module'
(let ([module (datum->syntax #'here 'module #'form)]) (let* ([mod (datum->syntax #'here 'module #'form)]
(datum->syntax stx `(,module ,#'name ,#'lang . ,#'rest) stx))))] [expr (datum->syntax stx `(,mod ,#'name ,#'lang . ,#'rest) stx)])
;; now expand it, and if there's an error, then use a minimal module
;; that will use the language as usual and report the error, it'll
;; turn to 3d code:
;; (module <name> <lang> (raise <the-stx-exn>))
;; so the repl will have at least the language bindings. (this won't
;; work right with a bad language name -- but that kind of error will
;; be reported anyway.)
(with-handlers
([void (lambda (e)
(fprintf (current-error-port)
(string-append
"*** Module Language: there is a syntax error"
" in your code, so it was not evaluated;\n"
"*** the interactions below have only the"
" language bindings for ‘~s’\n")
(syntax->datum #'lang))
(datum->syntax
stx `(,mod ,#'name ,#'lang ,#`(#%app raise #,e)) stx))])
(expand expr)))))]
[else (hopeless-shout [else (hopeless-shout
(string-append "only a module expression is allowed, either\n" (string-append "only a module expression is allowed, either\n"
" #lang <language-name>\n or\n" " #lang <language-name>\n or\n"
" (module <name> <language> ...)\n") " (module <name> <language> ...)\n")
stx) stx)]))
]))
;; get-filename : port -> (union string #f) ;; get-filename : port -> (union string #f)
;; extracts the file the definitions window is being saved in, if any. ;; extracts the file the definitions window is being saved in, if any.