Skip to content
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.

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

resolve issues with gambit head readtable changes #634

Merged
merged 4 commits into from
Oct 19, 2021
Merged
Changes from 1 commit
Commits
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
Next Next commit
handle readtable changes in gambit head
  • Loading branch information
vyzo committed Oct 19, 2021
commit 67c092cb024354ddac6a4e1d75672bf93fad9e03
35 changes: 30 additions & 5 deletions src/gerbil/runtime/gx-gambc1.scm
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,38 @@
(make-&context 'root #f #f _gx#*core*)
(make-hash-table-eq)))

(define _gx#*readtable*
(let ((rt (readtable-write-extended-read-macros?-set
(##make-standard-readtable) #t)))
(macro-readtable-bracket-keyword-set! rt '@list)
(macro-readtable-brace-keyword-set! rt '@method)
;; the gerbil readtable
(define (_gx#make-readtable)
(let ((rt (##make-standard-readtable)))
(macro-readtable-write-extended-read-macros?-set! rt #t)
(_gx#readtable-bracket-keyword-set! rt '@list)
(_gx#readtable-brace-keyword-set! rt '@method)
(##readtable-char-sharp-handler-set! rt #\! _gx#read-sharp-bang)
rt))

(eval-if (>= (##vector-length (current-readtable)) 42)
(begin
(define (_gx#readtable-bracket-keyword-set! rt kw)
(macro-readtable-bracket-handler-set! rt kw))
(define (_gx#readtable-brace-keyword-set! rt kw)
(macro-readtable-brace-handler-set! rt kw)))
(begin
(define (_gx#readtable-bracket-keyword-set! rt kw)
(macro-readtable-bracket-keyword-set! rt kw))
(define (_gx#readtable-brace-keyword-set! rt kw)
(macro-readtable-brace-keyword-set! rt kw))))

(define (_gx#read-sharp-bang re next start-pos)
(if (eq? start-pos 0)
(begin
(##read-line (macro-readenv-port re) #\newline #f ##max-fixnum)
(##script-marker))
(##read-sharp-bang re next start-pos)))

(define _gx#*readtable*
(_gx#make-readtable))

;; interpretation parameters
(define &current-expander
(make-parameter #f))
(define &current-compiler
Expand Down