diff options
| author |  Daphne Preston-Kendal
| 2022-11-26 13:00:05 +0100 |
|---|---|---|
| committer | Daphne Preston-Kendal
| 2022-11-26 13:00:05 +0100 |
| commit | c25e65bae96d6d5c26b0d9e8af96e8dcdbdaf99f (patch) | |
| tree | c267d5839f1e3b77d8c903952dd573ffeae1cb31 /srfi | |
| parent | Specify base cases and behaviours of each comparator function (diff) | |
| parent | Publish third draft. (diff) | |
Merge branch 'master' of https://github.com/scheme-requests-for-implementation/srfi-228
Diffstat (limited to 'srfi')
| -rw-r--r-- | srfi/228.sld | 7 | ||||
| -rw-r--r-- | srfi/srfi-228.scm (renamed from srfi/composing-comparators.scm) | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/srfi/228.sld b/srfi/228.sld index b3cca89..834f1ce 100644 --- a/srfi/228.sld +++ b/srfi/228.sld @@ -1,10 +1,9 @@ (define-library (srfi 228) (import (scheme base) - (srfi 1) + (srfi 1) (srfi 128) - (srfi 151)) + (srfi 151)) (export make-wrapper-comparator make-product-comparator make-sum-comparator) - - (include "composing-comparators.scm")) + (include "srfi-228.scm")) diff --git a/srfi/composing-comparators.scm b/srfi/srfi-228.scm index 3a93ae4..caca339 100644 --- a/srfi/composing-comparators.scm +++ b/srfi/srfi-228.scm @@ -84,4 +84,7 @@ (let ((cmp (%sum-comparator-for comparators x x))) ((comparator-hash-function (car cmp)) x))) #f))) +<<<<<<<< HEAD:srfi/composing-comparators.scm +======== +>>>>>>>> 58c55b3dfe6ebdfd8770cd69ac08acda24dc4f50:srfi/srfi-228.scm |