[PATCH 0/4] emacs: Some fixes and improvements.

[PATCH 0/4] emacs: Some fixes and improvements.

[Alex Kost]

Stylistic and performance improvements for scheme side.

[PATCH 1/4] emacs: Stylistic improvements in guile code.
[PATCH 2/4] emacs: Remove unused module.
[PATCH 3/4] emacs: Use (guix scripts lint) only when needed.
[PATCH 4/4] emacs: Speed up starting the REPL.

[PATCH 1/4] emacs: Stylistic improvements in guile code.

[Alex Kost]

* emacs/guix-main.scm (package-unique?): Use 'match' instead of 'cdr'.
(package-by-address): Likewise.
---
 emacs/guix-main.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index bcff9ce..da42450 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -293,8 +293,10 @@ Example:
 
 (define (package-unique? package)
   "Return #t if PACKAGE is a single package with such name/version."
-  (null? (cdr (packages-by-name (package-name package)
-                                (package-version package)))))
+  (match (packages-by-name (package-name package)
+                           (package-version package))
+    ((package) #t)
+    (_ #f)))
 
 (define %package-param-alist
   `((id                . ,object-address)
@@ -330,8 +332,9 @@ Example:
 ;;; Finding packages.
 
 (define (package-by-address address)
-  (and=> (vhash-assq address %packages)
-         cdr))
+  (match (vhash-assq address %packages)
+    ((_ . package) package)
+    (_ #f)))
 
 (define (packages-by-name+version name version)
   (or (hash-ref %package-table
-- 
2.7.3

[PATCH 2/4] emacs: Remove unused module.

[Alex Kost]

This is a followup to commit c67e344f21fda2bf5a2a377a34d4749a1c7e7c9c.

* emacs/guix-main.scm: Do not use (guix scripts pull).
---
 emacs/guix-main.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index da42450..eb79adb 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -60,7 +60,6 @@
  (guix ui)
  (guix scripts lint)
  (guix scripts package)
- (guix scripts pull)
  (gnu packages)
  (gnu system))
 
-- 
2.7.3

[PATCH 3/4] emacs: Use (guix scripts lint) only when needed.

[Alex Kost]

* emacs/guix-main.scm: Do not use (guix scripts pull) module.
(lint-checker-names): Adjust to use it.
---
 emacs/guix-main.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index eb79adb..925d2b2 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -58,7 +58,6 @@
  (guix licenses)
  (guix utils)
  (guix ui)
- (guix scripts lint)
  (guix scripts package)
  (gnu packages)
  (gnu system))
@@ -1022,8 +1021,9 @@ Return #t if the shell command was executed successfully."
 (define (lint-checker-names)
   "Return a list of names of available lint checkers."
   (map (lambda (checker)
-         (symbol->string (lint-checker-name checker)))
-       %checkers))
+         (symbol->string ((@ (guix scripts lint) lint-checker-name)
+                          checker)))
+       (@ (guix scripts lint) %checkers)))
 
 (define (package-names)
   "Return a list of names of available packages."
-- 
2.7.3

[PATCH 4/4] emacs: Speed up starting the REPL.

[Alex Kost]

Delay initializing variables.

* emacs/guix-main.scm: (%packages): Rename to...
(%package-vhash): ... this.  Delay setting the value.
(package-vhash): New procedure (wrapper for '%package-vhash').
(%package-table): Delay setting the value.
(package-table): New procedure (wrapper for '%package-table').
(package-by-address, packages-by-name+version): Use wrappers.
---
 emacs/guix-main.scm | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index 925d2b2..c620440 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -103,24 +103,34 @@ return two values: name and version.  For example, for SPEC
 (define name+version->key cons)
 (define key->name+version car+cdr)
 
-(define %packages
-  (fold-packages (lambda (pkg res)
-                   (vhash-consq (object-address pkg) pkg res))
-                 vlist-null))
+(define %package-vhash
+  (delay
+    (fold-packages (lambda (pkg res)
+                     (vhash-consq (object-address pkg) pkg res))
+                   vlist-null)))
+
+(define (package-vhash)
+  "Return vhash of 'package ID (address)'/'package' pairs."
+  (force %package-vhash))
 
 (define %package-table
-  (let ((table (make-hash-table (vlist-length %packages))))
-    (vlist-for-each
-     (lambda (elem)
-       (match elem
-         ((address . pkg)
-          (let* ((key (name+version->key (package-name pkg)
-                                         (package-version pkg)))
-                 (ref (hash-ref table key)))
-            (hash-set! table key
-                       (if ref (cons pkg ref) (list pkg)))))))
-     %packages)
-    table))
+  (delay
+    (let ((table (make-hash-table (vlist-length (package-vhash)))))
+      (vlist-for-each
+       (lambda (elem)
+         (match elem
+           ((address . pkg)
+            (let* ((key (name+version->key (package-name pkg)
+                                           (package-version pkg)))
+                   (ref (hash-ref table key)))
+              (hash-set! table key
+                         (if ref (cons pkg ref) (list pkg)))))))
+       (package-vhash))
+      table)))
+
+(define (package-table)
+  "Return hash table of 'name+version key'/'list of packages' pairs."
+  (force %package-table))
 
 (define (manifest-entry->name+version+output entry)
   (values
@@ -330,12 +340,12 @@ Example:
 ;;; Finding packages.
 
 (define (package-by-address address)
-  (match (vhash-assq address %packages)
+  (match (vhash-assq address (package-vhash))
     ((_ . package) package)
     (_ #f)))
 
 (define (packages-by-name+version name version)
-  (or (hash-ref %package-table
+  (or (hash-ref (package-table)
                 (name+version->key name version))
       '()))
 
-- 
2.7.3

Re: [PATCH 1/4] emacs: Stylistic improvements in guile code.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * emacs/guix-main.scm (package-unique?): Use 'match' instead of 'cdr'.
> (package-by-address): Likewise.

OK!

Ludo'.

Re: [PATCH 2/4] emacs: Remove unused module.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> This is a followup to commit c67e344f21fda2bf5a2a377a34d4749a1c7e7c9c.
>
> * emacs/guix-main.scm: Do not use (guix scripts pull).

OK

Re: [PATCH 3/4] emacs: Use (guix scripts lint) only when needed.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * emacs/guix-main.scm: Do not use (guix scripts pull) module.
> (lint-checker-names): Adjust to use it.

OK.

Re: [PATCH 4/4] emacs: Speed up starting the REPL.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Delay initializing variables.
>
> * emacs/guix-main.scm: (%packages): Rename to...
> (%package-vhash): ... this.  Delay setting the value.
> (package-vhash): New procedure (wrapper for '%package-vhash').
> (%package-table): Delay setting the value.
> (package-table): New procedure (wrapper for '%package-table').
> (package-by-address, packages-by-name+version): Use wrappers.

OK, sounds reasonable.

Thanks!

Ludo’.