Merging recent changes.

.gitignore

@@ -3,4 +3,8 @@
 *.import.scm
 *.so
 *.types
+*.build.sh
+*.install.sh
+*.link
+*.o
 salmonella.log

comparators/comparators-impl.scm

@@ -264,7 +264,7 @@
     (let ((elem=? (comparator-equality-predicate element-comparator)))
       (let loop ((a a) (b b))
         (cond
-          ((and (empty? a) (empty? b) #t))
+          ((and (empty? a) (empty? b)) #t)
           ((empty? a) #f)
           ((empty? b) #f)
           ((elem=? (head a) (head b)) (loop (tail a) (tail b)))

comparators/comparators.scm

@@ -4,8 +4,21 @@
 
 (module srfi-128 ()
   (import scheme)
-  (import (only chicken use export include case-lambda error define-record-type
-           make-parameter parameterize : define-type))
+  (cond-expand
+   (chicken-5
+    (import (chicken base))
+    (import (chicken type))
+    (import (chicken module))
+    (import srfi-4)
+    ;; FIXME: why is string-hash redefined?
+    (import (except srfi-13 string-hash)))
+   (else
+    (import (only chicken use export include case-lambda error define-record-type
+                  make-parameter parameterize : define-type))
+    (use numbers)
+    (use srfi-4)
+    (use srfi-13)))
+
   (export comparator? comparator-ordered? comparator-hashable?)
   (export make-comparator
           make-pair-comparator make-list-comparator make-vector-comparator
@@ -18,18 +31,18 @@
   (export =? <? >? <=? >=?)
   (export comparator-if<=>)
   (export comparator-type-test-predicate comparator-equality-predicate
-    comparator-ordering-predicate comparator-hash-function)
-  (use numbers)
-  (use srfi-4)
-  (use srfi-13)
+          comparator-ordering-predicate comparator-hash-function)
+
   (define-type :comparator: (struct comparator))
   (define-type :type-test: (procedure (*) boolean))
   (define-type :comparison-test: (procedure (* *) boolean))
   (define-type :hash-code: fixnum)
   (define-type :hash-function: (procedure (*) :hash-code:))
+
   (include "comparators/r7rs-shim.scm")
   (include "comparators/comparators-impl.scm")
   (include "comparators/default.scm")
+
   ;; Chicken type declarations
   (: comparator? (* --> boolean : :comparator:))
   (: comparator-type-test-predicate (:comparator: --> :type-test:))

comparators/default.scm

@@ -97,7 +97,7 @@
                              bytevector? bytevector-length bytevector-u8-ref) obj))
     ; Add more here
     (else (comparator-hash (registered-comparator (object-type obj)) obj))))
-  
+
 (define (default-ordering a b)
   (let ((a-type (object-type a))
         (b-type (object-type b)))
@@ -117,4 +117,3 @@
     default-equality
     default-ordering
     default-hash))
-

comparators/r7rs-shim.scm

@@ -22,8 +22,6 @@
 
 (define exact inexact->exact)
 
-; (define (exact-integer? x) (and (integer? x) (exact? x)))
-
 (define bytevector? u8vector?)
 
 (define bytevector-length u8vector-length)
@@ -36,8 +34,9 @@
 
 (define string-foldcase string-downcase)
 
-(define (infinite? x) (or (= x +inf.0) (= x -inf.0)))
-
-(define (nan? x) (not (= x x)))
-
-(define (exact-integer? obj) (and (integer? obj) (exact? obj)))
+(cond-expand
+  (chicken-5)
+  (else
+    (define (infinite? x) (or (= x +inf.0) (= x -inf.0)))
+    (define (nan? x) (not (= x x)))
+    (define (exact-integer? obj) (and (integer? obj) (exact? obj)))))

srfi-128.egg

@@ -0,0 +1,16 @@
+;; -*- Hen -*-
+
+((synopsis "SRFI-128: Comparators (reduced)")
+ (version "0.9")
+ (license "BSD")
+ (category data)
+ (dependencies srfi-13)
+ (test-dependencies test)
+ (author "John Cowan")
+ (maintainer "Jeremy Steward, Jörg F. Wittenberger")
+ (synopsis "SRFI-128: Comparators (reduced)")
+ (components
+  (extension
+   srfi-128
+   (types-file)
+   (csc-options "-O3" "-d2"))))

srfi-128.meta

@@ -9,6 +9,8 @@
         "comparators/r7rs-shim.scm"
         "comparators/complex-shim.scm"
         "tests/run.scm"
+        "srfi-128.egg"
+        "srfi-128.scm"
         "srfi-128.setup"
         "srfi-128.meta"
         "srfi-128.release-info"

srfi-128.release-info

@@ -1,11 +1,14 @@
 (uri meta-file
-     "https://raw.githubusercontent.com/scheme-requests-for-implementation/{egg-name}/CHICKEN-{egg-release}/{egg-name}.meta")
+     "https://raw.githubusercontent.com/ThatGeoGuy/{egg-name}/CHICKEN-{egg-release}/{egg-name}.meta")
+(release "0.9")
+(release "0.8")
+(release "0.7")
 (release "0.6")
 (release "0.5")
 (release "0.4")
 (release "0.3")
 
-(repo git "git://github.com/scheme-requests-for-implementation/srfi-128.git")
-(uri targz "https://codeload.github.com/scheme-requests-for-implementation/srfi-128/tar.gz/CHICKEN-{egg-release}" whole-repo)
+(repo git "git://github.com/ThatGeoGuy/srfi-128.git")
+(uri targz "https://codeload.github.com/ThatGeoGuy/srfi-128/tar.gz/CHICKEN-{egg-release}" whole-repo)
 (release "0.1" whole-repo)
 (release "0.2" whole-repo)

srfi-128.scm

@@ -0,0 +1 @@
+(include "comparators/comparators.scm")

srfi-128.setup

@@ -10,4 +10,4 @@
 (install-extension
  'srfi-128
  `("srfi-128.types" ,(dynld-name "srfi-128") ,(dynld-name "srfi-128.import"))
- '((version "0.6")))
+ '((version "0.9")))