Add define-interface

code/extrinsic/interface.lisp

@@ -1,10 +1,5 @@
 (in-package #:invistra-extrinsic)
 
-(defun format (destination control-string &rest args)
-  (apply #'invistra:format incless-extrinsic:*client* destination control-string args))
+(invistra:define-interface (incless-extrinsic:*client* incless-extrinsic:extrinsic-client))
 
-(defmacro formatter (control-string)
-  (invistra:formatter incless-extrinsic:*client* control-string))
-
-(define-compiler-macro format (&whole form destination control-string &rest args)
-  (invistra:format-compiler-macro incless-extrinsic:*client* form destination control-string args))
+(initialize-invistra)

code/extrinsic/packages.lisp

@@ -4,4 +4,5 @@
            #:formatter)
   (:export #:*client*
            #:format
-           #:formatter))
+           #:formatter
+           #:initialize-invistra))

code/interface.lisp

@@ -0,0 +1,21 @@
+(in-package #:invistra)
+
+(defun ensure-symbol (name &optional (package *package*))
+  (intern (string name) package))
+
+(defmacro define-interface ((client-var client-class &optional intrinsic) &body body)
+  (let* ((intrinsic-pkg (if intrinsic (find-package '#:common-lisp) *package*))
+         (format-func (ensure-symbol '#:format intrinsic-pkg))
+         (initialize-func (ensure-symbol '#:initialize-invistra)))
+    `(progn
+       (defun ,format-func (destination control-string &rest args)
+         (apply #'format ,client-var destination control-string args))
+
+       (defmacro ,(ensure-symbol '#:formatter intrinsic-pkg) (control-string)
+         (formatter ,client-var control-string))
+
+       (define-compiler-macro ,format-func (&whole form destination control-string &rest args)
+         (format-compiler-macro ,client-var form destination control-string args))
+
+       (defun ,initialize-func ()
+         ,@body))))

code/intrinsic/interface.lisp

@@ -1,10 +1,3 @@
 (in-package #:invistra-intrinsic)
 
-(defun format (destination control-string &rest args)
-  (apply #'invistra:format incless-intrinsic:*client* destination control-string args))
-
-(defmacro formatter (control-string)
-  (invistra:formatter incless-intrinsic:*client* control-string))
-
-(define-compiler-macro format (&whole form destination control-string &rest args)
-  (invistra:format-compiler-macro incless-intrinsic:*client* form destination control-string args))
+(invistra:define-interface (incless-intrinsic:*client* incless-intrinsic:intrinsic-client t))

code/intrinsic/packages.lisp

@@ -1,3 +1,4 @@
 (defpackage #:invistra-intrinsic
   (:use #:common-lisp)
-  (:export #:*client*))
+  (:export #:*client*
+           #:initialize-invistra))

code/packages.lisp

@@ -4,14 +4,15 @@
            #:formatter)
   #+sicl
   (:local-nicknames (:trivial-gray-streams :cyclosis))
-  (:export #:*roman-digits*
-           #:*destination*
-           #:consume-next-argument
+  (:export #:*destination*
+           #:*roman-digits*
            #:at-sign-p
            #:check-directive-syntax
            #:coerce-function-designator
            #:colon-p
            #:compile-item
+           #:consume-next-argument
+           #:define-interface
            #:directive
            #:format
            #:format-compiler-macro

code/shim/interface.lisp

@@ -11,11 +11,6 @@
 #+sbcl (setf (sb-c::fun-info-transforms (sb-c::fun-info-or-lose 'format)) nil)
 
 (trivial-package-locks:with-unlocked-system-packages
-  (defun format (destination control-string &rest args)
-    (apply #'invistra:format *client* destination control-string args))
+  (invistra:define-interface (*client* shim-client t)))
 
-  (defmacro formatter (control-string)
-    (invistra:formatter *client* control-string))
-
-  (define-compiler-macro format (&whole form destination control-string &rest args)
-    (invistra:format-compiler-macro *client* form destination control-string args)))
+(initialize-invistra)

code/shim/packages.lisp

@@ -1,3 +1,4 @@
 (defpackage #:invistra-shim
   (:use #:common-lisp)
-  (:export #:*client*))
+  (:export #:*client*
+           #:initialize-invistra))

invistra.asd

@@ -35,4 +35,5 @@
                              (:file "control-flow-operations")
                              (:file "miscellaneous-operations")
                              (:file "miscellaneous-pseudo-operations")
-                             (:file "condition-reporters-en")))))
+                             (:file "condition-reporters-en")
+                             (:file "interface")))))