foops.scm

@@ -2,16 +2,11 @@
 
 (make-object derive-object)
 
-(cond-expand
-  (chicken-4
 (import chicken scheme)
-    (import-for-syntax chicken)
 (use matchable)
+(import-for-syntax chicken)
 (begin-for-syntax
-     (use srfi-1)))
-  (chicken-5
-    (import-for-syntax srfi-1)
-    (import scheme matchable (chicken syntax))))
+ (use srfi-1))
 
 (define-for-syntax args-without-self 
   '(if (and (pair? args) (procedure? (car args)))

ssql.egg

@@ -1,9 +0,0 @@
-((version "0.2.4")
- (synopsis "SQL as S-expressions")
- (author "Peter Bex, Moritz Heidkamp")
- (license "BSD")
- (category db)
- (dependencies matchable srfi-1 srfi-13)
- (test-dependencies test)
- (components (extension foops)
-             (extension ssql (component-dependencies foops))))

ssql.scm

@@ -3,23 +3,11 @@
 (ssql->sql ssql-connection scope-table find-tables ssql-compose
  register-sql-engine! define-operators *ansi-translator*)
 
-(cond-expand
-  (chicken-4
 (import chicken scheme)
 (use matchable data-structures extras srfi-1 srfi-13 foops)
 (import-for-syntax chicken)
 (begin-for-syntax
-     (use srfi-1 srfi-13)))
-  (chicken-5
-    (import-for-syntax srfi-1 srfi-13 (chicken string))
-    (import scheme
-            srfi-1
-            srfi-13
-            matchable
-            (chicken base)
-            (chicken format)
-            (chicken string)
-            foops)))
+ (use srfi-1 srfi-13))
 
 (define (before? x y lst)
   (let loop ((lst lst))

tests/ansi-test.scm

@@ -1,9 +1,4 @@
-(cond-expand
-  (chicken-4
-    (use test))
-  (chicken-5
-    (import test)))
-
+(use test)
 (import ssql)
 
 (test-group "selects"

tests/composition-test.scm

@@ -1,9 +1,4 @@
-(cond-expand
-  (chicken-4
-    (use test))
-  (chicken-5
-    (import test)))
-
+(use test)
 (import ssql)
 
 (test-group "composition"

tests/foops-test.scm

@@ -1,11 +1,7 @@
-(cond-expand
-  (chicken-4
 (load-relative "../foops")
-    (use test))
-  (chicken-5
-    (import srfi-1 test foops)))
 
 (import foops)
+(use test)
 
 (test-group "basic functionality"
   (define foo (make-object () ((bar) 'baz)))

tests/run.scm

@@ -1,18 +1,7 @@
-(cond-expand
-  (chicken-4
 (load-relative "foops-test")
 (load-relative "../ssql")
 (load-relative "transformations-test")
 (load-relative "ansi-test")
-    (load-relative "composition-test"))
-  (chicken-5
-    (import test (chicken platform))
-    (repository-path (cons ".." (repository-path)))
-    (load "foops-test")
-    (load "transformations-test")
-    (load "ansi-test")
-    (load "composition-test")))
+(load-relative "composition-test")
 
 (test-exit)
-
-

tests/transformations-test.scm

@@ -1,9 +1,4 @@
-(cond-expand
-  (chicken-4
-    (use test))
-  (chicken-5
-    (import test)))
-
+(use test)
 (import ssql)
 
 (test-begin "inspection")