added static invoke

2 files changed, 51 insertions, 25 deletions

diff --git a/src/lisp/clojure.lisp b/src/lisp/clojure.lisp
index 7b62279d..2b8653db 100644
--- a/src/lisp/clojure.lisp
+++ b/src/lisp/clojure.lisp
@@ -749,34 +749,49 @@
     (:expression
      (let* ((fexpr (@ :fexpr expr))
             (global-binding? (eql :global-binding (@ :type fexpr)))
+            (host-symbol? (eql :host-symbol (@ :type fexpr)))
             (static-method? (will-be-static-method fexpr))
             (args (@ :args expr)))
-       (when (not (or global-binding? static-method?))
-         (format t "((IFn)"))
-       (emit :fn fexpr)        
-       (when (not (or global-binding? static-method?))
-         (format t ")"))
-       (unless static-method?
-         (format t ".invoke"))
-       (format t "(__tld")
-       (when static-method?
-         (let ((closes (@ :closes (first (@ :methods (@ :fn fexpr))))))
-           (format t "~{, ~A~}"
-                   (mapcar (lambda (b)
-                             (binding-name b))
-                           closes))))
-       (format t "~{, ~A~}"
-               (mapcar (lambda (e)
-                         (emit-to-string
-                          (emit :expression e)))
-                       (ldiff args (nthcdr +MAX-POSITIONAL-ARITY+ args))))
-       (when (nthcdr +MAX-POSITIONAL-ARITY+ args)
-         (format t ",new Object[]{~{~A~^,~}}"
+       (cond
+        (host-symbol?
+         (let* ((host-name (symbol-name (@ :symbol fexpr)))
+                (dot-pos (position #\. host-name :from-end t ))
+                (class-name (subseq host-name 0 dot-pos))
+                (member-name (subseq host-name (1+ dot-pos))))
+           (format t "Reflector.invokeStaticMethod(~S,~S,new Object[]{~{~A~^,~}})"
+                   member-name
+                   (fully-qualified-class-name class-name)
+                   (mapcar (lambda (e)
+                             (emit-to-string
+                               (emit :expression e)))
+                           args))))
+        (t
+         (when (not (or global-binding? static-method?))
+           (format t "((IFn)"))
+         (emit :fn fexpr)        
+         (when (not (or global-binding? static-method?))
+           (format t ")"))
+         (unless static-method?
+           (format t ".invoke"))
+         (format t "(__tld")
+         (when static-method?
+           (let ((closes (@ :closes (first (@ :methods (@ :fn fexpr))))))
+             (format t "~{, ~A~}"
+                     (mapcar (lambda (b)
+                               (binding-name b))
+                             closes))))
+         (format t "~{, ~A~}"
                  (mapcar (lambda (e)
                            (emit-to-string
-                            (emit :expression e)))
-                         (nthcdr +MAX-POSITIONAL-ARITY+ args))))
-       (format t ")")))))
+                             (emit :expression e)))
+                         (ldiff args (nthcdr +MAX-POSITIONAL-ARITY+ args))))
+         (when (nthcdr +MAX-POSITIONAL-ARITY+ args)
+           (format t ",new Object[]{~{~A~^,~}}"
+                   (mapcar (lambda (e)
+                             (emit-to-string
+                               (emit :expression e)))
+                           (nthcdr +MAX-POSITIONAL-ARITY+ args))))
+         (format t ")")))))))
 
 
 
diff --git a/src/lisp/test.lisp b/src/lisp/test.lisp
index 2482fdf6..7da3e320 100644
--- a/src/lisp/test.lisp
+++ b/src/lisp/test.lisp
@@ -1,5 +1,8 @@
 (in-module "clojure")
 
+#+:JVM(import "java.lang" '(String Class))
+#+:CLI(import "System, mscorlib" '(String Type))
+
 (defn f0 ())
 
 (defn f1 (x) x)
@@ -121,4 +124,12 @@
       '(1 2 3 (4 5)))
 
 (defn fcast ()
-      (if (int 7) (char 17) (long 29999)))
\ No newline at end of file
+      (if (int 7) (char 17) (long 29999)))
+
+(defn fmem ()
+      #+:JVM
+      (when (Class.forName "Object")
+        (String.valueOf 7))
+      #+:CLI
+      (when (Type.GetType "Object")
+        (String.Intern "fred")))
\ No newline at end of file