Changeset 14106


Ignore:
Timestamp:
08/17/12 10:45:00 (8 years ago)
Author:
ehuelsmann
Message:

Move exports from the THREADS package to threads.lisp.
Move sockets related exports to socket.lisp, fixing symbol references

to refer to the EXTENSIONS package instead of SYSTEM.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/autoloads.lisp

    r14104 r14106  
    8585(autoload 'process-kill "run-program")
    8686
    87 (export 'make-socket)
    88 (export 'make-server-socket)
    89 (export 'server-socket-close)
    90 (export 'socket-accept)
    91 (export 'socket-close)
    92 (export 'get-socket-stream)
    93 (export 'socket-peer-port)
    94 (export 'socket-local-port)
    95 (export 'socket-local-address)
    96 (export 'socket-peer-address)
    97 
    98 (in-package "THREADS")
    99 
    100 (export '(make-mailbox mailbox-send mailbox-empty-p
    101           mailbox-read mailbox-peek))
    102 (export '(make-thread-lock with-thread-lock))
    103 (export '(make-mutex get-mutex release-mutex with-mutex))
    104 
    105 
    106 (in-package "EXTENSIONS")
    10787
    10888(export '(grovel-java-definitions compile-system))
  • trunk/abcl/src/org/armedbear/lisp/ed.lisp

    r11391 r14106  
    5858    (when (probe-file portfile)
    5959      (let* ((port (with-open-file (s portfile) (read s nil nil)))
    60              (socket (and (integerp port) (make-socket "127.0.0.1" port))))
    61         (setf stream (and socket (get-socket-stream socket)))))
     60             (socket (and (integerp port) (ext:make-socket "127.0.0.1" port))))
     61        (setf stream (and socket (ext:get-socket-stream socket)))))
    6262    (unwind-protect
    6363     (cond ((stringp what)
  • trunk/abcl/src/org/armedbear/lisp/socket.lisp

    r13072 r14106  
    3030;;; exception statement from your version.
    3131
    32 (in-package "SYSTEM")
     32(in-package "EXTENSIONS")
     33
     34(export '(make-socket make-server-socket server-socket-close socket-accept
     35          socket-close get-socket-stream socket-peer-port socket-local-port
     36          socket-local-address socket-peer-address))
     37
    3338
    3439(defun get-socket-stream (socket &key (element-type 'character) (external-format :default))
     
    4348                :format-control
    4449                ":ELEMENT-TYPE must be CHARACTER or (UNSIGNED-BYTE 8).")))
    45   (%socket-stream socket element-type external-format))
     50  (sys::%socket-stream socket element-type external-format))
    4651
    4752(defun make-socket (host port)
    48   (%make-socket host port))
     53  (sys::%make-socket host port))
    4954
    5055(defun make-server-socket (port)
    51   (%make-server-socket port))
     56  (sys::%make-server-socket port))
    5257
    5358(defun socket-accept (socket)
    54   (%socket-accept socket))
     59  (sys::%socket-accept socket))
    5560
    5661(defun socket-close (socket)
    57   (%socket-close socket))
     62  (sys::%socket-close socket))
    5863
    5964(defun server-socket-close (socket)
    60   (%server-socket-close socket))
     65  (sys::%server-socket-close socket))
    6166
    6267(declaim (inline %socket-address %socket-port))
  • trunk/abcl/src/org/armedbear/lisp/threads.lisp

    r13994 r14106  
    3232
    3333(in-package #:threads)
     34
     35
     36(export '(make-mailbox mailbox-send mailbox-empty-p
     37          mailbox-read mailbox-peek
     38          make-thread-lock with-thread-lock
     39          make-mutex get-mutex release-mutex with-mutex))
    3440
    3541
Note: See TracChangeset for help on using the changeset viewer.