[usocket-cvs] r57 - in usocket/trunk: . backend test

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Tue Feb  7 13:39:46 2006
New Revision: 57

Modified:
   usocket/trunk/   (props changed)
   usocket/trunk/backend/   (props changed)
   usocket/trunk/backend/lispworks.lisp
   usocket/trunk/condition.lisp
   usocket/trunk/test/   (props changed)
   usocket/trunk/test/package.lisp
   usocket/trunk/test/test-usocket.lisp
   usocket/trunk/usocket.asd
Log:
Make LispWorks work.

Modified: usocket/trunk/backend/lispworks.lisp
==============================================================================
--- usocket/trunk/backend/lispworks.lisp	(original)
+++ usocket/trunk/backend/lispworks.lisp	Tue Feb  7 13:39:46 2006
@@ -5,6 +5,8 @@
 
 (in-package :usocket)
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (require "comm"))
 
 #+win32
 (defun remap-maybe-for-win32 (z)
@@ -51,13 +53,15 @@
         (stream))
     (setf stream
           (with-mapped-conditions ()
-             (comm:open-tcp-stream host port)))
-    (make-socket :socket (comm:socket-stream-socket stream)
-                 :stream stream)))
+             (comm:open-tcp-stream hostname port)))
+    (if stream
+        (make-socket :socket (comm:socket-stream-socket stream)
+                     :stream stream)
+      (error 'unknown-error))))
 ;;                 :host host
 ;;                 :port port))
 
 (defmethod socket-close ((usocket usocket))
   "Close socket."
-  (close (stream usocket)))
+  (close (socket-stream usocket)))
 

Modified: usocket/trunk/condition.lisp
==============================================================================
--- usocket/trunk/condition.lisp	(original)
+++ usocket/trunk/condition.lisp	Tue Feb  7 13:39:46 2006
@@ -18,7 +18,7 @@
 
 (define-condition usocket-condition (condition)
   ((socket :initarg :socket
-           :accessor :usocket-socket))
+           :accessor usocket-socket))
   ;;###FIXME: no slots (yet); should at least be the affected usocket...
   (:documentation ""))
 

Modified: usocket/trunk/test/package.lisp
==============================================================================
--- usocket/trunk/test/package.lisp	(original)
+++ usocket/trunk/test/package.lisp	Tue Feb  7 13:39:46 2006
@@ -7,7 +7,7 @@
 
 (eval-when (:execute :load-toplevel :compile-toplevel)
   (defpackage :usocket-test
-      (:use :cl :rt)
+      (:use :cl :regression-test)
     (:nicknames :usoct)
     (:export :do-tests :run-usocket-tests)))
 

Modified: usocket/trunk/test/test-usocket.lisp
==============================================================================
--- usocket/trunk/test/test-usocket.lisp	(original)
+++ usocket/trunk/test/test-usocket.lisp	Tue Feb  7 13:39:46 2006
@@ -38,7 +38,7 @@
     (handler-bind ((usocket:network-unreachable-error
                     #'(lambda (c) (throw 'caught-error nil)))
                    ;; cmu doesn't report as specific as above
-                   #+cmu
+                   #+(or cmu lispworks)
                    (usocket:unknown-error
                     #'(lambda (c) (throw 'caught-error nil)))
                    (condition

Modified: usocket/trunk/usocket.asd
==============================================================================
--- usocket/trunk/usocket.asd	(original)
+++ usocket/trunk/usocket.asd	Tue Feb  7 13:39:46 2006
@@ -18,8 +18,7 @@
     :licence "MIT"
     :description "Universal socket library for Common Lisp"
     :depends-on (:split-sequence
-                 #+sbcl :sb-bsd-sockets
-                 #+lispworks "comm")
+                 #+sbcl :sb-bsd-sockets)
     :components ((:file "package")
                  (:file "usocket"
                         :depends-on ("package"))