Export portions of `lol-ucw'

* Expose stable interfaces
* Clean up contextl/lol components

diff --git a/src/ucw/contextl-components.lisp b/src/ucw/contextl-components.lisp
index b948d38..7d90db3 100644 (file)
--- a/src/ucw/contextl-components.lisp
+++ b/src/ucw/contextl-components.lisp
@@ -7,8 +7,6 @@
         (with-dynamic-environment (,env)
           ,@body)))))
 
-(export '(dlambda) :lisp-on-lines-ucw)
-
 (defclass contextl-application (standard-application) 
   ()
   (:default-initargs 
@@ -36,7 +34,6 @@
   (with-dynamic-environment ((action-dynamic-environment action))
     (call-next-method)))
 
-
 (defclass contextl-component (standard-component) 
   ((component-dynamic-environment :accessor component-dynamic-environment
                                  :initform nil))
@@ -50,7 +47,7 @@
              (call-next-method))))
 
 (defmethod/cc call-component :before ((from t) (to contextl-component))
- (setf (component-dynamic-environment to) (capture-dynamic-environment)))
+  (setf (component-dynamic-environment to) (capture-dynamic-environment)))
 
 
 

diff --git a/src/ucw/lol-components.lisp b/src/ucw/lol-components.lisp
index 395c8a1..bbbdadb 100644 (file)
--- a/src/ucw/lol-components.lisp
+++ b/src/ucw/lol-components.lisp
@@ -1,5 +1,7 @@
 (in-package :lol-ucw)
 
+;;; Not sure what the intent of this is, unused in maxclaims --clinton
+
 (defclass lol-component ()
   ()
   (:metaclass standard-component-class))

diff --git a/src/ucw/packages.lisp b/src/ucw/packages.lisp
index 5649f6c..99348c6 100644 (file)
--- a/src/ucw/packages.lisp
+++ b/src/ucw/packages.lisp
@@ -3,18 +3,15 @@
   (:documentation "An LoL Layer over ucw.basic")
   (:nicknames #:lol-ucw)
   (:use #:lisp-on-lines #:ucw :ucw-core :common-lisp :arnesi :contextl)
-
   (:shadowing-import-from :js
    #:new)  
   (:shadowing-import-from :ucw-core
-   #:parent )
+   #:parent)
   (:import-from :ucw-standard 
        #:call #:answer #:defaction #:*source-component*)
-  
-
-               
-  (:export 
-   
-   #:lol-component   
-   #:described-component-class))
-
+  (:export #:dlambda
+          #:described-component-class
+          #:lisp-on-lines-application
+          #:lisp-on-lines-component
+          #:lisp-on-lines-component-class
+          #:lol-component))
\ No newline at end of file

diff --git a/src/ucw/standard-components.lisp b/src/ucw/standard-components.lisp
index 94591df..62c6fc6 100644 (file)
--- a/src/ucw/standard-components.lisp
+++ b/src/ucw/standard-components.lisp
@@ -44,12 +44,6 @@
                     (list (find-class 'lisp-on-lines-component)))
             initargs)))
 
-(defclass described-component-class (described-class standard-component-class )
-  ())
-
-
-
-
 (defmethod ucw-core:handle-action :wrap-around ((action lisp-on-lines-action) application session frame)
      (let ((lol::*invalid-objects* (make-hash-table)))
        (handler-bind ((lol::validation-condition 
@@ -63,6 +57,10 @@
                                       (gethash object lol::*invalid-objects*)))))))
        (call-next-method))))
 
+(defclass described-component-class (described-class standard-component-class)
+  ())
+
+
 
 
 
@@ -70,8 +68,6 @@
 
 
 
-(defclass described-component-class (described-class standard-component-class )
-  ())