>From febc8325d45f333a7e2bca572606a58c9c74c6da Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Fri, 9 Nov 2012 21:54:10 +0100 Subject: [PATCH 1/2] Irregex: Remove bogus pair? checks; they were testing the wrong bit of the list, and sre-sequence will already return 'epsilon when the passed list is empty (upstream changeset 4f257a9c3576) This gets rid of a scrutiny warning --- irregex-core.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/irregex-core.scm b/irregex-core.scm index ce3d2e1..5531679 100644 --- a/irregex-core.scm +++ b/irregex-core.scm @@ -804,16 +804,11 @@ res) ((eq? 'seq (car res)) `(if ,(cadr res) - ,(if (pair? (cdr res)) - (sre-sequence (cddr res)) - 'epsilon))) + ,(sre-sequence (cddr res)))) (else `(if ,(cadadr res) - ,(if (pair? (cdr res)) - (sre-sequence (cddadr res)) - 'epsilon) - ,(sre-alternate - (if (pair? (cdr res)) (cddr res) '()))))) + ,(sre-sequence (cddadr res)) + ,(sre-alternate (cddr res))))) `(,@prefix ,res)) res))) ((eq? 'or (car ls)) (lp (cdr ls) '() (shift))) -- 1.7.12.2