From 47e3551772fe4181632d69f7d601035c73f2ee02 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 1 Apr 2017 12:16:09 +0200 Subject: [PATCH 3/3] nyacc: Use pmatch rather than match for cpp. * module/nyacc/lang/c99/cpp.scm (nyacc lang c99 cpp): Import (system base pmatch) rather than (ice-9 match). (rtokl->string): Rewrite using pmatch. --- module/nyacc/lang/c99/cpp.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/module/nyacc/lang/c99/cpp.scm b/module/nyacc/lang/c99/cpp.scm index f493b259..0de592ba 100644 --- a/module/nyacc/lang/c99/cpp.scm +++ b/module/nyacc/lang/c99/cpp.scm @@ -29,7 +29,7 @@ #:use-module (nyacc lex) #:use-module (nyacc lang util) #:use-module (rnrs arithmetic bitwise) - #:use-module (ice-9 match) + #:use-module (system base pmatch) ) (cond-expand @@ -259,40 +259,40 @@ ((null? tkl) (apply string-append (add-chl chl stl))) ((char? (car tkl)) (iter stl (cons (car tkl) chl) nxt (cdr tkl))) (else - (match tkl - ((('arg . arg) 'dhash (key . val) . rest) + (pmatch tkl + (((arg . ,arg) dhash (,key . ,val) . ,rest) (iter stl chl nxt (acons key (string-append val arg) (list-tail tkl 3)))) - (((key . val) 'dhash ('arg . arg) . rest) + (((,key . ,val) dhash (arg . ,arg) . ,rest) (iter stl chl nxt (acons 'arg (string-append arg val) (list-tail tkl 3)))) - ((('arg . arg) 'hash . rest) + (((arg . ,arg) hash . ,rest) (iter stl chl (string-append "\"" arg "\"") (list-tail tkl 2))) - ((('comm . val) . rest) + (((comm . ,val) . ,rest) (iter stl chl (string-append "/*" val " */") (cdr tkl))) - ((('ident . rval) ('ident . lval) . rest) + (((ident . ,rval) (ident . ,lval) . ,rest) (iter stl chl (string-append " " rval) (cdr tkl))) - ((('string . val) . rest) + (((string . ,val) . ,rest) (iter stl (cons #\" chl) val (cons #\" rest))) - ((('ident . val) . rest) + (((ident . ,val) . ,rest) (iter stl chl val rest)) - ((('arg . val) . rest) + (((arg . ,val) . ,rest) (iter stl chl val rest)) - ((('defined . val) . rest) + (((defined . ,val) . ,rest) (iter stl chl val rest)) - (('space . rest) + ((space . ,rest) (iter stl (cons #\space chl) nxt rest)) - ((asis . rest) + ((,asis . ,rest) (iter stl chl asis rest)) (otherwise -- 2.12.2