From 8466d8cfa486fb30d1755c4261b781135083787b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:29 -0800 Subject: Import Upstream version 3a1 --- mwsynrul.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mwsynrul.scm') diff --git a/mwsynrul.scm b/mwsynrul.scm index bc5d7de..0ced293 100644 --- a/mwsynrul.scm +++ b/mwsynrul.scm @@ -72,7 +72,7 @@ (let ((literals (cadr spec)) (rules (cddr spec))) (if (or (not (list? literals)) - (not (comlist:every (lambda (rule) + (not (mw:every (lambda (rule) (and (= (mw:safe-length rule) 2) (pair? (car rule)))) rules))) @@ -115,7 +115,7 @@ (+ rank 1) (lambda (P vars1) (k (mw:make-ellipsis-pattern P vars1) - (comlist:union vars1 vars)))) + (mw:union vars1 vars)))) (mw:error "Malformed pattern" P)) (loop (car P) vars @@ -201,7 +201,7 @@ (lambda (T2 inserted referenced) (k (cons (mw:make-ellipsis-template T1 - (comlist:remove-if-not + (mw:remove-if-not (lambda (var) (> (mw:patternvar-rank var) rank)) referenced1)) @@ -259,7 +259,7 @@ (let* ((P1 (mw:ellipsis-pattern P)) (answers (map (lambda (F) (match F P1 answer rank)) F))) - (if (comlist:every identity answers) + (if (mw:every identity answers) (append (map (lambda (var) (cons var (map (lambda (answer) -- cgit v1.2.3