[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] guix: lint: Use string-suffix? and string-prefix? where appr
From: |
Eric Bavier |
Subject: |
[PATCH 1/5] guix: lint: Use string-suffix? and string-prefix? where appropriate. |
Date: |
Fri, 24 Oct 2014 00:04:27 -0500 |
User-agent: |
mu4e 0.9.9.5; emacs 23.3.1 |
>From b3b98226891164cf274d97b339b8f2cbc69f95d8 Mon Sep 17 00:00:00 2001
From: Eric Bavier <address@hidden>
Date: Wed, 22 Oct 2014 09:20:20 -0500
Subject: [PATCH 1/5] guix: lint: Use string-suffix? and string-prefix? where
appropriate.
* guix/scripts/lint.scm (check-synopsis): Use string-suffix? and
string-prefix? in place of string-take and string=?.
---
guix/scripts/lint.scm | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 5c1ea36..be866ab 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyril Roelandt <address@hidden>
+;;; Copyright © 2014 Eric Bavier <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -103,15 +104,15 @@
;; Emit a warning if stylistic issues are found in the synopsis of PACKAGE.
(define (check-final-period synopsis)
;; Synopsis should not end with a period, except for some special cases.
- (if (and (string=? (string-take-right synopsis 1) ".")
- (not (string=? (string-take-right synopsis 4) "etc.")))
+ (if (and (string-suffix? "." synopsis)
+ (not (string-suffix? "etc." synopsis)))
(emit-warning package
"no period allowed at the end of the synopsis"
'synopsis)))
(define (check-start-article synopsis)
- (if (or (string-ci=? (string-take synopsis 2) "A ")
- (string-ci=? (string-take synopsis 3) "An "))
+ (if (or (string-prefix-ci? "A " synopsis)
+ (string-prefix-ci? "An " synopsis))
(emit-warning package
"no article allowed at the beginning of the synopsis"
'synopsis)))
@@ -130,12 +131,10 @@
'synopsis)))
(define (check-start-with-package-name synopsis)
- (let ((idx (string-contains-ci synopsis (package-name package))))
- (when (and idx
- (= idx 0))
- (emit-warning package
- "synopsis should not start with the package name")
- 'synopsis)))
+ (when (string-prefix-ci? (package-name package) synopsis)
+ (emit-warning package
+ "synopsis should not start with the package name"
+ 'synopsis)))
(let ((synopsis (package-synopsis package)))
(if (string? synopsis)
--
1.7.9.5
--
Eric Bavier
- [PATCH 1/5] guix: lint: Use string-suffix? and string-prefix? where appropriate.,
Eric Bavier <=