From d4f311c1dfefa6f5491409a3f7777387e5ac9274 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 6 Jan 2018 11:18:38 +0100
Subject: [PATCH] mes: Test optargs without pmatch.

* tests/optargs.test: Remove pmatch.
---
 tests/optargs.test | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/tests/optargs.test b/tests/optargs.test
index f87e64e4..ac02bc8f 100755
--- a/tests/optargs.test
+++ b/tests/optargs.test
@@ -58,9 +58,8 @@ exit $?
 (pass-if-equal "optargs key default" #f ((lambda* (#:key (foo #f)) foo)))
 
 (cond-expand
- (guile (use-modules (system base pmatch)
-                     (ice-9 optargs)))
- (mes (mes-use-module (mes pmatch))))
+ (guile (use-modules (ice-9 optargs)))
+ (mes))
 
 (define <info> '<info>)
 (define <functions> '<functions>)
@@ -69,12 +68,11 @@ exit $?
 (define <text> '<text>)
 
 (define* (make o #:key (functions '()) (globals '()) (locals '()) (text '()))
-  (pmatch o
-    (<info> (list <info>
-                  (cons <functions> functions)
-                  (cons <globals> globals)
-                  (cons <locals> locals)
-                  (cons <text> text)))))
+  (list <info>
+        (cons <functions> functions)
+        (cons <globals> globals)
+        (cons <locals> locals)
+        (cons <text> text)))
 
 ;; (define* (make o #:key (functions '()) (globals '()) (locals '()) (text '()))
 ;;   (format (current-error-port) "make\n")
@@ -86,20 +84,16 @@ exit $?
 ;;                 (cons <text> text))))))
 
 (define (.functions o)
-  (pmatch o
-    ((<info> . ,alist) (assq-ref alist <functions>))))
+  (assq-ref (cdr o) <functions>))
 
 (define (.globals o)
-  (pmatch o
-    ((<info> . ,alist) (assq-ref alist <globals>))))
+  (assq-ref (cdr o) <globals>))
 
 (define (.locals o)
-  (pmatch o
-    ((<info> . ,alist) (assq-ref alist <locals>))))
+  (assq-ref (cdr o) <locals>))
 
 (define (.text o)
-  (pmatch o
-    ((<info> . ,alist) (assq-ref alist <text>))))
+  (assq-ref (cdr o) <text>))
 
 (define (info? o)
   (and (pair? o) (eq? (car o) <info>)))