Use '_' as the 'match' wildcard.

This addresses '-Wunused-variable' warnings.

* doc/modules/skribilo/documentation/api.scm (define-markup?)
(make-engine?, make-engine-custom)
(define-markup-formals, define-markup-options)
(define-markup-rest, exp->skribe): Use '_' instead of 'else' as the
'match' wildcard.
* src/guile/skribilo/package/slide/latex.scm (%slide-advi-setup!):
Likewise.
* src/guile/skribilo/source/lisp.scm (lisp-extractor)
(scheme-extractor, stklos-extractor, skribe-extractor)
(bigloo-extractor): Likewise.
* src/guile/skribilo/sui.scm (load-sui): Likewise.
(sui-title, sui-key, sui-find-ref, sui-filter): Likewise.

4 files changed, 25 insertions, 29 deletions

diff --git a/doc/modules/skribilo/documentation/api.scm b/doc/modules/skribilo/documentation/api.scm
index a88f837..21044a7 100644
--- a/doc/modules/skribilo/documentation/api.scm
+++ b/doc/modules/skribilo/documentation/api.scm
@@ -1,8 +1,7 @@
 ;;; api.scm  --  The style for documenting Scheme APIs.
-;;; -*- coding: iso-8859-1 -*-
 ;;;
 ;;; Copyright 2005, 2006, 2007, 2008, 2009, 2012,
-;;;   2015, 2018 Ludovic Courtès <ludo@gnu.org>
+;;;   2015, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright 2003, 2004  Manuel Serrano
 ;;;
 ;;;
@@ -392,7 +391,7 @@ def @SkribiloExample named @Title {} right x {
        o)
       (('define-simple-container (? (lambda (x) (eq? x id))))
        o)
-      (else
+      (_
        #f)))
 
 ;*---------------------------------------------------------------------*/
@@ -414,8 +413,7 @@ def @SkribiloExample named @Title {} right x {
 		    (make-engine? id (cdr exp))))
 	       (else
 		(make-engine? id exp)))))
-      (else
-       #f)))
+      (_ #f)))
 
 ;*---------------------------------------------------------------------*/
 ;*    make-engine-custom ...                                           */
@@ -427,8 +425,7 @@ def @SkribiloExample named @Title {} right x {
        custom)
       (((custom) _ ___)
        (primitive-eval custom))
-      (else
-       '()))))
+      (_ '()))))
 
 ;*---------------------------------------------------------------------*/
 ;*    define-markup-formals ...                                        */
@@ -454,7 +451,7 @@ def @SkribiloExample named @Title {} right x {
        '())
       (('define-simple-container _)
        '())
-      (else
+      (_
        (skribe-error 'define-markup-formals
 		     "Invalid 'define-markup' form"
 		     def))))
@@ -477,7 +474,7 @@ def @SkribiloExample named @Title {} right x {
        '((ident #f) (class #f)))
       (('define-simple-container _)
        '((ident #f) (class #f)))
-      (else
+      (_
        (skribe-error 'define-markup-options
 		     "Invalid 'define-markup' form"
 		     def))))
@@ -508,7 +505,7 @@ def @SkribiloExample named @Title {} right x {
        'node)
       (('define-simple-container _)
        'node)
-      (else
+      (_
        (skribe-error 'define-markup-rest
 		     "Invalid 'define-markup' form"
 		     def))))
@@ -570,7 +567,7 @@ def @SkribiloExample named @Title {} right x {
        (match exp
           (('quote (? symbol? sym))
 	   (string-append "'" (symbol->string sym)))
-	  (else
+	  (_
 	   (with-output-to-string (lambda () (write exp))))))))
 
 ;*---------------------------------------------------------------------*/
diff --git a/src/guile/skribilo/package/slide/latex.scm b/src/guile/skribilo/package/slide/latex.scm
index 3bbcd76..b1562e7 100644
--- a/src/guile/skribilo/package/slide/latex.scm
+++ b/src/guile/skribilo/package/slide/latex.scm
@@ -1,6 +1,6 @@
 ;;; latex.scm  --  LaTeX implementation of the `slide' package.
 ;;;
-;;; Copyright 2007  Ludovic Courtès <ludo@chbouib.org>
+;;; Copyright 2007, 2020  Ludovic Courtès <ludo@chbouib.org>
 ;;; Copyright 2003, 2004  Manuel Serrano
 ;;;
 ;;;
@@ -279,7 +279,7 @@
 			 (display (string-append "}]{" id "}"))
 			 (evaluate-document (slide-pause) e)
 			 (loop (cdr lbls) id))
-			(else
+			(_
 			 (display "\\adviplay[[rgb]{")
 			 (display c)
 			 (format #t "}]{~a}" lbl)
diff --git a/src/guile/skribilo/source/lisp.scm b/src/guile/skribilo/source/lisp.scm
index f949582..1a8b995 100644
--- a/src/guile/skribilo/source/lisp.scm
+++ b/src/guile/skribilo/source/lisp.scm
@@ -78,7 +78,7 @@
 	  (and (eq? def fun) exp))
 	 (('defvar var . _)
 	  (and (eq? var def) exp))
-	 (else #f)))))
+	 (_ #f)))))
 
 (define (init-lisp-keys)
   (unless %lisp-keys
@@ -120,7 +120,7 @@
 	  (and (eq? def fun) exp))
 	 (('define (? symbol? var) . _)
 	  (and (eq? var def) exp))
-	 (else #f)))))
+	 (_ #f)))))
 
 
 (define (init-scheme-keys)
@@ -165,8 +165,7 @@
 	  (and (eq? def fun) exp))
 	 (((or 'define 'define-module) (? symbol? var) . _)
 	  (and (eq? var def) exp))
-	 (else
-		#f)))))
+	 (_ #f)))))
 
 
 (define (init-stklos-keys)
@@ -221,7 +220,7 @@
 	 (and (eq? var def) exp))
 	(('markup-output mk . _)
 	 (and (eq? mk def) exp))
-	(else #f)))))
+	(_ #f)))))
 
 
 (define (init-skribe-keys)
@@ -283,7 +282,7 @@
 	 (((or 'define 'define-struct 'define-library)
 	   (? symbol? var) . _)
 	  (and (eq? var def) exp))
-	 (else #f)))))
+	 (_ #f)))))
 
 (define bigloo
   (new language
diff --git a/src/guile/skribilo/sui.scm b/src/guile/skribilo/sui.scm
index eb7f8cb..790e2d4 100644
--- a/src/guile/skribilo/sui.scm
+++ b/src/guile/skribilo/sui.scm
@@ -1,7 +1,7 @@
 ;;; sui.scm -- Skribe URL Indices
 ;;;
 ;;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012,
-;;;    2015, 2018  Ludovic Courtès <ludo@gnu.org>
+;;;    2015, 2018, 2020  Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright (C) 2003, 2004  Manuel Serrano
 ;;;
 ;;;
@@ -120,11 +120,11 @@
 		    (unwind-protect
                      (let ((sexp (read p)))
                        (match sexp
-                              (('sui (? string?) . _)
-                               (hash-set! *sui-table* path sexp))
-                              (else
-                               (raise (condition (&invalid-sui-error
-                                                  (sexp     sexp))))))
+                         (('sui (? string?) . _)
+                          (hash-set! *sui-table* path sexp))
+                         (_
+                          (raise (condition (&invalid-sui-error
+                                             (sexp     sexp))))))
                        sexp)
                      (close-input-port p)))))))))
 
@@ -146,7 +146,7 @@
    (match sexp
       (('sui (and title (? string?)) . _)
        title)
-      (else
+      (_
        (raise (condition (&invalid-sui-error
                           (sexp sexp)))))))
 
@@ -168,7 +168,7 @@
 		   (and (pair? (cdr rest))
 			(cadr rest))
 		   (loop (cdr rest))))))
-      (else
+      (_
        (raise (condition (&invalid-sui-error
                           (sexp sexp)))))))
 
@@ -194,7 +194,7 @@
 	     (subsubsection (sui-search-ref 'subsubsections refs (cadr subsubsection) class))
 	     (ident (sui-search-all-refs refs (cadr ident) class))
 	     (else '())))
-	 (else
+	 (_
           (raise (condition (&invalid-sui-error
                              (sexp sui))))))))
 
@@ -266,7 +266,7 @@
 			(cons (filter pred2 (cdar refs)) res))
 		  (loop (cdr refs) res))
 	      (reverse! res))))
-      (else
+      (_
        (raise (condition (&invalid-sui-error
                           (sexp sui)))))))