diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2016-09-25 07:06:41 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2016-09-25 07:06:41 -0700 |
| commit | 0ad39c713f1d0239abda6cece563c0964a1ea5e0 (patch) | |
| tree | 75fb44f71fb1cd79f17be1743633175ddcfeed04 | |
| parent | 0720e906157d8e51ada26b2bc81ce26a262c8964 (diff) | |
| download | txr-0ad39c713f1d0239abda6cece563c0964a1ea5e0.tar.gz txr-0ad39c713f1d0239abda6cece563c0964a1ea5e0.tar.bz2 txr-0ad39c713f1d0239abda6cece563c0964a1ea5e0.zip | |
awk macro: handle dynamic changes in rs variable.
* awk.tl (sys:awk-state loop): The loop now notices
when rs or krs changes and switches to a new
record-adapter or to the raw stream as necessary.
* txr.1: Notes added about changes to rs and krs.
| -rw-r--r-- | share/txr/stdlib/awk.tl | 48 | ||||
| -rw-r--r-- | txr.1 | 12 |
2 files changed, 40 insertions, 20 deletions
diff --git a/share/txr/stdlib/awk.tl b/share/txr/stdlib/awk.tl index eb07cdcc..404c3aab 100644 --- a/share/txr/stdlib/awk.tl +++ b/share/txr/stdlib/awk.tl @@ -82,26 +82,34 @@ (inc aws.file-num) (when beg-file-func [beg-file-func aws]) - (unwind-protect - (let* ((stin (if (streamp in) in (open-file in))) - (recin (if (and (equal aws.rs "\n") - (not aws.krs)) - stin - (record-adapter (if (regexp aws.rs) - aws.rs - (regex-compile aws.rs)) - stin - aws.krs)))) - (set aws.file-rec-num 0) - (whilet ((rec (get-line recin))) - (set aws.rec rec aws.orig-rec rec) - (inc aws.rec-num) - (inc aws.file-rec-num) - aws.(rec-to-f) - (block :awk-rec - [func aws]))) - (when end-file-func - [end-file-func aws]))))) + (flet ((get-stream (stin) + (if (and (equal aws.rs "\n") + (not aws.krs)) + stin + (record-adapter (if (regexp aws.rs) + aws.rs + (regex-compile aws.rs)) + stin + aws.krs)))) + (unwind-protect + (let* ((stin (if (streamp in) in (open-file in))) + (recin (get-stream stin)) + (noted-rs aws.rs) + (noted-krs aws.krs)) + (set aws.file-rec-num 0) + (whilet ((rec (get-line recin))) + (set aws.rec rec aws.orig-rec rec) + (inc aws.rec-num) + (inc aws.file-rec-num) + aws.(rec-to-f) + (block :awk-rec + [func aws]) + (unless (and (equal noted-rs aws.rs) + (eq noted-krs aws.krs)) + (set recin (get-stream stin)) + (set noted-rs aws.rs noted-krs aws.krs)))) + (when end-file-func + [end-file-func aws])))))) (defmeth sys:awk-state prn (self . args) (cond @@ -38563,6 +38563,12 @@ If a match for the record separator occurs at the end of the stream, it is not considered to delimit an empty record, but acts as the terminator for the previous record. +When a new value is assigned to +.codn rs , +it has no effect on the most recently scanned and delimited record which is +still current, or previous records. The new value applies to the next, not yet +read record. + .coNP Variable @ krs .desc The awk variable @@ -38575,6 +38581,12 @@ by the pattern in the .code rs variable is retained as part of the preceding record rather than removed. +When a new value is assigned to +.codn krs , +it has no effect on the most recently scanned and delimited record which is +still current, or previous records. The new value applies to the next, not yet +read record. + .coNP Variables @ fs and @ ft .desc The awk variable |