From: "Ludovic Courtès" <ludo@gnu.org>
To: Herman Rimm <herman@rimm.ee>
Cc: Josselin Poiret <dev@jpoiret.xyz>,
Simon Tournier <zimon.toutoune@gmail.com>,
Mathieu Othacehe <othacehe@gnu.org>,
Tobias Geerinckx-Rice <me@tobias.gr>,
Ricardo Wurmus <rekado@elephly.net>,
68935@debbugs.gnu.org, Christopher Baines <guix@cbaines.net>
Subject: [bug#68935] [PATCH 3/3] guix: import: Put packages into modules in alphabetical order.
Date: Wed, 07 Feb 2024 22:57:12 +0100 [thread overview]
Message-ID: <874jek3pl3.fsf@gnu.org> (raw)
In-Reply-To: <a380fd9adc163c8b425397163956672f5cda70c5.1707144191.git.herman@rimm.ee> (Herman Rimm's message of "Mon, 5 Feb 2024 16:07:14 +0100")
Herman Rimm <herman@rimm.ee> skribis:
> * guix/scripts/import.scm (guix-import): Add 'put' option.
> (try-import): Add variable.
> * doc/guix.texi (Invoking guix import): Describe 'put' option.
>
> Change-Id: Ied4fc95899c31fb2523a01139780fc9744aa63cb
Nice! This can certainly simplify people’s work!
> @example
> -guix import @var{importer} @var{options}@dots{}
> +guix import @var{option} @var{importer} @var{options}@dots{}
Uh? It looks weird at first. :-)
For clarity, we should change it to something like:
guix import [@var{global-options}@dots{}] @var{importer} @var{package} [@var{options}@dots{}]
… though I admit this doesn’t look great either.
> +@item --put=@var{file}
> +@itemx -p @var{file}
> +Insert the package definition(s) that the @var{importer} generated into the
How about calling it ‘--insert’? It seems more natural.
> +(define (try-import importer args finish)
Please add a docstring for top-level procedures like this one:
https://guix.gnu.org/manual/devel/en/html_node/Formatting-Code.html
> + (if (member importer importers)
> + (match (apply (resolve-importer importer) args)
Indentation of the second line is off.
> + ((and expr ('package _ ...))
> + (finish (package->definition expr)))
> + ((and expr (or ('let _ ...)
> + ('define-public _ ...)))
> + (finish expr))
Again (let …) should be treated like (package …).
> + ((? list? expressions)
> + (for-each (lambda (expr)
> + (match expr
> + ((and expr ('package _ ...))
> + (finish (package->definition expr)))
> + ((and expr (or ('let _ ...)
> + ('define-public _ ...)))
> + (finish expr))))
Likewise. Also indentation of ‘match’ and that of the subsequent
clauses is off.
> - ((or ("-h") ("--help"))
> + ((or ("-h" _ ...) ("--help" _ ...))
> (leave-on-EPIPE (show-help))
> (exit 0))
> - ((or ("-V") ("--version"))
> + ((or ("-V" _ ...) ("--version" _ ...))
> (show-version-and-exit "guix import"))
This change seems to be unrelated, right?
> + ((or ("-p" module importer args ...)
> + ("--put" module importer args ...))
> + (let ((put (lambda (expr)
> + (let ((line
> + (call-with-input-file module
> + (lambda (port)
> + (do ((se (read-syntax port)
> + (read-syntax port)))
> + ((match (syntax->datum se)
> + (('define-public symbol _ ...)
> + (string> (symbol->string symbol)
> + (symbol->string (cadr expr))))
> + ((? eof-object?) #t)
> + (_ #f))
> + (if (eof-object? se)
> + #f
> + (car (string-split
> + (object->string*
> + (syntax->datum se) 0)
> + #\newline)))))))))
> + (if line
> + (substitute* module
> + (((string-append "\\" line))
> + (string-append
> + (object->string* expr 0)
> + "\n\n" line)))
> + (let ((port (open-file module "a")))
> + (pretty-print-with-comments port expr)
> + (newline port)
> + (close-port port)))))))
This whole thing should be in a separate procedure, probably in (guix
utils), close to ‘edit-expression’, and we could call it
‘insert-expression’ and it would take the location where the caller
wants to insert an expression.
Then, separately, we need a procedure to determine that location based
on the alphabetical order to top-level ‘define-public’ occurrences.
Does that make sense? We should try and add tests for these in
‘tests/utils.scm’.
Also please check out the coding style regarding use of ‘car’ etc.:
https://guix.gnu.org/manual/devel/en/html_node/Data-Types-and-Pattern-Matching.html
Could you send an updated series?
Please let us know if anything’s unclear or if you need guidance.
Thank you!
Ludo’.
next prev parent reply other threads:[~2024-02-07 21:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-05 14:51 [bug#68935] [PATCH 0/3] Add 'put' option to guix import Herman Rimm via Guix-patches via
2024-02-05 15:07 ` [bug#68935] [PATCH 1/3] svn-fetch: Require svn-command argument Herman Rimm via Guix-patches via
2024-02-07 21:34 ` Ludovic Courtès
2024-02-05 15:07 ` [bug#68935] [PATCH 2/3] guix: import: Wrap package expressions with define-public Herman Rimm via Guix-patches via
2024-02-07 21:38 ` Ludovic Courtès
2024-02-05 15:07 ` [bug#68935] [PATCH 3/3] guix: import: Put packages into modules in alphabetical order Herman Rimm via Guix-patches via
2024-02-07 21:57 ` Ludovic Courtès [this message]
2024-02-09 19:25 ` [bug#68935] [PATCH v2 1/6] doc: Note SVN dependency of texlive importer Herman Rimm via Guix-patches via
2024-02-09 19:25 ` [bug#68935] [PATCH v2 2/6] import: Wrap package expressions with define-public Herman Rimm via Guix-patches via
2024-02-09 19:25 ` [bug#68935] [PATCH v2 3/6] utils: Add insert-expression procedure Herman Rimm via Guix-patches via
2024-02-19 21:31 ` Ludovic Courtès
2024-02-09 19:25 ` [bug#68935] [PATCH v2 4/6] utils: Add find-expression procedure Herman Rimm via Guix-patches via
2024-02-19 21:38 ` Ludovic Courtès
2024-02-09 19:25 ` [bug#68935] [PATCH v2 5/6] import: Insert packages into modules alphabetically Herman Rimm via Guix-patches via
2024-02-10 15:06 ` Herman Rimm via Guix-patches via
2024-02-16 16:06 ` Herman Rimm via Guix-patches via
2024-02-19 21:43 ` Ludovic Courtès
2024-02-09 19:25 ` [bug#68935] [PATCH v2 6/6] import: Discard args after --version and --help Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 0/7] Add insert option to guix import Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 1/7] doc: Note SVN dependency of texlive importer Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 2/7] import: Wrap package expressions with define-public Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 3/7] utils: Add insert-expression procedure Herman Rimm via Guix-patches via
2024-02-23 19:53 ` Ludovic Courtès
2024-02-20 20:45 ` [bug#68935] [PATCH v3 4/7] utils: Add find-definition-insertion-location procedure Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 5/7] import: Insert packages into modules alphabetically Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 6/7] import: Discard args after --version and --help Herman Rimm via Guix-patches via
2024-02-20 20:45 ` [bug#68935] [PATCH v3 7/7] import: Do not return package name with json importer Herman Rimm via Guix-patches via
2024-02-23 17:53 ` [bug#68935] [PATCH v3 0/7] Add insert option to guix import Ludovic Courtès
2024-02-23 19:52 ` bug#68935: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jek3pl3.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=68935@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=guix@cbaines.net \
--cc=herman@rimm.ee \
--cc=me@tobias.gr \
--cc=othacehe@gnu.org \
--cc=rekado@elephly.net \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.