| Message ID | 028a3d700965947fa0547eb17d4894b8302eb67c.1707505804.git.herman@rimm.ee |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#68935,v2,1/6] doc: Note SVN dependency of texlive importer. | expand |
Herman Rimm <herman@rimm.ee> skribis: > * guix/utils.scm (find-expression): Add and export procedure. > * tests/utils.scm ("find-expression"): Add test. > > Change-Id: Ie209df39c1f006b20aa6436fb1aef4c84b1694ee [...] > +(define (find-expression file expr proc) > + "Search in FILE for a top-level expression which alphabetically > +succeeds EXPR. Call PROC with the location if found, or with #f > +otherwise." > + (let* ((name (match expr > + (('define-public symbol _ ...) > + (symbol->string symbol)))) > + (source-properties > + (call-with-input-file > + file > + (lambda (port) > + (do ((syntax (read-syntax port) > + (read-syntax port))) > + ((match (syntax->datum syntax) > + (('define-public symbol _ ...) > + (string> (symbol->string symbol) > + name)) > + ((? eof-object?) #t) > + (_ #f)) > + (if (eof-object? syntax) > + #f (syntax-source syntax)))))))) > + (proc source-properties))) I think it’d be clearer to: 1. Omit ‘proc’ and always return the source properties of the thing that has been found. 2. Pass a symbol instead of ‘expr’. 3. Call it ‘find-definition-insertion-location’ to clarify that it’s really about finding where we want to insert a definition, hence alphabetical sorting. BTW, the formatting above is unusual; for instance, ‘file’ would normally appear on the same line as ‘call-with-input-file’. Also, write: (and (not (eof-object? syntax)) (syntax-source-syntax)) … instead of using ‘if’. Thanks, Ludo’.
diff --git a/guix/utils.scm b/guix/utils.scm index 8f0bc2399e..315feeb232 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -148,6 +148,7 @@ (define-module (guix utils) edit-expression delete-expression insert-expression + find-expression filtered-port decompressed-port @@ -513,6 +514,29 @@ (define (insert-expression source-properties expr) (string-append expr "\n\n" str)))) (edit-expression source-properties insert))) +(define (find-expression file expr proc) + "Search in FILE for a top-level expression which alphabetically +succeeds EXPR. Call PROC with the location if found, or with #f +otherwise." + (let* ((name (match expr + (('define-public symbol _ ...) + (symbol->string symbol)))) + (source-properties + (call-with-input-file + file + (lambda (port) + (do ((syntax (read-syntax port) + (read-syntax port))) + ((match (syntax->datum syntax) + (('define-public symbol _ ...) + (string> (symbol->string symbol) + name)) + ((? eof-object?) #t) + (_ #f)) + (if (eof-object? syntax) + #f (syntax-source syntax)))))))) + (proc source-properties))) + ;;; ;;; Keyword arguments. diff --git a/tests/utils.scm b/tests/utils.scm index cd54112846..feaed4b561 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -288,6 +288,22 @@ (define-public package-2\n 'package)\n" `(define-public package-1 'package)) (call-with-input-file temp-file get-string-all))) +(test-equal "find-expression" + (list `((filename . ,temp-file) (line . 0) (column . 0)) + `((filename . ,temp-file) (line . 5) (column . 0)) + #f) + (begin + (call-with-output-file temp-file + (lambda (port) + (display "(define-public package-1\n 'foo)\n\n" port) + (display "(define foo 'bar)\n\n" port) + (display "(define-public package-2\n 'baz)\n" port))) + (map (lambda (expr) + (find-expression temp-file expr identity)) + (list `(define-public package 'foo) + `(define-public package-1 'bar) + `(define-public package-2 'baz))))) + (test-equal "string-distance" '(0 1 1 5 5) (list
* guix/utils.scm (find-expression): Add and export procedure. * tests/utils.scm ("find-expression"): Add test. Change-Id: Ie209df39c1f006b20aa6436fb1aef4c84b1694ee --- guix/utils.scm | 24 ++++++++++++++++++++++++ tests/utils.scm | 16 ++++++++++++++++ 2 files changed, 40 insertions(+)