From e5eb3dd7313b601966c712bf1eef94f8f28eb2a9 Mon Sep 17 00:00:00 2001
From: "pls.153" <pls.153@protonmail.com>
Date: Sun, 15 Oct 2023 11:26:01 +0200
Subject: [PATCH] fix bug in marshal (symbolp)

---
 src/cpp/ecl_fun_plugin.h | 4 ++--
 src/cpp/marshal.cpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cpp/ecl_fun_plugin.h b/src/cpp/ecl_fun_plugin.h
index f38ec49..156bebf 100644
--- a/src/cpp/ecl_fun_plugin.h
+++ b/src/cpp/ecl_fun_plugin.h
@@ -250,8 +250,6 @@ QVariant toQVariant(cl_object l_arg, int type) {
       var = QVariant(toFloat<double>(l_arg));
     } else if (cl_stringp(l_arg) == ECL_T) {        // string
       var = QVariant(toQString(l_arg));
-    } else if (cl_symbolp(l_arg) == ECL_T) {        // symbol
-      var = QVariant(toQString(cl_string_downcase(1, cl_symbol_name(l_arg))));
     } else if (cl_characterp(l_arg) == ECL_T) {     // char
       var = QChar(toInt(cl_char_code(l_arg)));
     } else if (l_arg == ECL_T) {                    // true
@@ -264,6 +262,8 @@ QVariant toQVariant(cl_object l_arg, int type) {
             : toQVariantList(l_arg);
     } else if (cl_vectorp(l_arg) == ECL_T) {        // vector (of octets)
       var = QVariant(toQByteArray(l_arg));
+    } else if (cl_symbolp(l_arg) == ECL_T) {        // symbol
+      var = QVariant(toQString(cl_string_downcase(1, cl_symbol_name(l_arg))));
     } else {
       QObject* o = toQObjectPointer(l_arg);
       if (o != nullptr) {
diff --git a/src/cpp/marshal.cpp b/src/cpp/marshal.cpp
index bb4c314..c71822b 100644
--- a/src/cpp/marshal.cpp
+++ b/src/cpp/marshal.cpp
@@ -164,8 +164,6 @@ QVariant toQVariant(cl_object l_arg, int type) {
       var = QVariant(toFloat<double>(l_arg));
     } else if (cl_stringp(l_arg) == ECL_T) {        // string
       var = QVariant(toQString(l_arg));
-    } else if (cl_symbolp(l_arg) == ECL_T) {        // symbol
-      var = QVariant(toQString(cl_string_downcase(1, cl_symbol_name(l_arg))));
     } else if (cl_characterp(l_arg) == ECL_T) {     // char
       var = QChar(toInt(cl_char_code(l_arg)));
     } else if (l_arg == ECL_T) {                    // true
@@ -178,6 +176,8 @@ QVariant toQVariant(cl_object l_arg, int type) {
             : toQVariantList(l_arg);
     } else if (cl_vectorp(l_arg) == ECL_T) {        // vector (of octets)
       var = QVariant(toQByteArray(l_arg));
+    } else if (cl_symbolp(l_arg) == ECL_T) {        // symbol
+      var = QVariant(toQString(cl_string_downcase(1, cl_symbol_name(l_arg))));
     } else {
       QObject* o = toQObjectPointer(l_arg);
       if (o != nullptr) {