v4-ified

svn: r8829

collects/ffi/c-printf.ss

@@ -1,4 +1,4 @@
-(module c-printf mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -37,5 +37,3 @@
     (apply printf fmt args)))
 
 (define-unsafer c-printf-is-dangerous!)
-
-)

collects/ffi/crypt.ss

@@ -1,4 +1,4 @@
-(module crypt mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -61,5 +61,3 @@
                r
                (loop (- n 8) (cons (string->number (substring bin n (+ n 8)) 2)
                                    r)))))))
-
-)

collects/ffi/esd.ss

@@ -1,4 +1,4 @@
-(module esd mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -76,5 +76,3 @@
 (defesd* esd-sample-kill  : [_esd] _sample -> _int)
 (provide default-esd)
 (define default-esd (make-parameter (esd-open-sound) esd?))
-
-)

collects/ffi/examples/c-printf.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "c-printf.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/c-printf)
 
 (c-printf-is-dangerous!) ; see last example below
 

collects/ffi/examples/crypt.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "crypt.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/crypt)
 
 (define passwd "foo")
 (define salt "xz")

collects/ffi/examples/esd.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "esd.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/esd)
 
 (printf "default = ~s\n" (default-esd))
 (printf "latency = ~s\n" (esd-get-latency))

collects/ffi/examples/magick.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -rg "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "magick.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/magick (for-syntax scheme/base))
 
 (define-syntax (test stx)
   (syntax-case stx ()

collects/ffi/examples/sndfile.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "sndfile.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/sndfile)
 
 ;; (require (lib "swindle.ss" "swindle"))
 

collects/ffi/examples/tcl.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "tcl.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/tcl)
 
 (define (tcldemo . strs)
   (for-each (lambda (s)

collects/ffi/examples/xmmsctrl.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (prefix xmms- (lib "xmmsctrl.ss" "ffi")))
+#lang scheme/base
+
+(require (prefix-in xmms- ffi/xmmsctrl))
 
 (printf "version: ~s\n" (xmms-get-version))
 (printf "skin: ~s\n" (xmms-get-skin))

collects/ffi/examples/xosd.ss

@@ -1,9 +1,8 @@
-#!/bin/sh
-#|
-exec mzscheme -r "$0" "$@"
-|#
+#! /usr/bin/env mzscheme
 
-(require (lib "xosd.ss" "ffi"))
+#lang scheme/base
+
+(require ffi/xosd)
 
 (define x (xosd-create))
 

collects/ffi/magick.ss

@@ -1,4 +1,4 @@
-(module magick mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -29,7 +29,7 @@
             [else x])))) ; can use NULL as a pixel wand (see floodfill)
 
 ;; Use a struct for this because we want to keep the associated image width
-(define-struct PixelIterator (ptr width))
+(define-struct PixelIterator (ptr [width #:mutable]))
 (define _PixelIterator
   (make-ctype _pointer PixelIterator-ptr
     (lambda (ptr)
@@ -1380,7 +1380,7 @@
   (w : _MagickWand = (if (null? args) (NewMagickWand) arg))
   (_file = (if (null? args) arg (car args)))
   -> _status
-  -> (if (null? args) w))
+  -> (if (null? args) w (void)))
 
 ;; MagickReadImageBlob reads an image or image sequence from a blob.
 (defmagick* MagickReadImageBlob :
@@ -2799,5 +2799,3 @@
 
 (defmagick DestroyDrawInfo :
   _DrawInfo -> _void)
-
-)

collects/ffi/sndfile.ss

@@ -1,4 +1,4 @@
-(module sndfile mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -14,7 +14,7 @@
 ;; translating from c->scheme, ie. creating the object in scheme it will be
 ;; wraped by an object finilazer that uses the libsndfile fuction sf_close that
 ;; return a 0 upon sucsessfull termination or an error.
-(define-struct sndfile (ptr info))
+(define-struct sndfile (ptr [info #:mutable]))
 (define _sndfile
   (make-ctype _pointer sndfile-ptr
     (lambda (p)
@@ -341,5 +341,3 @@
 (provide write-sound*)
 (define (write-sound* file data meta)
   (write-sound-internal file data meta))
-
-)

collects/ffi/tcl.ss

@@ -1,4 +1,4 @@
-(module tcl mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -47,5 +47,3 @@
 
 (define eval-tcl
   (get-ffi-obj "Tcl_Eval" libtcl (_fun _interp* (expr : _string) -> _tclret)))
-
-)

collects/ffi/xmmsctrl.ss

@@ -1,4 +1,4 @@
-(module xmmsctrl mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -107,5 +107,3 @@
 (defxmms quit : _session -> _void)
 (defxmms play-pause : _session -> _void)
 (defxmms playlist-ins-url-string : _session _string _pos -> _void)
-
-)

collects/ffi/xosd.ss

@@ -1,4 +1,4 @@
-(module xosd mzscheme
+#lang scheme/base
 
 (require mzlib/foreign) (unsafe!)
 
@@ -102,5 +102,3 @@
 
 (defxosd* xosd-set-bar-length : _xosd _int -> _status)
 (defxosd* xosd-scroll : _xosd _int -> _status)
-
-)