commit e972d53bed91c5407703de43a148c7e8be9354dd
parent e9b0cf1a08063be4291be1e7ee291260970a4425
Author: Wolfgang Corcoran-Mathe <wcm@sigwinch.xyz>
Date: Thu, 8 Feb 2024 13:46:45 -0500
Use @hashchar escape in format blocks.
Diffstat:
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/doc/r7rs-small/formal-syntax.texinfo b/doc/r7rs-small/formal-syntax.texinfo
@@ -71,7 +71,7 @@ the corresponding character.
@format
@svar{token} @expansion{} @svar{identifier} | @svar{boolean}
| @svar{number} | @svar{character} | @svar{string}
- | @code{(} | @code{)} | @code{#(} | @code{#u8} | @code{'} |
+ | @code{(} | @code{)} | @code{@hashchar{}(} | @code{@hashchar{}u8} | @code{'} |
| @code{`} | @code{,} | @code{,@@} | @code{.}
@svar{delimiter} @expansion{} @svar{whitespace} | @svar{vertical line}
| @code{(} | @code{)} | @code{"} | @code{;}
@@ -83,13 +83,13 @@ the corresponding character.
| @svar{return} @svar{newline} | @svar{return}
@svar{comment} @expansion{} @code{;} @pseudoprod{all subsequent characters up to a line ending}
| @svar{nested comment}
- | @code{#;} @svar{intertoken space} @svar{datum}
-@svar{nested comment} @expansion{} @code{#|} @svar{comment text}
- @arbno{@svar{comment cont}} @code{|#}
-@svar{comment text} @expansion{} @pseudoprod{character sequence not containing @code{#|} or @code{|#}}
+ | @code{@hashchar{};} @svar{intertoken space} @svar{datum}
+@svar{nested comment} @expansion{} @code{@hashchar{}|} @svar{comment text}
+ @arbno{@svar{comment cont}} @code{|@hashchar{}}
+@svar{comment text} @expansion{} @pseudoprod{character sequence not containing @code{@hashchar{}|} or @code{|@hashchar{}}}
@svar{comment cont} @expansion{} @svar{nested comment}
@svar{comment text}
-@svar{directive} @expansion{} @code{#!fold-case} | @code{#!no-fold-case}
+@svar{directive} @expansion{} @code{@hashchar{}!fold-case} | @code{@hashchar{}!no-fold-case}
@end format
Note that it is ungrammatical to follow a @svar{directive} with
@@ -140,12 +140,12 @@ identifiers.
@pseudoprod{any character other than @svar{vertical line} or @code{@backslashchar{}}}
| @svar{inline hex escape} | @svar{mnemonic escape} | @code{|}
-@svar{boolean} @expansion{} @code{#t} | @code{#f} | @code{#true}
- | @code{#false}
+@svar{boolean} @expansion{} @code{@hashchar{}t} | @code{@hashchar{}f} | @code{@hashchar{}true}
+ | @code{@hashchar{}false}
-@svar{character} @expansion{} #\ @svar{any character}
- | #\ @svar{character name}
- | #\x@svar{hex scalar value}
+@svar{character} @expansion{} @hashchar{}\ @svar{any character}
+ | @hashchar{}\ @svar{character name}
+ | @hashchar{}\x@svar{hex scalar value}
@svar{character name} @expansion{} @code{alarm} | @code{backspace}
| @code{delete} | @code{escape} | @code{newline} | @code{null}
@@ -160,7 +160,7 @@ identifiers.
@arbno{@svar{intraline whitespace}}
| @svar{inline hex escape}
-@svar{bytevector} @expansion{} \#u8(@arbno{@svar{byte}})
+@svar{bytevector} @expansion{} \@hashchar{}u8(@arbno{@svar{byte}})
@svar{byte} @expansion{} @pseudoprod{any exact integer between 0 and 255}
@end format
@@ -215,11 +215,11 @@ in the grammar of numbers can appear in either upper or lower case.
| @svar{exponent marker} @svar{sign} @atleastone{@svar{digit 10}}
@svar{exponent marker} @expansion{} @code{e}
@svar{sign} @expansion{} @svar{empty} | @code{+} | @code{-}
-@svar{exactness} @expansion{} @svar{empty} | @code{#i} | @code{#e}
-@svar{radix 2} @expansion{} @code{#b}
-@svar{radix 8} @expansion{} @code{#o}
-@svar{radix 10} @expansion{} @svar{empty} | @code{#d}
-@svar{radix 16} @expansion{} @code{#x}
+@svar{exactness} @expansion{} @svar{empty} | @code{@hashchar{}i} | @code{@hashchar{}e}
+@svar{radix 2} @expansion{} @code{@hashchar{}b}
+@svar{radix 8} @expansion{} @code{@hashchar{}o}
+@svar{radix 10} @expansion{} @svar{empty} | @code{@hashchar{}d}
+@svar{radix 16} @expansion{} @code{@hashchar{}x}
@svar{digit 2} @expansion{} @code{0} | @code{1}
@svar{digit 8} @expansion{} @code{0} | @code{1} | @code{2} | @code{3}
| @code{4} | @code{5} | @code{6} | @code{7}
@@ -237,7 +237,7 @@ also parse as a @svar{datum}.
@format
@svar{datum} @expansion{} @svar{simple datum} ∣ @svar{compound datum}
- ∣ @svar{label} @code{=} @svar{datum} ∣ @svar{label} @code{#}
+ ∣ @svar{label} @code{=} @svar{datum} ∣ @svar{label} @code{@hashchar{}}
@svar{simple datum} @expansion{} @svar{boolean} ∣ @svar{number}
∣ @svar{character} ∣ @svar{string} ∣ @svar{symbol}
∣ @svar{bytevector}
@@ -249,8 +249,8 @@ also parse as a @svar{datum}.
@svar{abbreviation} @expansion{} @svar{abbrev prefix} @svar{datum}
@svar{abbrev prefix} @expansion{} @code{'} ∣ @code{`} ∣ @code{,}
∣ @code{,@@}
-@svar{vector} @expansion{} @code{#(}@arbno{@svar{datum}}@code{)}
-@svar{label} @expansion{} @code{#} @svar{uinteger 10}
+@svar{vector} @expansion{} @code{@hashchar{}(}@arbno{@svar{datum}}@code{)}
+@svar{label} @expansion{} @code{@hashchar{}} @svar{uinteger 10}
@end format
@node Expressions formal