Skip to content

Commit

Permalink
Formatting: use spaces instead of tabs for indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
kmsquire committed Sep 23, 2014
1 parent 13c6917 commit dafbc59
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion base/abstractarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ end
function ipermutedims(A::AbstractArray,perm)
iperm = Array(Int,length(perm))
for i = 1:length(perm)
iperm[perm[i]] = i
iperm[perm[i]] = i
end
return permutedims(A,iperm)
end
Expand Down
2 changes: 1 addition & 1 deletion base/inference.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ function typeinf(linfo::LambdaStaticData,atypes::Tuple,sparams::Tuple, def, cop)
if la > 0
lastarg = ast.args[1][la]
if is_rest_arg(lastarg)
if atypes === Tuple
if atypes === Tuple
if la > 1
atypes = tuple(NTuple{la-1,Any}..., Tuple[1])
end
Expand Down
8 changes: 4 additions & 4 deletions base/linalg/arpack.jl
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ function aupd_wrapper(T, matvecA::Function, matvecB::Function, solveSI::Function
rwork = cmplx ? Array(TR, ncv) : Array(TR, 0)

if isempty(v0)
resid = Array(T, n)
info = zeros(BlasInt, 1)
resid = Array(T, n)
info = zeros(BlasInt, 1)
else
resid = deepcopy(v0)
info = ones(BlasInt, 1)
resid = deepcopy(v0)
info = ones(BlasInt, 1)
end
iparam = zeros(BlasInt, 11)
ipntr = zeros(BlasInt, (sym && !cmplx) ? 11 : 14)
Expand Down
2 changes: 1 addition & 1 deletion base/linalg/dense.jl
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ function expm!{T<:BlasFloat}(A::StridedMatrix{T})
end
end

# Undo the balancing
# Undo the balancing
for j = ilo:ihi
scj = scale[j]
for i = 1:n
Expand Down
72 changes: 36 additions & 36 deletions base/linalg/ldlt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,44 @@ convert{T,S,U}(::Type{Factorization{T}}, F::LDLt{S,U}) = convert(LDLt{T,U}, F)

# SymTridiagonal
function ldltfact!{T<:Real}(S::SymTridiagonal{T})
n = size(S,1)
d = S.dv
e = S.ev
@inbounds for i = 1:n-1
e[i] /= d[i]
d[i+1] -= abs2(e[i])*d[i]
d[i+1] > 0 || throw(PosDefException(i+1))
end
return LDLt{T,SymTridiagonal{T}}(S)
n = size(S,1)
d = S.dv
e = S.ev
@inbounds for i = 1:n-1
e[i] /= d[i]
d[i+1] -= abs2(e[i])*d[i]
d[i+1] > 0 || throw(PosDefException(i+1))
end
return LDLt{T,SymTridiagonal{T}}(S)
end
function ldltfact{T}(M::SymTridiagonal{T})
S = typeof(zero(T)/one(T))
return S == T ? ldltfact!(copy(M)) : ldltfact!(convert(SymTridiagonal{S}, M))
S = typeof(zero(T)/one(T))
return S == T ? ldltfact!(copy(M)) : ldltfact!(convert(SymTridiagonal{S}, M))
end
function A_ldiv_B!{T}(S::LDLt{T,SymTridiagonal{T}}, B::AbstractVecOrMat{T})
n, nrhs = size(B, 1), size(B, 2)
size(S,1) == n || throw(DimensionMismatch(""))
d = S.data.dv
l = S.data.ev
@inbounds begin
for i = 2:n
li1 = l[i-1]
for j = 1:nrhs
B[i,j] -= li1*B[i-1,j]
end
end
dn = d[n]
for j = 1:nrhs
B[n,j] /= dn
end
for i = n-1:-1:1
di = d[i]
li = l[i]
for j = 1:nrhs
B[i,j] /= di
B[i,j] -= li*B[i+1,j]
end
end
end
return B
n, nrhs = size(B, 1), size(B, 2)
size(S,1) == n || throw(DimensionMismatch(""))
d = S.data.dv
l = S.data.ev
@inbounds begin
for i = 2:n
li1 = l[i-1]
for j = 1:nrhs
B[i,j] -= li1*B[i-1,j]
end
end
dn = d[n]
for j = 1:nrhs
B[n,j] /= dn
end
for i = n-1:-1:1
di = d[i]
li = l[i]
for j = 1:nrhs
B[i,j] /= di
B[i,j] -= li*B[i+1,j]
end
end
end
return B
end
4 changes: 2 additions & 2 deletions base/pkg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tag(pkg::String, sym::Symbol, commit::String) = cd(Entry.tag,pkg,sym,false,commi

tag(pkg::String, ver::VersionNumber; force::Bool=false) = cd(Entry.tag,pkg,ver,force)
tag(pkg::String, ver::VersionNumber, commit::String; force::Bool=false) =
cd(Entry.tag,pkg,ver,force,commit)
cd(Entry.tag,pkg,ver,force,commit)

submit(pkg::String) = cd(Entry.submit,pkg)
submit(pkg::String, commit::String) = cd(Entry.submit,pkg,commit)
Expand All @@ -61,7 +61,7 @@ build() = cd(Entry.build)
build(pkgs::String...) = cd(Entry.build,[pkgs...])

generate(pkg::String, license::String; force::Bool=false, authors::Union(String,Array) = [], config::Dict=Dict()) =
cd(Generate.package,pkg,license,force=force,authors=authors,config=config)
cd(Generate.package,pkg,license,force=force,authors=authors,config=config)


test(;coverage::Bool=false) = cd(Entry.test; coverage=coverage)
Expand Down
6 changes: 3 additions & 3 deletions base/pkg/cache.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ function prefetch{S<:String}(pkg::String, url::String, sha1s::Vector{S})
Git.set_remote_url(url, dir=cache)
if !all(sha1->Git.iscommit(sha1, dir=cache), sha1s)
info("Updating cache of $pkg...")
Git.success(`remote update`, dir=cache) ||
error("couldn't update $cache using `git remote update`")
end
Git.success(`remote update`, dir=cache) ||
error("couldn't update $cache using `git remote update`")
end
filter(sha1->!Git.iscommit(sha1, dir=cache), sha1s)
end
prefetch(pkg::String, url::String, sha1::String...) = prefetch(pkg, url, String[sha1...])
Expand Down
2 changes: 1 addition & 1 deletion base/socket.jl
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ function listenany(default_port)
return (addr.port,sock)
end
close(sock)
addr.port += 1
addr.port += 1
if addr.port==default_port
error("no ports available")
end
Expand Down

4 comments on commit dafbc59

@StefanKarpinski
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since you presumably used a command to do this, could you do this for the release-0.3 branch as well?

@quinnj
Copy link
Member

@quinnj quinnj commented on dafbc59 Sep 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sublime text has a directory-level find and replace.

@kmsquire
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take a look.

FWIW, I did a grep -rlP "\t" to find the files, then loaded them into emacs. There's probably something slightly more automated I could have done. :-)

@kmsquire
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@quinnj, the problem with find and replace, as I found out, is that there aren't a fixed number of spaces for all of the tabs. But there aren't that many to fix by hand in this case, so it wasn't a big deal.

I have a backport ready, just need internet.

Please sign in to comment.