Fix the use of native Lisp symbols as Treep symbols

alessiostalla · Mar 16, 2024 · 2ccd9ab · 2ccd9ab
1 parent e7eb13a
commit 2ccd9ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/level0/abstractions.lisp b/src/level0/abstractions.lisp
@@ -16,19 +16,21 @@
 				slots))))
      ',name))
 
-;;Basic forms
-(defconstant +symbol-abstraction+                     (intern "abstraction"         +symbol-treep+))
-(defconstant +symbol-abstraction-direct-superclasses+ (intern "direct-superclasses" +symbol-abstraction+))
-(defconstant +symbol-abstraction-slot+                (intern "slot"                +symbol-abstraction+))
-(defconstant +symbol-abstraction-slots+               (intern "slots"               +symbol-abstraction+))
-(defconstant +symbol-name+                            (intern "name"                +symbol-treep+))
-(defconstant +symbol-namespace+                       (intern "namespace"           +symbol-treep+))
-(defconstant +symbol-namespace-search-path+           (intern "search-path"         +symbol-namespace+))
-(defconstant +symbol-quote+                           (intern "quote"               +symbol-treep+))
-(defconstant +symbol-seq+                             (intern "seq"                 +symbol-treep+))
-(defconstant +symbol-seq-elements+                    (intern "elements"            +symbol-seq+))
-(defconstant +symbol-with+                            (intern "with"                +symbol-treep+))
-(defconstant +symbol-with-value+                      (intern "value"               +symbol-with+))
+;; Basic forms.
+;; These ought to be constant but SBCL complains about redefinition because they're not identical between compile-time and load-time
+;; TODO rewrite these as imports of Lisp symbols
+(defvar +symbol-abstraction+                     (intern "abstraction"         +symbol-treep+))
+(defvar +symbol-abstraction-direct-superclasses+ (intern "direct-superclasses" +symbol-abstraction+))
+(defvar +symbol-abstraction-slot+                (intern "slot"                +symbol-abstraction+))
+(defvar +symbol-abstraction-slots+               (intern "slots"               +symbol-abstraction+))
+(defvar +symbol-name+                            (intern "name"                +symbol-treep+))
+(defvar +symbol-namespace+                       (intern "namespace"           +symbol-treep+))
+(defvar +symbol-namespace-search-path+           (intern "search-path"         +symbol-namespace+))
+(defvar +symbol-quote+                           (intern "quote"               +symbol-treep+))
+(defvar +symbol-seq+                             (intern "seq"                 +symbol-treep+))
+(defvar +symbol-seq-elements+                    (intern "elements"            +symbol-seq+))
+(defvar +symbol-with+                            (intern "with"                +symbol-treep+))
+(defvar +symbol-with-value+                      (intern "value"               +symbol-with+))
 
 (define-abstraction quote +symbol-quote+ ()
   ((form :initarg :form :reader quoted-form)))

diff --git a/src/level0/forms.lisp b/src/level0/forms.lisp
@@ -38,6 +38,7 @@
   (find-class 'effective-form-slot-definition))
 
 ;; These ought to be constant but SBCL complains about redefinition because they're not identical between compile-time and load-time
+;; TODO rewrite these as imports of Lisp symbols
 (defvar +symbol-form+        (intern "form"   +symbol-treep+))
 (defvar +symbol-form-parent+ (intern "parent" +symbol-form+))