Skip to content

Keep acronyms all upper-case #8175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 29, 2014
Merged

Keep acronyms all upper-case #8175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20188a3
Remove empty base/comparison.jl
nalimilan Aug 28, 2014
24714f2
Fix inconsistent capitalization of type abbreviations in socket.jl
jakebolewski Aug 28, 2014
926fb93
export TCPSocket as well
jakebolewski Aug 28, 2014
b4151f6
add type name changes to deprecate.jl
jakebolewski Aug 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed base/comparison.jl
View file
Open in desktop
Empty file.
7 changes: 6 additions & 1 deletion base/deprecated.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,9 @@ scale!{T<:Base.LinAlg.BlasReal}(X::Array{T}, s::Complex) = error("scale!: Cannot

@deprecate rsplit(x,y,l::Integer,k::Bool) rsplit(x,y;limit=l,keep=k)
@deprecate rsplit(x,y,l::Integer) rsplit(x,y;limit=l)
@deprecate rsplit(x,y,k::Bool) rsplit(x,y;keep=k)
@deprecate rsplit(x,y,k::Bool) rsplit(x,y;keep=k)

export TcpSocket, UdpSocket, IpAddr
const TcpSocket = TCPSocket
const UdpSocket = UDPSocket
const IpAddr = IPAddr
3 changes: 2 additions & 1 deletion base/exports.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,8 @@ export
write,
writecsv,
writedlm,
UdpSocket,
TCPSocket,
UDPSocket,

# multiprocessing
addprocs,
Expand Down
14 changes: 7 additions & 7 deletions base/multi.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@ abstract ClusterManager
type Worker
host::ByteString
port::Uint16
socket::TcpSocket
socket::TCPSocket
sendbuf::IOBuffer
del_msgs::Array{Any,1}
add_msgs::Array{Any,1}
id::Int
gcflag::Bool
bind_addr::IpAddr
bind_addr::IPAddr
manage::Function
config::Dict

Worker(host::String, port::Integer, sock::TcpSocket, id::Int) =
Worker(host::String, port::Integer, sock::TCPSocket, id::Int) =
new(bytestring(host), uint16(port), sock, IOBuffer(), {}, {}, id, false)
end
Worker(host::String, port::Integer, sock::TcpSocket) =
Worker(host::String, port::Integer, sock::TCPSocket) =
Worker(host, port, sock, 0)
function Worker(host::String, port::Integer)
# Connect to the loopback port if requested host has the same ipaddress as self.
Expand Down Expand Up @@ -158,7 +158,7 @@ function flush_gc_msgs(w::Worker)
end

#TODO: Move to different Thread
function enq_send_req(sock::TcpSocket,buf,now::Bool)
function enq_send_req(sock::TCPSocket, buf, now::Bool)
arr=takebuf_array(buf)
write(sock,arr)
#TODO implement "now"
Expand Down Expand Up @@ -194,7 +194,7 @@ end

type LocalProcess
id::Int
bind_addr::IpAddr
bind_addr::IPAddr
LocalProcess() = new(1)
end

Expand Down Expand Up @@ -816,7 +816,7 @@ notify_empty(rv::RemoteValue) = notify(rv.empty)
## message event handlers ##

# activity on accept fd
function accept_handler(server::TcpServer, status::Int32)
function accept_handler(server::TCPServer, status::Int32)
if status == -1
error("an error occured during the creation of the server")
end
Expand Down
Loading