Call the actual accept logic directly for clarity and refactoring

Author: eregon

lib/truffle/socket/socket.rb

@@ -406,11 +406,12 @@ def listen(backlog)
   end
 
   def accept
-    Truffle::Socket.accept(self, Socket)
+    Truffle::Socket.accept_and_addrinfo(self, Socket, true)
   end
 
   private def __accept_nonblock(exception)
-    Truffle::Socket.accept_nonblock(self, Socket, exception)
+    self.nonblock = true
+    Truffle::Socket.accept_and_addrinfo(self, Socket, exception)
   end
 
   def sysaccept

lib/truffle/socket/tcp_server.rb

@@ -63,13 +63,14 @@ def listen(backlog)
   end
 
   def accept
-    socket, _ = Truffle::Socket.accept(self, TCPSocket)
+    socket, _ = Truffle::Socket.accept_and_addrinfo(self, TCPSocket, true)
 
     socket
   end
 
   private def __accept_nonblock(exception)
-    socket, _ = Truffle::Socket.accept_nonblock(self, TCPSocket, exception)
+    self.nonblock = true
+    socket, _ = Truffle::Socket.accept_and_addrinfo(self, TCPSocket, exception)
 
     socket
   end

lib/truffle/socket/truffle.rb

@@ -93,7 +93,7 @@ def self.sockaddr_class_for_socket(socket)
       end
     end
 
-    def self.internal_accept(source, new_class, exception)
+    def self.accept_and_addrinfo(source, new_class, exception)
       raise IOError, 'socket has been closed' if source.closed?
 
       sockaddr = sockaddr_class_for_socket(source).new
@@ -123,17 +123,6 @@ def self.internal_accept(source, new_class, exception)
         sockaddr.pointer.free
       end
     end
-    private_class_method :internal_accept
-
-    def self.accept(source, new_class)
-      internal_accept(source, new_class, true)
-    end
-
-    def self.accept_nonblock(source, new_class, exception)
-      source.nonblock = true
-
-      internal_accept(source, new_class, exception)
-    end
 
     def self.listen(source, backlog)
       backlog = Primitive.rb_to_int(backlog)

lib/truffle/socket/unix_server.rb

@@ -51,13 +51,14 @@ def listen(backlog)
   end
 
   def accept
-    socket, _ = Truffle::Socket.accept(self, UNIXSocket)
+    socket, _ = Truffle::Socket.accept_and_addrinfo(self, UNIXSocket, true)
 
     socket
   end
 
   private def __accept_nonblock(exception)
-    socket, _ = Truffle::Socket.accept_nonblock(self, UNIXSocket, exception)
+    self.nonblock = true
+    socket, _ = Truffle::Socket.accept_and_addrinfo(self, UNIXSocket, exception)
 
     socket
   end