From 5c9c19fd5e3dc428369f4a84d335c7a8e0bbc560 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 26 Apr 2016 07:14:57 -0700 Subject: Check that arg 2 of .codn starts with punctuation. * checkman.txr: Constraint on first character of second argument coded as a require constraint, enforced with assert. * txr.1: Newly discovered errors fixed. --- checkman.txr | 3 +++ txr.1 | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/checkman.txr b/checkman.txr index c4a13356..a9c18835 100644 --- a/checkman.txr +++ b/checkman.txr @@ -70,6 +70,9 @@ .cod3 @(assert bad ln `.cod3 needs three arguments`)@x @y @{z /\S+/}@(eol) @ (or) .@{type /codn|cod2/} @(assert bad ln `.@type needs two arguments`)@(cases)"@x"@(or)@{x /\S+/}@(end) @{y /\S+/}@(eol) +@ (assert bad ln `.codn second argument doesn't begin with punctuation`) +@ (require (or (not (equal type "codn")) + (chr-ispunct [y 0]))) @ (end) @(end) @;; diff --git a/txr.1 b/txr.1 index 72424318..96df771b 100644 --- a/txr.1 +++ b/txr.1 @@ -11313,7 +11313,7 @@ and is that in .codn let* , later -.codn init-form s +.codn init-form -s have visibility over the variables established by earlier variables in the same let* construct. In plain .codn let , @@ -22658,7 +22658,7 @@ Like .code mappend* must "consume" empty lists. For instance, if the function being mapped puts out a sequence of -.codn nil s, +.codn nil -s, then the result must be the empty list .codn nil , because @@ -22683,7 +22683,7 @@ The .code mappend* function is caught in a loop trying to consume and squash an infinite stream of -.codn nil s, +.codn nil -s, and so doesn't return. .TP* Examples: @@ -30669,7 +30669,7 @@ argument specifies whether the hash table shall have weak keys. The argument specifies whether it shall have weak values, and .meta equal-based specifies whether it is -.codn equal- based. +.codn equal -based. The hash function defaults all three of these properties to false, and allows them to be overridden to true by the presence of keyword arguments. @@ -37599,7 +37599,7 @@ constants from the .code header: .codn LOG_PID , -.codn LOG_CON S, +.codn LOG_CONS , etc. These integer values represent logging options used in the .meta options -- cgit v1.2.3