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

Add r7rs character names #323

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 2 additions & 0 deletions LOG
Original file line number Diff line number Diff line change
Expand Up @@ -1137,3 +1137,5 @@
generated config.h. Instead removed InstallPrefix entirely so
it isn't an attractive hazzard.
configure, makefiles/Mf-install.in
- add #\null and #\escape as aliases for #\nul and #\esc (R7RS compatibility)
- allow \| escape inside strings (R7RS compatibility)
7 changes: 7 additions & 0 deletions mats/6.ms
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,9 @@
(eqv? (char-name 'rubout) #\rubout)
(eqv? (char-name #\nul) 'nul)
(eqv? (char-name 'nul) #\nul)
(eqv? (char-name #\null) 'nul)
(eqv? (char-name 'null) #\nul)
(eqv? #\nul #\null)
(eqv? (char-name 'foo) #f)
(eqv? (char-name 'delete) #\delete)
(eqv? (char-name #\delete) 'delete)
Expand All @@ -1540,6 +1543,9 @@
(eqv? (char-name #\alarm) 'alarm)
(eqv? (char-name 'esc) #\esc)
(eqv? (char-name #\esc) 'esc)
(eqv? (char-name 'escape) #\esc)
(eqv? (char-name #\escape) 'esc)
(eqv? #\esc #\escape)
(error? (read (open-input-string "#\\foo")))
(and (eqv? (char-name 'foo #\003) (void))
(eqv? (char-name 'foo) #\003)
Expand Down Expand Up @@ -1568,6 +1574,7 @@
(eqv? (string-ref "\\\"\'" 0) #\\)
(eqv? (string-ref "\\\"\'" 1) #\")
(eqv? (string-ref "\\\"\'" 2) #\')
(eqv? (string-ref "\|\v" 0) #\|)
(= (char->integer (string-ref "a\012" 1)) #o12 10)
(= (char->integer (string-ref "a\015" 1)) #o15 13)
(= (char->integer (string-ref "a\177" 1)) #o177 127)
Expand Down
4 changes: 3 additions & 1 deletion s/read.ss
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@
(with-read-char c
(state-case c
[eof (with-unread-char c (xcall rd-eof-error "string"))]
[(#\\ #\")
[(#\\ #\" #\|)
(with-stretch-buffer i c
(*state rd-token-string (fx+ i 1)))]
[(#\n #\a #\b #\f #\r #\t #\v)
Expand Down Expand Up @@ -1856,9 +1856,11 @@
(char-name 'newline #\newline) ; must come after linefeed entry
(char-name 'backspace #\backspace)
(char-name 'rubout #\rubout)
(char-name 'null #\nul)
(char-name 'nul #\nul)
(char-name 'bel #\bel)
(char-name 'vt #\vt)
(char-name 'escape #\esc)
(char-name 'esc #\esc)
(char-name 'vtab #\vtab)
(char-name 'delete #\rubout)
Expand Down