correct wfst array type when adjusted

lisp · Feb 16, 2014 · 0cf93b7 · 0cf93b7
1 parent de74959
commit 0cf93b7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/atn-lisp-compiler.lisp b/atn-lisp-compiler.lisp
@@ -230,9 +230,9 @@
   (declare (special *grammar-system *parser-name *system-lexicon *tokenizer-name))
   (declare (ignore report-recursion))  ;; to permit the compiler to be used with older parser versions
   (setq *atn-source-package* (or (find-package *atn-source-package*)
-                                 "source package is invalid: ~s." *atn-source-package*))
+                                 (error "source package is invalid: ~s." *atn-source-package*)))
   (setq *atn-token-package* (or (find-package *atn-token-package*)
-                                 "token package is invalid: ~s." *atn-token-package*))
+                                (error "token package is invalid: ~s." *atn-token-package*)))
   (unless (or source-pathname *compile-file-pathname*)
     (error "no output pathname provided."))
 

diff --git a/atn-runtime.lisp b/atn-runtime.lisp
@@ -144,7 +144,7 @@
 )
 
 (defun |wfst-adjust| (cache size)
-  (adjust-array cache size :element-type 'cons :initial-element nil))
+  (adjust-array cache size :element-type 'list :initial-element nil))
 
 (defun |wfst-entry| (net index &aux cache-entry)
   (cond ((and *atn-wfst

diff --git a/clifs/inference-system-classes.lisp b/clifs/inference-system-classes.lisp
@@ -14,6 +14,7 @@
    lispworks/ansi conformance</DELTA>
   <DELTA DATE='20030602'>scl</DELTA>
   <DELTA DATE='20050614'>acl version 7.0 ansi mods</DELTA>
+  <DELTA DATE='20110402'>lw 6</DELTA>
   </CHRONOLOGY>
  </DOCUMENTATION>
 |#
@@ -104,14 +105,14 @@
 
 ;; wg. CL-Konformitaet
 #-clisp
-(defmethod documentation ((x inference-system) #-(or CMU LispWorks4 sbcl openmcl scl
+(defmethod documentation ((x inference-system) #-(or CMU lispworks sbcl openmcl scl
                                                      (and allegro allegro-version>= (version>= 7 0))
                                                      ) &optional type)
   (declare (ignore type))
   (slot-value x 'doc))
 
 #-clisp
-(defmethod (setf documentation) (doc (x inference-system) #-(or CMU LispWorks4 sbcl openmcl scl
+(defmethod (setf documentation) (doc (x inference-system) #-(or CMU lispworks sbcl openmcl scl
                                                                 (and allegro allegro-version>= (version>= 7 0))
                                                                 ) &optional type)
   (declare (ignore type))

diff --git a/clifs/inference-units.lisp b/clifs/inference-units.lisp
@@ -34,13 +34,13 @@
    (documentation :accessor rule-documentation
                   :initarg :documentation)))
 
-(defmethod documentation ((x rule) #-(or CMU LispWorks4 sbcl openmcl scl
+(defmethod documentation ((x rule) #-(or CMU lispworks sbcl openmcl scl
                                          (and allegro allegro-version>= (version>= 7 0))
                                          ) &optional doc-type)
   (declare (ignore doc-type))
   (slot-value x 'documentation))
 
-(defmethod (setf documentation) (doc-string (x rule) #-(or CMU LispWorks4 sbcl openmcl scl
+(defmethod (setf documentation) (doc-string (x rule) #-(or CMU lispworks sbcl openmcl scl
                                                            (and allegro allegro-version>= (version>= 7 0))
                                                            ) &optional doc-type)
   (declare (ignore doc-type))

diff --git a/clifs/package.lisp b/clifs/package.lisp
@@ -24,7 +24,14 @@
   #+(and Allegro (version< 6 0)) (:import-from "CLOS" "CLASS-PRECEDENCE-LIST")
   #+Genera (:import-from "CLOS-INTERNALS" "CLASS-PRECEDENCE-LIST" "FUNCALLABLE-STANDARD-CLASS" "VALIDATE-SUPERCLASS")
   #+Genera(:shadowing-import-from "SI" "STREAM")
-  #+lispworks (:import-from :lispworks
+  #+lispworks (:import-from :clos
+                            :built-in-class
+                            :class-name
+                            :class-of
+                            :class-precedence-list
+                            :find-class
+                            :funcallable-standard-class
+                            :standard-class
                             :validate-superclass)
   #+PCL (:shadowing-import-from "PCL" "CLASS-PRECEDENCE-LIST"
 				"FUNCALLABLE-STANDARD-CLASS"

diff --git a/package.lisp b/package.lisp
@@ -59,7 +59,7 @@
                          :funcallable-standard-class
                          :validate-superclass)
   #+genera(:shadowing-import-from :si :stream)
-  #+lispworks (:import-from :lispworks
+  #+lispworks (:import-from :clos
                             :validate-superclass)
   #+pcl (:shadowing-import-from :pcl :class-precedence-list
 				:funcallable-standard-class