From 1b5dedcf5a262809da09fff77e9090a362ab0419 Mon Sep 17 00:00:00 2001
From: Darcy Shen <da@liii.pro>
Date: Mon, 11 Dec 2023 21:35:48 +0800
Subject: [PATCH] [56_5] Upgrade to lolly 1.3.7

---
 src/Plugins/Tex/conservative_fromtex.cpp |  4 +-
 src/Plugins/Tex/tracked_totex.cpp        |  4 +-
 src/Scheme/L2/glue_lolly.lua             | 51 ++++++++++++------------
 src/Scheme/L2/init_glue_l2.cpp           |  2 +-
 xmake/packages.lua                       |  4 +-
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/Plugins/Tex/conservative_fromtex.cpp b/src/Plugins/Tex/conservative_fromtex.cpp
index eaea92961b..33f7ef0742 100644
--- a/src/Plugins/Tex/conservative_fromtex.cpp
+++ b/src/Plugins/Tex/conservative_fromtex.cpp
@@ -14,7 +14,7 @@
 #include "analyze.hpp"
 #include "hashset.hpp"
 #include "scheme.hpp"
-#include "base64.hpp"
+#include "lolly/data/base64.hpp"
 #include "iterator.hpp"
 #include "fast_search.hpp"
 #include "merge_sort.hpp"
@@ -82,7 +82,7 @@ get_texmacs_attachments (string s, string& mod, tree& src, string& mtar,
   if (i<n) return false;
   string comm_enc_atts= s (bpos + N(bs), epos);
   string enc_atts= replace (comm_enc_atts, "\n %", "\n");
-  string atts= decode_base64 (enc_atts);
+  string atts= lolly::data::decode_base64 (enc_atts);
   // TODO: check integrity checksum
   string sep= "\n% Separate attachments\n";
   int spos= search_forwards (sep, 0, atts);
diff --git a/src/Plugins/Tex/tracked_totex.cpp b/src/Plugins/Tex/tracked_totex.cpp
index 1f85367cb3..93f1e9a005 100644
--- a/src/Plugins/Tex/tracked_totex.cpp
+++ b/src/Plugins/Tex/tracked_totex.cpp
@@ -14,7 +14,7 @@
 #include "analyze.hpp"
 #include "hashset.hpp"
 #include "scheme.hpp"
-#include "base64.hpp"
+#include "lolly/data/base64.hpp"
 #include "iterator.hpp"
 #include "fast_search.hpp"
 #include "file.hpp"
@@ -234,7 +234,7 @@ tracked_texmacs_to_latex (tree doc, object opts) {
   post << "\n% Separate attachments\n";
   post << ms;
   // TODO: add integrity checksum
-  post= encode_base64 (post);
+  post= lolly::data::encode_base64 (post);
   s << "\n%%%%%%%%%% Begin TeXmacs source\n";
   s << "% " << replace (post, "\n", "\n% ");
   s << "\n%%%%%%%%%% End TeXmacs source\n";
diff --git a/src/Scheme/L2/glue_lolly.lua b/src/Scheme/L2/glue_lolly.lua
index 7674c7cb20..f9a2719ae9 100644
--- a/src/Scheme/L2/glue_lolly.lua
+++ b/src/Scheme/L2/glue_lolly.lua
@@ -410,23 +410,6 @@ function main()
                     "string"
                 }
             },
-            -- Data/String/base64.hpp
-            {
-                scm_name = "encode-base64",
-                cpp_name = "encode_base64",
-                ret_type = "string",
-                arg_list = {
-                    "string"
-                }
-            },
-            {
-                scm_name = "decode-base64",
-                cpp_name = "decode_base64",
-                ret_type = "string",
-                arg_list = {
-                    "string"
-                }
-            },
             -- System/Misc/sys_utils.hpp
             {
                 scm_name = "get-user-login",
@@ -481,14 +464,6 @@ function main()
                     "string",
                 }
             },
-            {
-                scm_name = "system",
-                cpp_name = "lolly::system::call",
-                ret_type = "void",
-                arg_list = {
-                    "string",
-                }
-            },
             -- System/Classes/url
             {
                 scm_name = "url->url",
@@ -927,6 +902,32 @@ function main()
                     "url"
                 }
             },
+            -- lolly/data
+            {
+                scm_name = "encode-base64",
+                cpp_name = "lolly::data::encode_base64",
+                ret_type = "string",
+                arg_list = {
+                    "string"
+                }
+            },
+            {
+                scm_name = "decode-base64",
+                cpp_name = "lolly::data::decode_base64",
+                ret_type = "string",
+                arg_list = {
+                    "string"
+                }
+            },
+            -- lolly/system
+            {
+                scm_name = "system",
+                cpp_name = "lolly::system::call",
+                ret_type = "void",
+                arg_list = {
+                    "string",
+                }
+            },
         }
     }
 end
diff --git a/src/Scheme/L2/init_glue_l2.cpp b/src/Scheme/L2/init_glue_l2.cpp
index 555bde7450..2e0c84a39e 100644
--- a/src/Scheme/L2/init_glue_l2.cpp
+++ b/src/Scheme/L2/init_glue_l2.cpp
@@ -15,9 +15,9 @@
 #include "s7_tm.hpp"
 
 #include "analyze.hpp"
-#include "base64.hpp"
 #include "file.hpp"
 #include "locale.hpp"
+#include "lolly/data/base64.hpp"
 #include "lolly/io/http.hpp"
 #include "lolly/io/http_response.hpp"
 #include "lolly/system/subprocess.hpp"
diff --git a/xmake/packages.lua b/xmake/packages.lua
index fd297fd3e0..05b8db1438 100644
--- a/xmake/packages.lua
+++ b/xmake/packages.lua
@@ -21,7 +21,7 @@
 
 -- The following versions are adopted on macOS/Windows/ArchLinux
 -- We will use the system provided packages on Ubuntu 22.04/Debian 12/...
-local LOLLY_VERSION = "1.3.6"
+local LOLLY_VERSION = "1.3.7"
 local TBOX_VERSION = "1.7.5"
 local CPR_VERSION = "1.10.5"
 local CURL_VERSION = "8.4.0"
@@ -47,7 +47,7 @@ package("lolly")
         add_deps("cpr")
     end
 
-    add_versions("v" .. LOLLY_VERSION, "3c0502ac6a090742c9d3b4eaaf4b2f770ef61fa3")
+    add_versions("v" .. LOLLY_VERSION, "e1ace389df8c25c78cd09b7fccc13466a5e87f7c")
 
     on_install("linux", "macosx", "mingw", "wasm", "windows", function (package)
         local configs = {}