Merge lp:~arcfide/scheme-libraries/master into lp:~scheme-libraries-team/scheme-libraries/srfi

[Aaron W. Hsu]

Add support for Chez Scheme

Port of Portable SRFIs to Chez Scheme

[Derick Eddington (derick-eddington)]

Thanks for the contribution, Aaron! Before I merge it, there are some issues:

The README file needs to be updated to list Chez as a supported system.

I know the text formatting, mentioned in my per-file comments below, isn't a big deal, but I went to efforts to make mine consistent, so I feel like files with my name on them should keep being consistent. In revision 92, I changed all square brackets to parenthesis, because I've come to dislike brackets. In any files that are not Scheme-system-specific, I don't want brackets, but in files that are specific to a Scheme-system that supports brackets, I'm okay with them if it's not attributed to me. Feel free to change the copyright/attribution of the inconsistent files to you, and I'll merge them with whatever formatting and brackets you want. (I don't actually care about copyrighting trivial files, but people told me I need copyrights on everything, and once my name is on them I feel like I described.)

If you'd like, I can use the diff from this merge request, and make the changes I'm suggesting myself.

(FWIW, I hate the "%3a" shit as well as needing ":" to have numbers in library names, and I support Chez not doing the file-name encoding. Screw compatibility with Windows. I gave up on my Library Files SRFI because I doubt all the other systems that do the encoding are going to change at this point. I take the blame for promoting the encoding. I also hate the redundant SRFI-97 short-name alias libraries.)

Below are per-file issues:

--

%3a38/with-shared-structure.chezscheme.sls

Indentation typo, line 58. It looks like a tab character in there.

Copied from my file, but has square brackets and export/import forms' formatting
has changed.

--

%3a48/intermediate-format-strings/compat.chezscheme.sls
%3a78/lightweight-testing/compat.chezscheme.sls
%3a98/os-environment-variables.chezscheme.sls

Copied from my file, but export/import forms' formatting has changed.

--

%3a6/basic-string-ports.chezscheme.sls

To be consistent, I think a %3a6/basic-string-ports/compat.chezscheme.sls should
be used, instead.

--

.bzrignore

Don't want this file, because it's inherently private-personal-preference.

--

link-dirs.chezscheme.sps

Do you want your copyright in this file? You put it in your two other non-tiny files. After adding your contribution, I'm going to make a new "utils" directory and move this program and my compile-all.ikarus.sps in to it.

review: Needs Fixing

[lp:~arcfide/scheme-libraries/master]

98. By Aaron W. Hsu on 2012-04-24

Adjust for upstream merging

[Aaron W. Hsu (arcfide)]

I think I got everything that you mentioned, let me know if it needs more attention.

review: Needs Resubmitting

[Derick Eddington (derick-eddington)]

Your file %3a6/basic-string-ports/basic-string-ports.chezscheme.sls is broken because of its name and it doesn't work as a compat library for %3a6/basic-string-ports.sls.

review: Needs Fixing

[lp:~arcfide/scheme-libraries/master]

99. By Aaron W. Hsu on 2012-05-01

Adjust for stupidity

[Aaron W. Hsu (arcfide)]

Whoops, that was stupid. I think I have fixed it now.

review: Needs Resubmitting

[Derick Eddington (derick-eddington)]

I apologize for not being clearer -- %3a6/basic-string-ports/compat.chezscheme.sls needs to be like %3a6/basic-string-ports/compat.ikarus.sls so that it will work with %3a6/basic-string-ports.sls.

The rationale is that %3a6/basic-string-ports.sls re-exports R6RS's open-string-input-port and gets the bindings not available in R6RS from a compat library.

I know my %3a6/basic-string-ports.mzscheme.sls does not follow this. I intend to change it so that it does follow. Sorry I forgot to mention that.

review: Needs Fixing

[lp:~arcfide/scheme-libraries/master]

100. By Aaron W. Hsu on 2012-05-08

Fix unnecessary export from the Chez Scheme Compatability file

[Aaron W. Hsu (arcfide)]

Hrm, I think you mean that I do not need to export the extra identifier, right? I have made this fix. I think that does it, no? Hehe.

review: Needs Resubmitting

[Derick Eddington (derick-eddington)]

Yeah, that does it. Thanks again!

review: Approve

=== added file '%3a19/time/compat.chezscheme.sls'
--- %3a19/time/compat.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a19/time/compat.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,35 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :19 time compat)
+  (export time-resolution
+          (rename (date-zone-offset timezone-offset))
+          current-time
+          cumulative-thread-time
+          (rename (cpu-time cumulative-process-time))
+          cumulative-gc-time
+          time-nanosecond
+          time-second)
+  (import (chezscheme))
+
+(define time-resolution 1)
+
+(define (cumulative-thread-time . args)
+  (assertion-violation 'cumulative-thread-time "not implemented"))
+
+(define (cumulative-gc-time) (sstats-gc-cpu (statistics)))
+
+)

=== added file '%3a38/with-shared-structure.chezscheme.sls'
--- %3a38/with-shared-structure.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a38/with-shared-structure.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,37 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :38 with-shared-structure)
+  (export write-with-shared-structure
+          (rename (write-with-shared-structure write/ss))
+          read-with-shared-structure
+         (rename (read-with-shared-structure read/ss)))
+  (import (chezscheme))
+
+(define write-with-shared-structure
+    (case-lambda 
+      [(obj)
+       (write-with-shared-structure obj (current-output-port))]
+      [(obj port)
+       (parameterize ((print-graph #T))
+         (write obj port))]
+      [(obj port optarg)
+       (assertion-violation 'write-with-shared-structure
+         "this implementation does not support optarg")]))
+
+(define read-with-shared-structure read)
+
+)

=== added file '%3a39/parameters.chezscheme.sls'
--- %3a39/parameters.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a39/parameters.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,20 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :39 parameters)
+  (export make-parameter 
+          parameterize)
+  (import (only (chezscheme) make-parameter parameterize)))

=== added file '%3a48/intermediate-format-strings/compat.chezscheme.sls'
--- %3a48/intermediate-format-strings/compat.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a48/intermediate-format-strings/compat.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,19 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :48 intermediate-format-strings compat)
+  (export pretty-print)
+  (import (only (chezscheme) pretty-print)))

=== added file '%3a6/basic-string-ports/compat.chezscheme.sls'
--- %3a6/basic-string-ports/compat.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a6/basic-string-ports/compat.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,19 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :6 basic-string-ports compat)
+  (export open-output-string get-output-string)
+  (import (chezscheme)))

=== added file '%3a78/lightweight-testing/compat.chezscheme.sls'
--- %3a78/lightweight-testing/compat.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a78/lightweight-testing/compat.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,19 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :78 lightweight-testing compat)
+  (export (rename (pretty-print check:write)))
+  (import (chezscheme)))

=== added file '%3a98/os-environment-variables.chezscheme.sls'
--- %3a98/os-environment-variables.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ %3a98/os-environment-variables.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,23 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi :98 os-environment-variables)
+  (export get-environment-variables
+        (rename (getenv get-environment-variable)))
+  (import (only (chezscheme) getenv environ))
+    
+  (define (get-environment-variables . args)
+    (assertion-violation 'get-environment-variables "not implemented")))

=== modified file 'README'
--- README	2010-05-20 17:54:26 +0000
+++ README	2012-05-08 00:21:19 +0000
@@ -49,10 +49,10 @@
 
   https://launchpad.net/scheme-libraries
 
-Currently supported systems are Ikarus, Larceny, and Ypsilon.  PLT Scheme is
-only semi-supported because it has its own "srfi" directory which conflicts with
-having another "srfi" directory; you can symlink/copy files from this collection
-into PLT's "srfi" directory.
+Currently supported systems are Chez Scheme, Ikarus, Larceny, and Ypsilon.
+PLT Scheme is only semi-supported because it has its own "srfi" directory
+which conflicts with having another "srfi" directory; you can symlink/copy
+files from this collection into PLT's "srfi" directory.
 
 For the latest development version, go to:
 

=== added file 'link-dirs.chezscheme.sps'
--- link-dirs.chezscheme.sps	1970-01-01 00:00:00 +0000
+++ link-dirs.chezscheme.sps	2012-05-08 00:21:19 +0000
@@ -0,0 +1,40 @@
+#! /usr/bin/env scheme-script
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(import (chezscheme))
+
+;;; Link all of the SRFIs to their normal directories like sane 
+;;; people who use Chez Scheme prefer. :-)
+
+(define (file-loop files)
+  (cond
+    [(null? files) (void)]
+    [(should-link? (car files))
+     (link-file (car files))
+     (file-loop (cdr files))]
+    [else (file-loop (cdr files))]))
+
+(define (should-link? file)
+  (and (< 3 (string-length file))
+       (string=? "%3a" (substring file 0 3))))
+
+(define (link-file file)
+  (let ([clean (string-append ":" (substring file 3 (string-length file)))])
+	(printf "Linking ~a~n" file)
+	(system (format "ln -sf '~a' '~a'" file clean))))
+
+(file-loop (directory-list "."))

=== added file 'private/include/compat.chezscheme.sls'
--- private/include/compat.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ private/include/compat.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,19 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for
+;;; any purpose with or without fee is hereby granted, provided that the
+;;; above copyright notice and this permission notice appear in all
+;;; copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+;;; DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+;;; OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+;;; TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+;;; PERFORMANCE OF THIS SOFTWARE.
+
+(library (srfi private include compat)
+  (export (rename (source-directories search-paths)))
+  (import (only (chezscheme) source-directories)))

=== added file 'private/platform-features.chezscheme.sls'
--- private/platform-features.chezscheme.sls	1970-01-01 00:00:00 +0000
+++ private/platform-features.chezscheme.sls	2012-05-08 00:21:19 +0000
@@ -0,0 +1,34 @@
+;;; Copyright (c) 2012 Aaron W. Hsu <[e-mail]>
+;;; 
+;;; Permission to use, copy, modify, and distribute this software for any
+;;; purpose with or without fee is hereby granted, provided that the above
+;;; copyright notice and this permission notice appear in all copies.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+;;; WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+;;; MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+;;; ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+;;; WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+;;; ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+;;; OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+
+(library (srfi private platform-features)
+  (export expand-time-features run-time-features)
+  (import (chezscheme) (srfi private OS-id-features))
+
+(define (expand-time-features) '(chezscheme syntax-case))
+
+(define (run-time-features)
+  (OS-id-features (symbol->string (machine-type))
+    '(("t" threads)
+      ("a6" x86-64)
+      ("i3" x86)
+      ("le" linux posix)
+      ("ob" openbsd posix bsd)
+      ("fb" freebsd posix bsd)
+      ("nb" netbsd posix bsd)
+      ("osx" darwin posix)
+      ("s2" solaris posix)
+      ("nt" windows))))
+
+)