Changeset 35659 in project

Timestamp:

06/21/18 12:25:46 (8 months ago)

Author:

kooda

Message:

Fix a few bugs and incompatibilities in the CHICKEN 5 port of the bind egg.

Location:

release/5/bind

Files:

• tags/1.2 (copied) (copied from release/5/bind/trunk)
• tags/1.2/bind-translator.scm (modified) (2 diffs)
• tags/1.2/bind.egg (modified) (1 diff)
• tags/1.2/bind.scm (modified) (1 diff)
• tags/1.2/tests/run.scm (modified) (1 diff)
• trunk/bind-translator.scm (modified) (2 diffs)
• trunk/bind.egg (modified) (1 diff)
• trunk/bind.scm (modified) (1 diff)
• trunk/tests/run.scm (modified) (1 diff)

release/5/bind/tags/1.2/bind-translator.scm

@@ -27 +27 @@
 (import srfi-1)
 (import (chicken irregex))
+(import regex)
 (import matchable)
 (import (chicken format))
@@ -1248 +1249 @@
                    (lambda (rx repl str)
                      (if (procedure? repl)
-                         (let ([m (irregex-match rx str)])
+                         (let ([m (string-match rx str)])
                            (if m (repl m) str) )
-                         (irregex-replace/all rx str repl) ) )
+                         (string-substitute rx repl str #t) ) )
                    (->string str)
                    name-substitution-rxs

release/5/bind/tags/1.2/bind.egg

@@ -1 @@
-((synopsis "Automatically generate bindings from C/C++ declarations")
+((version "1.2")
+ (synopsis "Automatically generate bindings from C/C++ declarations")
  (category ffi)
  (license "public domain")

release/5/bind/tags/1.2/bind.scm

@@ -73 +73 @@
                (else
                 (syntax-error 'bind-file "invalid filename" f)))))
-    (with-input-from-file fname read-list)))
+    (with-input-from-file fname read-string)))
 
 (define-syntax bind-file

release/5/bind/tags/1.2/tests/run.scm

@@ -4 +4 @@
 (import (chicken format)
         (chicken pathname)
-        (chicken process))
+        (chicken process)
+        (chicken process-context))
 
 (define prefix (pathname-directory (car (argv))))

release/5/bind/trunk/bind-translator.scm

@@ -27 +27 @@
 (import srfi-1)
 (import (chicken irregex))
+(import regex)
 (import matchable)
 (import (chicken format))
@@ -1248 +1249 @@
                    (lambda (rx repl str)
                      (if (procedure? repl)
-                         (let ([m (irregex-match rx str)])
+                         (let ([m (string-match rx str)])
                            (if m (repl m) str) )
-                         (irregex-replace/all rx str repl) ) )
+                         (string-substitute rx repl str #t) ) )
                    (->string str)
                    name-substitution-rxs

release/5/bind/trunk/bind.egg

@@ -1 @@
-((synopsis "Automatically generate bindings from C/C++ declarations")
+((version "1.2")
+ (synopsis "Automatically generate bindings from C/C++ declarations")
  (category ffi)
  (license "public domain")

release/5/bind/trunk/bind.scm

@@ -73 +73 @@
                (else
                 (syntax-error 'bind-file "invalid filename" f)))))
-    (with-input-from-file fname read-list)))
+    (with-input-from-file fname read-string)))
 
 (define-syntax bind-file

release/5/bind/trunk/tests/run.scm

@@ -4 +4 @@
 (import (chicken format)
         (chicken pathname)
-        (chicken process))
+        (chicken process)
+        (chicken process-context))
 
 (define prefix (pathname-directory (car (argv))))