[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: utils: 'edit-expression' copies part of the original source map.
From: |
guix-commits |
Subject: |
10/11: utils: 'edit-expression' copies part of the original source map. |
Date: |
Mon, 21 Jun 2021 17:50:53 -0400 (EDT) |
civodul pushed a commit to branch wip-simplified-packages
in repository guix.
commit 4b46c848a2cd544bdc6279b89b40f3420c494beb
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 21 16:13:35 2021 +0200
utils: 'edit-expression' copies part of the original source map.
* guix/utils.scm (source-location-key/stamp): New procedure.
(go-to-location): Use it.
(copy-source-location-map!): New procedure.
(edit-expression): Call it.
---
guix/utils.scm | 36 +++++++++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
diff --git a/guix/utils.scm b/guix/utils.scm
index e6d0761..399710f 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -34,6 +34,7 @@
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-39)
+ #:use-module (srfi srfi-71)
#:use-module (ice-9 ftw)
#:use-module (rnrs io ports) ;need 'port-position' etc.
#:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!))
@@ -344,14 +345,20 @@ a list of command-line arguments passed to the
compression program."
;; 'go-to-location'.
(make-hash-table))
-(define (go-to-location port line column)
+(define (source-location-key/stamp stat)
+ "Return two values: the key for STAT in %SOURCE-LOCATION-MAP, and a stamp
+used to invalidate corresponding entries."
+ (let ((key (list (stat:ino stat) (stat:dev stat)))
+ (stamp (list (stat:mtime stat) (stat:mtimensec stat)
+ (stat:size stat))))
+ (values key stamp)))
+
+(define* (go-to-location port line column)
"Jump to LINE and COLUMN (both one-indexed) in PORT. Maintain a source
location map such that this can boil down to seek(2) and a few read(2) calls,
which can drastically speed up repetitive operations on large files."
(let* ((stat (stat port))
- (key (list (stat:ino stat) (stat:dev stat)))
- (stamp (list (stat:mtime stat) (stat:mtimensec stat)
- (stat:size stat)))
+ (key stamp (source-location-key/stamp stat))
;; Look for an up-to-date source map for KEY. The map is a vlist
;; where each entry gives the byte offset of the beginning of a line:
@@ -398,6 +405,19 @@ which can drastically speed up repetitive operations on
large files."
(set-port-line! port (- line 1))
(set-port-column! port (- column 1))))
+(define (copy-source-location-map! source target line)
+ "Copy the source location map from SOURCE up to LINE to TARGET. SOURCE and
+TARGET must be stat buffers as returned by 'stat'."
+ (let* ((source-key (source-location-key/stamp source))
+ (target-key target-stamp (source-location-key/stamp target)))
+ (match (hash-ref %source-location-map source-key)
+ (#f #t)
+ ((_ ... source-map)
+ ;; Strip the source map and update the associated stamp.
+ (let ((source-map (vlist-take source-map (max line 1))))
+ (hash-set! %source-location-map target-key
+ `(,@target-stamp ,source-map)))))))
+
(define* (edit-expression source-properties proc #:key (encoding "UTF-8"))
"Edit the expression specified by SOURCE-PROPERTIES using PROC, which should
be a procedure that takes the original expression in string and returns a new
@@ -435,7 +455,13 @@ This procedure returns #t on success."
;; post-bv maybe the end-of-file object.
(when (not (eof-object? post-bv))
(put-bytevector out post-bv))
- #t)))))))))
+ #t))
+
+ ;; Due to 'with-atomic-file-output', IN and FILE no longer share
+ ;; the same inode, but we can copy source map up to LINE to the
+ ;; new file.
+ (copy-source-location-map! (stat in) (stat file)
+ (+ 1 line)))))))))
;;;
- branch wip-simplified-packages created (now 65d654e), guix-commits, 2021/06/21
- 01/11: records: Support field sanitizers., guix-commits, 2021/06/21
- 02/11: packages: Allow inputs to be plain package lists., guix-commits, 2021/06/21
- 03/11: lint: Add 'input-labels' checker., guix-commits, 2021/06/21
- 04/11: packages: Add 'lookup-package-input' & co., guix-commits, 2021/06/21
- 09/11: utils: 'edit-expression' modifies the file only if necessary., guix-commits, 2021/06/21
- 06/11: DRAFT gnu: Change inputs of core packages to plain lists., guix-commits, 2021/06/21
- 08/11: utils: Add 'go-to-location' with source location caching., guix-commits, 2021/06/21
- 10/11: utils: 'edit-expression' copies part of the original source map.,
guix-commits <=
- 11/11: DRAFT Add 'guix style'., guix-commits, 2021/06/21
- 05/11: packages: Add 'modify-inputs'., guix-commits, 2021/06/21
- 07/11: utils: 'edit-expression' no longer leaks file ports., guix-commits, 2021/06/21