[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50878] [PATCH 1/4] guix: build: Promote local define-inline to a de
From: |
Attila Lendvai |
Subject: |
[bug#50878] [PATCH 1/4] guix: build: Promote local define-inline to a define-constant util. |
Date: |
Sun, 3 Oct 2021 14:43:00 +0200 |
* guix/build/utils.scm: Moved/renamed define-inline from grafts.scm to an
exported define-constant util.
---
guix/build/graft.scm | 5 +----
guix/build/utils.scm | 12 ++++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/guix/build/graft.scm b/guix/build/graft.scm
index f04c35fa74..daac958d4f 100644
--- a/guix/build/graft.scm
+++ b/guix/build/graft.scm
@@ -44,10 +44,7 @@
;;;
;;; Code:
-(define-syntax-rule (define-inline name val)
- (define-syntax name (identifier-syntax val)))
-
-(define-inline hash-length 32)
+(define-constant hash-length 32)
(define nix-base32-char?
(cute char-set-contains?
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 419c10195b..f3d913aa70 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -73,6 +73,8 @@
list->search-path-as-string
which
+ define-constant
+
every*
alist-cons-before
alist-cons-after
@@ -112,6 +114,16 @@
locale-category->string))
+
+;;;
+;;; Syntax
+;;;
+
+;; Note that in its current form VAL doesn't get evaluated, just simply
+;; inlined. TODO?
+(define-syntax-rule (define-constant name val)
+ (define-syntax name (identifier-syntax val)))
+
;;;
;;; Guile 2.0 compatibility later.
--
2.33.0
- [bug#50878] [PATCH 1/4] guix: build: Promote local define-inline to a define-constant util.,
Attila Lendvai <=