Changeset 25880 in project

Timestamp:

02/08/12 22:52:49 (9 years ago)

Author:

ecloud

Message:

Added support for dict and variant and a connman introspection example.

Not sure if the variant support is quite right, because what's inside
is often unsupported.

Location:

release/4/dbus/trunk

Files:

• dbus.meta (modified) (1 diff)
• dbus.scm (modified) (6 diffs)
• dbus.setup (modified) (1 diff)
• examples/introspect-connman.scm (added)

release/4/dbus/trunk/dbus.meta

@@ -4 +4 @@
  (category os)
  (license "MIT")
- (depends easyffi protobj matchable miscmacros foreigners)
+ ;(depends easyffi protobj matchable miscmacros foreigners)
+ (depends easyffi matchable miscmacros foreigners)
  (doc-from-wiki)
  (author "Shawn Rutledge")

release/4/dbus/trunk/dbus.scm

@@ -85 +85 @@
 (define dbus:type-string-string  (foreign-value DBUS_TYPE_STRING_AS_STRING int))
 (define dbus:type-object-path  (foreign-value DBUS_TYPE_OBJECT_PATH int))
-(define dbus:type-object-path-string  (foreign-value DBUS_TYPE_OBJECT_PATH_AS_STRING int))
 (define dbus:type-signature  (foreign-value DBUS_TYPE_SIGNATURE int))
 (define dbus:type-signature-string  (foreign-value DBUS_TYPE_SIGNATURE_AS_STRING int))
 (define dbus:type-array (foreign-value DBUS_TYPE_ARRAY int))
 (define dbus:type-array-string  (foreign-value DBUS_TYPE_ARRAY_AS_STRING int))
+(define dbus:type-dict  (foreign-value DBUS_TYPE_DICT_ENTRY int))
+(define dbus:type-variant (foreign-value DBUS_TYPE_VARIANT int))
 
 (define dbus:make-context)
@@ -308 +309 @@
 
         ;; TODO: iter-append-basic-T for each possible type:
-        ;; especially array, variant and struct might be possible
+        ;; especially variant, array and struct might still be possible
 
         ;; val would usually be a single value, but
@@ -348 +349 @@
                         (cond
                                 [(memq type `(,dbus:type-string ,dbus:type-invalid-string
-                                                                ,dbus:type-string-string ,dbus:type-object-path-string
+                                                                ,dbus:type-string-string ,dbus:type-object-path
                                                                 ,dbus:type-signature-string
                                                                 ;; TODO maybe the following types ought to be converted?
@@ -388 +389 @@
                                 [(eq? type dbus:type-array)
                                         (iter->vector (make-sub-iter iter))]
+                                [(eq? type dbus:type-dict)
+                                        (iter->pair (make-sub-iter iter))]
+                                [(eq? type dbus:type-variant)
+                                        ((make-sub-iter iter))]
                                 ;; unsupported so far (not understood well enough):
                                 ;;      dbus:type-object-path and dbus:type-signature
                                 ;; dbus:type-invalid is returned as #f (could be (void) but that
                                 ;; would be the termination condition for the iterator)
+                                ;[else (format "unsupported-~c" (integer->char type))] )))
                                 [else #f] )))
 
@@ -440 +446 @@
                                         (reverse retval)
                                         (loop (cons next retval))))))
+
+        (define (iter->pair iter)
+                (cons (iter) (iter)))
 
         (define (iter->vector iter)
@@ -711 +720 @@
                                 (and (pair? xml) (car xml))))))
 
-)
-)
+)) ;; end module

release/4/dbus/trunk/dbus.setup

@@ -3 +3 @@
 (use files utils)
 
-(make (("dbus.import.so" ("dbus.c")
-        (compile -s -O3 -d0 dbus.import.scm))
-       ("dbus.so" ("dbus.c")
-        (compile -s -O3 -d1 dbus.scm -C "`pkg-config --cflags dbus-1`" -L "`pkg-config --libs dbus-1`"))
-       ("dbus.c" ("dbus.scm")
-        (compile -t dbus.scm -O3 -d1 -X easyffi -C -g -j dbus)))
- '("dbus.so" "dbus.import.so"))
+(make (
+                ("dbus.import.so" ("dbus.c")
+                        (compile -s -O3 -d0 dbus.import.scm))
+                ("dbus.so" ("dbus.c")
+                        (compile -s -O3 -d1 dbus.scm -C "`pkg-config --cflags dbus-1`" -L "`pkg-config --libs dbus-1`"))
+                ("dbus.c" ("dbus.scm")
+                        (compile -t dbus.scm -O3 -d1 -X easyffi -C -g -j dbus)))
+        '("dbus.so" "dbus.import.so"))
 
 (install-extension 'dbus
-                   `("dbus.so" "dbus.import.so")
-                   `((version 0.88)))
-
+        `("dbus.so" "dbus.import.so")
+        `((version 0.88)))