summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--txr.115
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e963e8af..c0c3717b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
(grammar): Add a rule for a \@ escape in quasiliterals,
and quasi word list literals.
+ * txr.1: Document \@, and remove the lie that @@
+ encodes for a single @ in quasiliterals.
+
2015-06-26 Kaz Kylheku <kaz@kylheku.com>
Second round of quasiliteral-related fixes.
diff --git a/txr.1 b/txr.1
index 8d2e2f8d..8992a257 100644
--- a/txr.1
+++ b/txr.1
@@ -2481,13 +2481,18 @@ the quasiliteral
represents the string
.strn "one apple and two bananas" .
A backquote escaped by a backslash represents
-itself, and two consecutive
+itself. Unlike in directive syntax, two consecutive
.code @
-characters code for a literal
-.codn @ .
-There is no
+characters do not code for a literal
+.codn @ ,
+but cause a syntax error. The reason for this is that compounding of the
+.code @
+syntax is meaningful.
+Instead, there is a
.code \e@
-escape. Quasiliterals support the full output variable
+escape for encoding a literal
+.code @
+character. Quasiliterals support the full output variable
syntax. Expressions within variables substitutions follow the evaluation rules
of \*(TL when the quasiliteral occurs in \*(TL, and the rules of
the \*(TX pattern language when the quasiliteral occurs in the pattern language.