fix qml-apply (Lisp calls from QML)

cpp-lib/cpp/lib.h

@@ -13,8 +13,7 @@ QT_BEGIN_NAMESPACE
 
 extern "C" { LIB_EXPORT QObject* ini(); }
 
-class CPP : public QObject
-{
+class CPP : public QObject {
   Q_OBJECT
 
 public:

src/cpp/main.cpp

@@ -80,7 +80,7 @@ int main(int argc, char* argv[]) {
 
   bool slime = false;
   if (arguments.contains("-slime")
-  || (arguments.indexOf(QRegularExpression::fromWildcard(QStringView(QString("*start-swank*.lisp")))) != -1)) {
+  || (arguments.indexOf(QRegularExpression::fromWildcard(QString("*start-swank*.lisp"))) != -1)) {
     arguments.removeAll("-slime");
     slime = true;
   }

src/cpp/qml.cpp

@@ -17,18 +17,13 @@ QObject* iniQml() {
   return lisp;
 }
 
-static QVariant qmlApply(QObject* caller, const QString& function, const QVariantList& arguments) {
-  QVariant var =
-  ecl_fun("qml:qml-apply",
-          QVariant(reinterpret_cast<quintptr>(caller)),
-          QVariant(function),
-          QVariant(arguments));
-  QString str(var.toString());
-  if(str.startsWith("#<>")) { // prepared in Lisp for JS eval
-    QQmlExpression exp(LQML::quickView->rootContext(), caller, str.mid(3));
-    return exp.evaluate();
-  }
-  return var;
+static QVariant qmlApply(QObject* caller,
+                         const QString& function,
+                         const QVariantList& arguments) {
+  return ecl_fun("qml:qml-apply",
+                 QVariant(reinterpret_cast<quintptr>(caller)),
+                 QVariant(function),
+                 QVariant(arguments));
 }
 
 QVariant Lisp::call(const QJSValue& caller_or_function,

src/lisp/package.lisp

@@ -3,7 +3,6 @@
   (:export
    #:*break-on-errors*
    #:*quick-view*
-   #:*root*
    #:*root-item*
    #:*caller*
    #:children
@@ -47,8 +46,8 @@
    #:qsleep
    #:qtranslate
    #:qversion
-   #:root-item
    #:reload
+   #:root-item
    #:tr
    #:!))
 

src/lisp/qml.lisp

@@ -2,7 +2,6 @@
 
 (defvar *quick-view* nil) ; is set in 'lqml.cpp' on startup
 (defvar *caller*     nil)
-(defvar *root*       nil)
 (defvar *root-item*  nil) ; see note in 'find-quick-item'
 
 (defun string-to-symbol (name)
@@ -15,51 +14,15 @@
 
 ;;; function calls from QML
 
-(defun print-js-readably (object)
-  "Prints (nested) lists, vectors, T, NIL, floats in JS notation, which will be
-  passed to JS 'eval()'."
-  (if (and (not (stringp object))
-           (vectorp object))
-      (print-js-readably (coerce object 'list))
-      (typecase object
-        (cons
-         (write-char #\[)
-         (do ((list object (rest list)))
-             ((null list) (write-char #\]))
-           (print-js-readably (first list))
-           (when (rest list)
-             (write-char #\,))))
-        (float
-         ;; JS can't read 'd0' 'l0'
-         (let ((str (princ-to-string object)))
-           (x:when-it (position-if (lambda (ch) (find ch "dl")) str)
-             (setf (char str x:it) #\e))
-           (princ str)))
-        (t
-         (cond ((eql 't object)
-                (princ "true"))
-               ((eql 'nil object)
-                (princ "false"))
-               (t
-                (prin1 object)))))))
-
-(defun print-to-js-string (object)
-  (with-output-to-string (*standard-output*)
-    (princ "#<>") ; mark for passing to JS "eval()"
-    (print-js-readably object)))
-
 (defun qml-apply (caller function arguments)
   ;; Every 'Lisp.call()' or 'Lisp.apply()' function call in QML will call this
   ;: function. The variable *CALLER* will be bound to the calling QQuickItem,
   ;; if passed with 'this' as first argument to 'Lisp.call()' / 'Lisp.apply()'.
-  (let* ((*caller* (if (zerop caller) ; don't change LET*
+  (let ((*caller* (if (zerop caller)
                        *caller*
-                       (make-qobject caller)))
-         (value (apply (string-to-symbol function)
-                       arguments)))
-    (if (stringp value)
-        value
-        (print-to-js-string value))))
+                       (make-qobject caller))))
+    (apply (string-to-symbol function)
+           arguments)))
 
 ;;; utils
 
@@ -160,6 +123,33 @@
                              (x:join (loop repeat (length arguments) collect "~S") #\,))
                      (mapcar 'js-arg arguments)))))
 
+(defun print-js-readably (object)
+  "Prints (nested) lists, vectors, T, NIL, floats in JS notation."
+  (if (and (not (stringp object))
+           (vectorp object))
+      (print-js-readably (coerce object 'list))
+      (typecase object
+        (cons
+         (write-char #\[)
+         (do ((list object (rest list)))
+             ((null list) (write-char #\]))
+           (print-js-readably (first list))
+           (when (rest list)
+             (write-char #\,))))
+        (float
+         ;; JS can't read 'd0' 'l0'
+         (let ((str (princ-to-string object)))
+           (x:when-it (position-if (lambda (ch) (find ch "dl")) str)
+             (setf (char str x:it) #\e))
+           (princ str)))
+        (t
+         (cond ((eql 't object)
+                (princ "true"))
+               ((eql 'nil object)
+                (princ "false"))
+               (t
+                (prin1 object)))))))
+
 (defun js-arg (object)
   ;; for arguments in function JS
   (if (stringp object)