Browse Source

discovery: Move 'file-name->module-name' to (guix modules).

* guix/discovery.scm (file-name->module-name): Move to...
* guix/modules.scm (file-name->module-name): ... here.
* guix/build/compile.scm: Use (guix modules) instead of (guix discovery).
gn-latest-20200428
Ludovic Courtès 4 years ago
parent
commit
7a51c78c6e
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
3 changed files with 13 additions and 11 deletions
  1. +1
    -1
      guix/build/compile.scm
  2. +2
    -10
      guix/discovery.scm
  3. +10
    -0
      guix/modules.scm

+ 1
- 1
guix/build/compile.scm View File

@ -24,7 +24,7 @@
#:use-module (system base target)
#:use-module (system base compile)
#:use-module (system base message)
#:use-module (guix discovery)
#:use-module (guix modules)
#:use-module (guix build utils)
#:export (%default-optimizations
%lightweight-optimizations


+ 2
- 10
guix/discovery.scm View File

@ -18,15 +18,14 @@
(define-module (guix discovery)
#:use-module (guix ui)
#:use-module (guix modules)
#:use-module (guix combinators)
#:use-module (guix build syscalls)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:use-module (ice-9 vlist)
#:use-module (ice-9 ftw)
#:export (file-name->module-name
scheme-modules
#:export (scheme-modules
fold-modules
all-modules
fold-module-public-variables))
@ -90,13 +89,6 @@ DIRECTORY is not accessible."
directory (strerror errno)))
'())))))
(define file-name->module-name
(let ((not-slash (char-set-complement (char-set #\/))))
(lambda (file)
"Return the module name (a list of symbols) corresponding to FILE."
(map string->symbol
(string-tokenize (string-drop-right file 4) not-slash)))))
(define* (scheme-modules directory #:optional sub-directory)
"Return the list of Scheme modules available under DIRECTORY.
Optionally, narrow the search to SUB-DIRECTORY."


+ 10
- 0
guix/modules.scm View File

@ -26,6 +26,9 @@
#:export (missing-dependency-error?
missing-dependency-module
file-name->module-name
module-name->file-name
source-module-closure
live-module-closure
guix-module-name?))
@ -93,6 +96,13 @@ depends on."
(_
'()))))))
(define file-name->module-name
(let ((not-slash (char-set-complement (char-set #\/))))
(lambda (file)
"Return the module name (a list of symbols) corresponding to FILE."
(map string->symbol
(string-tokenize (string-drop-right file 4) not-slash)))))
(define (module-name->file-name module)
"Return the file name for MODULE."
(string-append (string-join (map symbol->string module) "/")


Loading…
Cancel
Save