Changeset 37039 in project

Timestamp:

01/14/19 10:11:35 (2 years ago)

Author:

felix winkelmann

Message:

bind 1.2.4: applied bugfixes and enhancements contributed by evhan

Location:

release/5/bind

Files:

• tags/1.2.4 (copied) (copied from release/5/bind/trunk)
• tags/1.2.4/bind-translator.scm (modified) (2 diffs)
• tags/1.2.4/c.l (modified) (2 diffs)
• tags/1.2.4/chicken-bind.scm (modified) (1 diff)
• trunk/bind-translator.scm (modified) (2 diffs)
• trunk/c.l (modified) (2 diffs)
• trunk/chicken-bind.scm (modified) (1 diff)

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

@@ -309 +309 @@
     [('signed . more) (parse-type-rec more)]
     [`(unsigned fixnum . ,more) (values 'unsigned-int more)]
-    [`(unsigned int . ,more)
-     (values 'unsigned-integer more)]
+    [`(unsigned int . ,more) (values 'unsigned-integer more)]
     [`(unsigned char . ,more) (values 'unsigned-char more)]
     [`(unsigned short int . ,more) (values 'unsigned-short more)]
@@ -316 +315 @@
     [`(unsigned short . ,more) (values 'unsigned-short more)]
     [`(unsigned long . ,more) (values 'unsigned-long more)]
+    [`(u8 . ,more) (values 'unsigned-byte more)]
+    [`(s8 . ,more) (values 'byte more)]
     [`(u32 . ,more) (values 'unsigned-integer32 more)]
     [`(s32 . ,more) (values 'integer32 more)]

release/5/bind/tags/1.2.4/c.l

@@ -48 +48 @@
 "___pointer_vector"                  (tok 'pointer-vector)
 "___pointer"                       (tok 'pointer)
+"___u8"                            (tok 'u8)
+"___s8"                            (tok 's8)
 "___u32"                           (tok 'u32)
 "___s32"                           (tok 's32)
@@ -56 +58 @@
 "int32_t"                          (tok 's32)
 "__int32"                          (tok 's32)
+"int8_t"                           (tok 's8)
+"__int8"                           (tok 's8)
 "uint64_t"                         (tok 'u64)
 "uint32_t"                         (tok 'u32)
+"uint8_t"                          (tok 'u8)
 "bool"                             (tok 'bool)
 "___safe"                           (tok 'callback)

release/5/bind/tags/1.2.4/chicken-bind.scm

@@ -67 +67 @@
                  (unless (pair? rest) (usage 1))
                  (let ((m (string-match "([^:]+):(.+)" (cadr args))))
-                   (if m
-                       (set-renaming (cadr m) (caddr m) regex: (string=? "-rename-regex" arg))
-                       (usage 1))))
+                   (unless (pair? m) (usage 1))
+                   (set-renaming (cadr m) (caddr m) regex: (string=? "-rename-regex" arg)))
+                 (loop (cdr rest)))
                 ((string=? "-o" arg)
                  (when (null? rest) (usage 1))

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

@@ -309 +309 @@
     [('signed . more) (parse-type-rec more)]
     [`(unsigned fixnum . ,more) (values 'unsigned-int more)]
-    [`(unsigned int . ,more)
-     (values 'unsigned-integer more)]
+    [`(unsigned int . ,more) (values 'unsigned-integer more)]
     [`(unsigned char . ,more) (values 'unsigned-char more)]
     [`(unsigned short int . ,more) (values 'unsigned-short more)]
@@ -316 +315 @@
     [`(unsigned short . ,more) (values 'unsigned-short more)]
     [`(unsigned long . ,more) (values 'unsigned-long more)]
+    [`(u8 . ,more) (values 'unsigned-byte more)]
+    [`(s8 . ,more) (values 'byte more)]
     [`(u32 . ,more) (values 'unsigned-integer32 more)]
     [`(s32 . ,more) (values 'integer32 more)]

release/5/bind/trunk/c.l

@@ -48 +48 @@
 "___pointer_vector"                  (tok 'pointer-vector)
 "___pointer"                       (tok 'pointer)
+"___u8"                            (tok 'u8)
+"___s8"                            (tok 's8)
 "___u32"                           (tok 'u32)
 "___s32"                           (tok 's32)
@@ -56 +58 @@
 "int32_t"                          (tok 's32)
 "__int32"                          (tok 's32)
+"int8_t"                           (tok 's8)
+"__int8"                           (tok 's8)
 "uint64_t"                         (tok 'u64)
 "uint32_t"                         (tok 'u32)
+"uint8_t"                          (tok 'u8)
 "bool"                             (tok 'bool)
 "___safe"                           (tok 'callback)

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

@@ -67 +67 @@
                  (unless (pair? rest) (usage 1))
                  (let ((m (string-match "([^:]+):(.+)" (cadr args))))
-                   (if m
-                       (set-renaming (cadr m) (caddr m) regex: (string=? "-rename-regex" arg))
-                       (usage 1))))
+                   (unless (pair? m) (usage 1))
+                   (set-renaming (cadr m) (caddr m) regex: (string=? "-rename-regex" arg)))
+                 (loop (cdr rest)))
                 ((string=? "-o" arg)
                  (when (null? rest) (usage 1))