diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-07-06 10:03:16 +0200 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-07-06 10:03:16 +0200 |
commit | d7dc7cb92cc88ed3a245e628b424953206a3f784 (patch) | |
tree | 92860bd92e5ec1cb581b8be886e50b839763342d /src | |
parent | 4666142ca57c15ef89759fb22511ab4c1b96ece9 (diff) | |
download | cuirass-d7dc7cb92cc88ed3a245e628b424953206a3f784.tar cuirass-d7dc7cb92cc88ed3a245e628b424953206a3f784.tar.gz |
cuirass: Stop λ/lambda mixing.
* bin/cuirass.in: Replace λ by lambda.
* bin/evaluate.in: Ditto.
* build-aux/guix.scm: Ditto.
* examples/gnu-system.scm: Ditto.
* examples/guix-track-git.scm: Ditto.
* src/cuirass.scm: Ditto.
* src/cuirass/base.scm: Ditto.
* src/cuirass/database.scm: Ditto.
* src/cuirass/ui.scm: Ditto.
* src/cuirass/utils.scm: Remove λ* macro.
Diffstat (limited to 'src')
-rw-r--r-- | src/cuirass.scm | 2 | ||||
-rw-r--r-- | src/cuirass/base.scm | 10 | ||||
-rw-r--r-- | src/cuirass/database.scm | 10 | ||||
-rw-r--r-- | src/cuirass/ui.scm | 4 | ||||
-rw-r--r-- | src/cuirass/utils.scm | 8 |
5 files changed, 14 insertions, 20 deletions
diff --git a/src/cuirass.scm b/src/cuirass.scm index 8d729b8..b28e09e 100644 --- a/src/cuirass.scm +++ b/src/cuirass.scm @@ -27,7 +27,7 @@ ;;; Module usages and exports need to be done at expansion time. (eval-when (eval load expand) (let ((i (module-public-interface (current-module)))) - (for-each (λ (m) (module-use! i (resolve-interface m))) + (for-each (lambda (m) (module-use! i (resolve-interface m))) ;; Public modules. '((cuirass base) (cuirass database) diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm index 1d15747..f5f80b3 100644 --- a/src/cuirass/base.scm +++ b/src/cuirass/base.scm @@ -54,7 +54,7 @@ (make-parameter (or (getenv "CUIRASS_CACHEDIR") (string-append (or (getenv "HOME") ".") "/.cache/cuirass")) - (λ (val) + (lambda (val) (if (string? val) val (scm-error 'wrong-type-arg @@ -71,7 +71,7 @@ values." (define (call-with-time-display thunk) "Call THUNK and write to the current output port its duration." (call-with-time thunk - (λ (time result) + (lambda (time result) (let ((duration (+ (time-second time) (/ (time-nanosecond time) 1e9)))) (format (current-error-port) "evaluate '~A': ~,3f seconds~%" @@ -150,10 +150,10 @@ directory and the sha1 of the top level commit in this directory." (log (log-file store drv)) (outputs (match (derivation-path->output-paths drv) (((names . items) ...) - (filter (λ (item) + (filter (lambda (item) (valid-path? store item)) items))))) - (for-each (λ (output) + (for-each (lambda (output) (let ((build `((#:derivation . ,drv) (#:eval-id . ,eval-id) (#:log . ,log) @@ -170,7 +170,7 @@ directory and the sha1 of the top level commit in this directory." (format #t "building ~a derivations...~%" (length jobs)) (parameterize ((current-build-output-port (%make-void-port "w"))) (build-derivations store - (map (λ (job) + (map (lambda (job) (assq-ref job #:derivation)) jobs)))) diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm index 91133c2..1ced411 100644 --- a/src/cuirass/database.scm +++ b/src/cuirass/database.scm @@ -71,7 +71,7 @@ will be replaced by ARGS." (define (read-sql-file file-name) "Return a list of string containing SQL instructions from FILE-NAME." (call-with-input-file file-name - (λ (port) + (lambda (port) (let loop ((insts '())) (let ((inst (read-delimited ";" port 'concat))) (if (or (eof-object? inst) @@ -89,7 +89,7 @@ database object." (delete-file db-name)) (let ((db (sqlite-open db-name (logior SQLITE_OPEN_CREATE SQLITE_OPEN_READWRITE)))) - (for-each (λ (sql) (sqlite-exec db sql)) + (for-each (lambda (sql) (sqlite-exec db sql)) (read-sql-file schema)) db)) @@ -105,7 +105,7 @@ database object." (sqlite-close db)) (define* (assq-refs alst keys #:optional default-value) - (map (λ (key) (or (assq-ref alst key) default-value)) + (map (lambda (key) (or (assq-ref alst key) default-value)) keys)) (define (last-insert-rowid db) @@ -169,8 +169,8 @@ INSERT INTO Evaluations (specification, revision) VALUES ('~A', '~A');" (let ((db (db-open))) (dynamic-wind (const #t) - (λ () body ...) - (λ () (db-close db))))) + (lambda () body ...) + (lambda () (db-close db))))) (define* (read-quoted-string #:optional (port (current-input-port))) "Read all of the characters out of PORT and return them as a SQL quoted diff --git a/src/cuirass/ui.scm b/src/cuirass/ui.scm index 801a539..98ee3a9 100644 --- a/src/cuirass/ui.scm +++ b/src/cuirass/ui.scm @@ -27,11 +27,11 @@ (define %program-name ;; Similar in spirit to Gnulib 'progname' module. (make-parameter "" - (λ (val) + (lambda (val) (cond ((not (string? val)) (scm-error 'wrong-type-arg "%program-name" "Not a string: ~S" (list #f) #f)) - ((string-rindex val #\/) => (λ (idx) (substring val (1+ idx)))) + ((string-rindex val #\/) => (lambda (idx) (substring val (1+ idx)))) (else val))))) (define (show-version) diff --git a/src/cuirass/utils.scm b/src/cuirass/utils.scm index dbe00a0..d966543 100644 --- a/src/cuirass/utils.scm +++ b/src/cuirass/utils.scm @@ -21,13 +21,7 @@ (define-module (cuirass utils) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:export (;; Procedures - alist? - ;; Macros. - λ*)) - -(define-syntax-rule (λ* formals body ...) - (lambda* formals body ...)) + #:export (alist?)) (define (alist? obj) "Return #t if OBJ is an alist." |