Update for CST:RECONSTRUCT API change

Author: Bike

repos.sexp

@@ -88,7 +88,7 @@
  (:name :cleavir
   :repository "https://github.com/s-expressionists/Cleavir.git"
   :directory "src/lisp/kernel/contrib/Cleavir/"
-  :commit "a73d313735447c63b4b11b6f8984f9b1e3e74ec9")
+  :commit "cacdf4cca14647a258321effb3500ec4563fc570")
  (:name :closer-mop
   :repository "https://github.com/pcostanza/closer-mop.git"
   :directory "src/lisp/kernel/contrib/closer-mop/"

src/lisp/kernel/cleavir/convert-special.lisp

@@ -16,7 +16,7 @@
          ((,head (eql ',name)) ,cst ,environment (,system clasp-cleavir:clasp))
        (cst-to-ast:convert
         (destructuring-bind ,lambda-list (cst:raw (cst:rest ,cst))
-          (cst:reconstruct (progn ,@body) ,cst ,system))
+          (cst:reconstruct ,system (progn ,@body) ,cst))
         ,environment ,system))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

src/lisp/kernel/cleavir/inline-prep.lisp

@@ -110,7 +110,7 @@
         ;; FIXME: This will mess up inline definitions within macrolets etc.
         (env nil)
         (cst (if *compiling-cst*
-                 (cst:reconstruct form *compiling-cst* *clasp-system*)
+                 (cst:reconstruct *clasp-system* form *compiling-cst*)
                  (cst:cst-from-expression form))))
     (fix-inline-ast (cst->ast cst env))))
 

src/lisp/kernel/cleavir/satiation.lisp

@@ -297,10 +297,10 @@
   (clos:satiate #'cst:nthrest '(fixnum cst:cons-cst))
   ;; SP NIL T T
   (clos:satiate #'cst:reconstruct
-                '(cons cst:atom-cst clasp-64bit)
-                '(cons cst:cons-cst clasp-64bit)
-                '(cons null clasp-64bit)
-                '(cons cons clasp-64bit)))
+                '(clasp-64bit cons cst:atom-cst)
+                '(clasp-64bit cons cst:cons-cst)
+                '(clasp-64bit cons null)
+                '(clasp-64bit cons cons)))
 
 #+cst
 (eval-when (:load-toplevel)

src/lisp/kernel/cleavir/toplevel.lisp

@@ -120,7 +120,7 @@
          (multiple-value-bind (expansion expandedp)
              (macroexpand (cst:raw cst) env)
            (let ((cst (if expandedp
-                          (cst:reconstruct expansion cst *cst-client*)
+                          (cst:reconstruct *cst-client* expansion cst)
                           cst)))
              (etypecase cst
                (cst:atom-cst

src/lisp/kernel/cleavir/translate.lisp

@@ -2072,14 +2072,15 @@
          (origin (origin-source cst)))
     (invoke-restart 'cst-to-ast:substitute-cst
                     (cst:reconstruct
+                     clasp-cleavir:*clasp-system*
                      `(error 'cmp:compiled-program-error
                              :form ,(with-standard-io-syntax
                                       (write-to-string form
                                                        :escape t :pretty t
                                                        :circle t :array nil))
                              :origin ',(origin-spi origin)
                              :condition ,(princ-to-string condition))
-                     cst clasp-cleavir:*clasp-system* :default-source origin))))
+                     cst :default-source origin))))
 
 (defun cst->ast (cst &optional (env *clasp-env*))
   "Compile a cst into an AST and return it.