projects
/
rrq
/
lsp-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3b4415
)
corrected foop model. removed debugging
author
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Tue, 18 Apr 2023 01:50:23 +0000
(11:50 +1000)
committer
Ralph Ronnquist
<ralph.ronnquist@gmail.com>
Tue, 18 Apr 2023 01:50:23 +0000
(11:50 +1000)
lsp-dbus/lsp-dbus.lsp
patch
|
blob
|
history
diff --git
a/lsp-dbus/lsp-dbus.lsp
b/lsp-dbus/lsp-dbus.lsp
index 895f53d7a9c948a995aa80f273eab94d65a99d1d..6b50235e99472744b16f2c8177ceede0e883d4bc 100644
(file)
--- a/
lsp-dbus/lsp-dbus.lsp
+++ b/
lsp-dbus/lsp-dbus.lsp
@@
-18,15
+18,11
@@
(context 'MAIN:Dbus)
;; Declaring the FOOP object
(context 'MAIN:Dbus)
;; Declaring the FOOP object
-(FOOP path bus)
+(FOOP path
name
bus)
;; "The FOOP Constructor". Creates an object for a given path.
;; "The FOOP Constructor". Creates an object for a given path.
-(define (Dbus:Dbus PATH (BUS 'SYSTEM-BUS))
- (list (context) PATH BUS))
-
-;; Return the bus name
-(define (bus-name)
- (join (find-all "([^/]+)" (%path) $1 0) "."))
+(define (Dbus:Dbus PATH (NAME (replace "/" (1 PATH) ".")) (BUS 'SYSTEM-BUS))
+ (list (context) PATH NAME BUS))
;; Update the connection serial and return it
(define (connection++)
;; Update the connection serial and return it
(define (connection++)
@@
-121,10
+117,10
@@
(define (invoke METHOD ARGS (FLAGS 0))
(when (regex "((.+):)?((.+)\\.)?([^(]+)\\((.*)\\)$" METHOD 0)
(let ((PATH $2) (INTERFACE $4) (MEMBER $5) (SIGNATURE $6))
(define (invoke METHOD ARGS (FLAGS 0))
(when (regex "((.+):)?((.+)\\.)?([^(]+)\\((.*)\\)$" METHOD 0)
(let ((PATH $2) (INTERFACE $4) (MEMBER $5) (SIGNATURE $6))
- ;;(println (list 'invoke (
bus-
name) INTERFACE MEMBER SIGNATURE))
+ ;;(println (list 'invoke (
%
name) INTERFACE MEMBER SIGNATURE))
(if (message 'METHOD_CALL FLAGS
(list nil ; (if SELF-NAME (list 'SENDER SELF-NAME))
(if (message 'METHOD_CALL FLAGS
(list nil ; (if SELF-NAME (list 'SENDER SELF-NAME))
- (list 'DESTINATION (
bus-
name))
+ (list 'DESTINATION (
%
name))
(list 'PATH (if (empty? PATH) (%path) PATH))
(if (empty? INTERFACE) nil
(list 'INTERFACE INTERFACE))
(list 'PATH (if (empty? PATH) (%path) PATH))
(if (empty? INTERFACE) nil
(list 'INTERFACE INTERFACE))