Merge branch 'main'

of github.com:clasp-developers/clasp

Author: drmeister

apptainer/cando-arch.def

@@ -1,8 +1,12 @@
 BootStrap: docker
 From: ghcr.io/yitzchak/archlinux-makepkg:latest
 
+%files
+    $HOME/Downloads/UDB-Corporate-8.0.0 /downloads/udb
+
 %post
     pacman -Syu --noconfirm binutils inetutils boost clang gmp fmt libunwind llvm ninja sbcl jupyterlab emacs openssh netcdf expat gocryptfs nodejs npm
+    (cd /downloads/udb; make install)
     cd /mnt
     ./koga --extensions=cando --build-mode=bytecode-faso --llvm-config="/usr/bin/llvm-config" --build-path=build-apptainer/
     ninja -C build-apptainer
@@ -16,10 +20,14 @@ From: ghcr.io/yitzchak/archlinux-makepkg:latest
     export PATH="/home/cando/miniconda3/bin:${PATH}"
     conda install -y -c conda-forge jupyterlab sidecar ambertools
     jupyter-lab build
+    mkdir /home/cando/.cache
+    cando -e "(load -e "(ql:quickload :cando-jupyter)" -e "(core:exit)"
     chmod -R ugo+rw /home/cando/
 
 %environment
     export PATH="/home/cando/miniconda3/bin:${PATH}"
     export AMBERHOME=/home/cando/miniconda3
+    export XDG_CACHE_HOME=/home/cando/.cache
+
 
 

apptainer/build-cando-apptainer apptainer/old-build-cando-apptainerapptainer/build-cando-apptainer renamed to apptainer/old-build-cando-apptainer

@@ -1,10 +1,14 @@
 BootStrap: docker
 From: ubuntu:lunar
 
+%files
+    $HOME/Downloads/UDB-Corporate-8.0.0 /downloads/udb
+
 %post
     apt-get update
     apt-get upgrade -y
     apt-get install -y -o Dpkg::Options::="--force-overwrite" nano wget sudo git locales curl python3-pip iputils-ping iproute2 nodejs npm binutils-gold clang-16 libclang-16-dev libfmt-dev libboost-dev libclang-cpp16-dev libelf-dev libgmp-dev libunwind-dev llvm-16 ninja-build sbcl pkg-config libnetcdf-dev libczmq-dev libexpat1-dev
+    (cd /downloads/udb; make install)
     echo 'en_US.UTF-8 UTF-8' >/etc/locale.gen
     locale-gen
     cd /mnt

apptainer/cando.def apptainer/old-cando.defapptainer/cando.def renamed to apptainer/old-cando.def

@@ -470,17 +470,15 @@ struct property_registration : registration {
     using VariadicGetterType = WRAPPER_Getter<reg::null_type, Class, Get>;
     core::SimpleFun_sp entryPoint = makeSimpleFunAndFunctionDescription<VariadicGetterType>(sym);
     maybe_register_symbol_using_dladdr((void*)VariadicGetterType::entry_point);
-    auto raw_getter = gc::GC<VariadicGetterType>::allocate(entryPoint, get);
-    core::BuiltinClosure_sp getter = gc::As<core::BuiltinClosure_sp>(raw_getter);
+    auto getter = gc::GC<VariadicGetterType>::allocate(entryPoint, get);
     lisp_defineSingleDispatchMethod(sym, classSymbol, getter, 0, true, m_arguments, m_declares,
                                     m_doc_string, true, 1);
     core::T_sp setf_name = core::Cons_O::createList(cl::_sym_setf, sym);
     using VariadicSetterType = WRAPPER_Setter<reg::null_type, Class, Set>;
     core::SimpleFun_sp setterEntryPoint =
         makeSimpleFunAndFunctionDescription<VariadicSetterType>(setf_name);
     maybe_register_symbol_using_dladdr((void*)VariadicSetterType::entry_point);
-    auto raw_setter = gc::GC<VariadicSetterType>::allocate(setterEntryPoint, set);
-    core::BuiltinClosure_sp setter = gc::As<core::BuiltinClosure_sp>(raw_setter);
+    auto setter = gc::GC<VariadicSetterType>::allocate(setterEntryPoint, set);
     lisp_defineSingleDispatchMethod(setf_name, classSymbol, setter, 1, true, m_arguments, m_declares,
                                     m_doc_string, true, 2);
     //                printf("%s:%d - allocated a getter@%p for %s\n", __FILE__, __LINE__, getter, name);

include/clasp/asttooling/otherPackageClasses.h

@@ -58,6 +58,7 @@ THE SOFTWARE.
 #include <clasp/core/object.h>
 #include <clasp/core/instance.h>
 #include <clasp/core/numbers.h>
+#include <clasp/core/symbol.h>
 #include <clasp/clbind/class_registry.h>
 #include <clasp/clbind/primitives.h>
 #include <clasp/clbind/typeid.h>

include/clasp/cffi-old/otherPackageClasses.h

@@ -38,4 +38,3 @@ THE SOFTWARE.
 #include <clasp/clbind/derivable.h>
 #include <clasp/clbind/derivable_class.h>
 #include <clasp/clbind/clbind_wrappers.h>
-#include <clasp/clbind/clbind_taggedCast.h>