Split 'make-socket' and update EXPLAIN.md

Author: aw

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.25 (2014-04-15)
+
+  * Split 'make-socket' for more flexibility
+  * Update EXPLAIN.md
+
 ## 0.5.24 (2014-04-14)
 
   * Update to picolisp-unit v0.6.1

EXPLAIN.md

@@ -234,12 +234,12 @@ There's nothing special about this function. I simply wanted to highlight the [t
 
 This can be caught with `(catch 'InternalError`. The return value is a list which will contain `'NanomsgError` in the `car`, and a String in the `cdr`.
 
-### make-socket
+### create-socket
 
-I won't go into detail about the `make-socket` internal function, but I was pleased to discover the [default](http://software-lab.de/doc/refD.html#default) function, which assigns a default value to a variable.
+I won't go into detail about the `create-socket` internal function, but I was pleased to discover the [default](http://software-lab.de/doc/refD.html#default) function, which assigns a default value to a variable.
 
 ```lisp
-[de make-socket (Addr Type Flag Domain)
+[de create-socket (Type Domain)
   (default Domain "AF_SP")
 ```
 

module.l

@@ -1,6 +1,6 @@
 [de MODULE_INFO
   ("name"       "nanomsg")
-  ("version"    "0.5.24")
+  ("version"    "0.5.25")
   ("summary"    "Nanomsg ffi-binding for PicoLisp")
   ("source"     "https://github.com/aw/picolisp-nanomsg.git")
   ("author"     "Alexander Williams")

nanomsg.l

@@ -9,7 +9,8 @@
 (local MODULE_INFO MSG_MAX_SIZE *Nanomsg *NN_Symbols)
 (local nn-socket nn-close nn-setsockopt nn-getsockopt nn-bind nn-connect nn-shutdown nn-send nn-recv)
 (local nn-errno nn-strerror nn-symbol nn-poll nn-device nn-poll-lt-1 fetch-symbols symbol-val)
-(local exit-with-error exit-with-error-maybe make-socket make-endpoint check-endpoint sub-unsub non-blocking-io)
+(local exit-with-error exit-with-error-maybe create-socket make-socket make-endpoint check-endpoint)
+(local sub-unsub non-blocking-io)
 
 (load (pack (car (file)) "module.l"))
 
@@ -131,12 +132,17 @@
         ((= -1 Result) (exit-with-error Sock)) ]
 
 [de make-socket (Addr Type Flag Domain)
+  (let Sock (create-socket Type Domain)
+    (let Endpoint (make-endpoint Addr Type Flag Sock)
+      (check-endpoint Sock Endpoint) ]
+
+[de create-socket (Type Domain)
   (default Domain "AF_SP")
-  (let Sock (nn-socket Domain Type)
-    (if (= -1 Sock)
-        (exit-with-error Sock)
-        (let Endpoint (make-endpoint Addr Type Flag Sock)
-          (check-endpoint Sock Endpoint) ]
+  (prog1
+    (nn-socket Domain Type)
+    (if (= -1 @)
+        (exit-with-error @)
+        @ ]
 
 [de make-endpoint (Addr Type Flag Sock)
   (cond ((= Type "NN_REP")        (nn-bind Sock Addr))