summaryrefslogtreecommitdiff
path: root/doc/ref
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-01-14 22:23:39 -0500
committerMark H Weaver <mhw@netris.org>2014-01-14 22:23:39 -0500
commitc92ee2b38cb1ace800de081c9211120afea0c595 (patch)
treeb36dc3fd52891ea5e53c94e22bb777f6e7d6e4f4 /doc/ref
parentcb8aaef4d08989aea2b7f088d298f71a03ecc1b2 (diff)
parent6e504a7b44a9a25787bdfb2d86fdddd3029f4ba9 (diff)
downloadguile-c92ee2b38cb1ace800de081c9211120afea0c595.tar.gz
Merge branch 'stable-2.0'
Conflicts: libguile/print.c libguile/read.c test-suite/tests/print.test
Diffstat (limited to 'doc/ref')
-rw-r--r--doc/ref/api-data.texi10
-rw-r--r--doc/ref/api-evaluation.texi10
-rw-r--r--doc/ref/srfi-modules.texi9
3 files changed, 27 insertions, 2 deletions
diff --git a/doc/ref/api-data.texi b/doc/ref/api-data.texi
index 1a3d2e873..c73a703d5 100644
--- a/doc/ref/api-data.texi
+++ b/doc/ref/api-data.texi
@@ -5588,6 +5588,16 @@ Although Guile provides this extended read syntax for symbols,
widespread usage of it is discouraged because it is not portable and not
very readable.
+Alternatively, if you enable the @code{r7rs-symbols} read option (see
+@pxref{Scheme Read}), you can write arbitrary symbols using the same
+notation used for strings, except delimited by vertical bars instead of
+double quotes.
+
+@example
+|foo bar|
+|\x3BB; is a greek lambda|
+|\| is a vertical bar|
+@end example
@node Symbol Uninterned
@subsubsection Uninterned Symbols
diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi
index 1810fe854..aa3729c1f 100644
--- a/doc/ref/api-evaluation.texi
+++ b/doc/ref/api-evaluation.texi
@@ -1,7 +1,7 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
-@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2012, 2013
-@c Free Software Foundation, Inc.
+@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+@c 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@node Read/Load/Eval/Compile
@@ -340,6 +340,7 @@ square-brackets yes Treat `[' and `]' as parentheses, for R6RS compatibility
hungry-eol-escapes no In strings, consume leading whitespace after an
escaped end-of-line.
curly-infix no Support SRFI-105 curly infix expressions.
+r7rs-symbols no Support R7RS |...| symbol notation.
@end smalllisp
Note that Guile also includes a preliminary mechanism for setting read
@@ -377,6 +378,9 @@ For example, to make @code{read} fold all symbols to their lower case
For more information on the effect of the @code{r6rs-hex-escapes} and
@code{hungry-eol-escapes} options, see (@pxref{String Syntax}).
+For more information on the @code{r7rs-symbols} option, see
+(@pxref{Symbol Read Syntax}).
+
@node Scheme Write
@subsection Writing Scheme Values
@@ -436,6 +440,8 @@ quote-keywordish-symbols reader How to print symbols that have a colon
not '#f'.
escape-newlines yes Render newlines as \n when printing
using `write'.
+r7rs-symbols no Escape symbols using R7RS |...| symbol
+ notation.
@end smalllisp
These options may be modified with the print-set! syntax.
diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index 3b73c083e..0eb20d9ae 100644
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -51,6 +51,7 @@ get the relevant SRFI documents from the SRFI home page
* SRFI-55:: Requiring Features.
* SRFI-60:: Integers as bits.
* SRFI-61:: A more general `cond' clause
+* SRFI-62:: S-expression comments.
* SRFI-67:: Compare procedures
* SRFI-69:: Basic hash tables.
* SRFI-88:: Keyword objects.
@@ -155,6 +156,7 @@ srfi-30
srfi-39
srfi-55
srfi-61
+srfi-62
srfi-105
@end example
@@ -4829,6 +4831,13 @@ success. SRFI 61 is implemented in the Guile core; there's no module
needed to get SRFI-61 itself. Extended @code{cond} is documented in
@ref{Conditionals,, Simple Conditional Evaluation}.
+@node SRFI-62
+@subsection SRFI-62 - S-expression comments.
+@cindex SRFI-62
+
+Starting from version 2.0, Guile's @code{read} supports SRFI-62/R7RS
+S-expression comments by default.
+
@node SRFI-67
@subsection SRFI-67 - Compare procedures
@cindex SRFI-67