Skip to content

Commit d6eaad4

Browse files
authored
Map imported names to correct parentmodules (#170)
* Map imported names to correct parentmodules * Add colon back to Base imports
1 parent 5c4695e commit d6eaad4

File tree

1 file changed

+22
-40
lines changed

1 file changed

+22
-40
lines changed

src/InfiniteArrays.jl

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,20 @@
11
module InfiniteArrays
22
using LinearAlgebra, FillArrays, Infinities, LazyArrays, ArrayLayouts
33

4-
import Base: *, +, -, /, \, ==, isinf, isfinite, sign, signbit, angle, show, isless,
5-
fld, cld, div, min, max, minimum, maximum, mod,
6-
<, , >, , promote_rule, convert, unsafe_convert, copy,
7-
size, step, isempty, length, first, last, tail,
8-
getindex, setindex!, intersect, @_inline_meta,
9-
sort, sort!, issorted, sortperm, sum, in, broadcast,
10-
eltype, elsize, parent, parentindices, reinterpret,
11-
unaliascopy, dataids,
12-
real, imag, conj, transpose,
13-
exp, log, sqrt, cos, sin, tan, csc, sec, cot,
14-
cosh, sinh, tanh, csch, sech, coth, acos, asin, atan, acsc, asec, acot,
15-
acosh, asinh, atanh, acsch, asech, acoth, (:),
16-
AbstractMatrix, AbstractArray, checkindex, unsafe_length, unsafe_indices, OneTo,
17-
to_shape, _sub2ind, print_matrix, print_matrix_row, print_matrix_vdots,
18-
checkindex, Slice, IdentityUnitRange, @propagate_inbounds, @_propagate_inbounds_meta,
19-
_in_range, _range, Ordered,
20-
ArithmeticWraps, ArithmeticUnknown, floatrange, reverse, unitrange_last,
21-
AbstractArray, AbstractVector, Array, Vector, Matrix,
22-
axes, (:), _sub2ind_recurse, promote_eltypeof,
23-
diff, cumsum, show_delim_array, show_circular, Int,
24-
similar, _unsafe_getindex, string, zeros, ones, fill, permutedims,
25-
cat_similar, vcat, hcat, one, zero,
26-
reshape, ReshapedIndex, ind2sub_rs, _unsafe_getindex_rs,
27-
searchsorted, searchsortedfirst, searchsortedlast, Ordering, lt, Fix2, findfirst,
28-
cat_indices, cat_size, cat_similar, __cat, _ind2sub_recurse, union, intersect, IEEEFloat,
29-
collect
4+
import Base: *, +, -, /, <, ==, >, \, , , (:), @_inline_meta, @propagate_inbounds,
5+
AbstractArray, AbstractMatrix, AbstractVector, ArithmeticUnknown, ArithmeticWraps, Array, Fix2, IEEEFloat,
6+
IdentityUnitRange, Int, Matrix, OneTo, Ordered, Ordering, ReshapedIndex, Slice, Vector, __cat, _in_range,
7+
_ind2sub_recurse, _range, _sub2ind, _sub2ind_recurse, _unsafe_getindex, _unsafe_getindex_rs,
8+
angle, axes, broadcast, cat_indices,
9+
cat_similar, cat_size, checkindex, collect, convert, copy,
10+
cumsum, dataids, diff, div, eltype, fill, findfirst, first, floatrange, getindex, hcat,
11+
in, ind2sub_rs, intersect, isempty, isinf, issorted, last, length, lt, max,
12+
maximum, minimum, mod, one, ones, parent, parentindices, permutedims, print_matrix, print_matrix_row,
13+
print_matrix_vdots, promote_rule, reinterpret, reshape, reverse, searchsorted,
14+
searchsortedfirst, searchsortedlast, setindex!, show, show_circular, show_delim_array, sign,
15+
signbit, similar, size, sort, sort!, step, sum, tail,
16+
to_shape, transpose, unaliascopy, union, unitrange_last, unsafe_convert, unsafe_indices, unsafe_length,
17+
vcat, zeros
3018

3119
if VERSION < v"1.8-"
3220
import Base: _rangestyle
@@ -44,25 +32,19 @@ end
4432

4533

4634
using Base.Broadcast
47-
import Base.Broadcast: BroadcastStyle, AbstractArrayStyle, Broadcasted, broadcasted,
48-
@nexprs, @ncall, combine_eltypes, DefaultArrayStyle, instantiate, axistype
35+
import ArrayLayouts: AbstractBandedLayout, LayoutMatrix, LayoutVecOrMat, LayoutVecOrMats, LayoutVector, MemoryLayout,
36+
RangeCumsum, UnknownLayout, reshapedlayout, sub_materialize, sublayout
4937

50-
import LinearAlgebra: BlasInt, BlasFloat, norm, diag, diagm, ishermitian, issymmetric,
51-
det, logdet, istriu, istril, adjoint, tr, AbstractTriangular,
52-
norm2, norm1, normp, AdjOrTrans, HermOrSym
38+
import Base.Broadcast: BroadcastStyle, Broadcasted, DefaultArrayStyle, axistype, broadcasted
5339

54-
import FillArrays: AbstractFill, getindex_value, fill_reshape, RectDiagonal, Fill, Ones, Zeros, Eye
40+
import FillArrays: AbstractFill, Eye, Fill, Ones, RectDiagonal, Zeros, fill_reshape, getindex_value
5541

56-
import LazyArrays: LazyArrayStyle, LazyLayout,
57-
AbstractCachedVector, CachedArray, CachedVector, ApplyLayout, LazyMatrix,
58-
_padded_sub_materialize, PaddedLayout,
59-
AbstractCachedMatrix, sub_paddeddata, InvColumnLayout
42+
import Infinities: InfiniteCardinal, Infinity, ∞
6043

61-
import ArrayLayouts: RangeCumsum, LayoutVecOrMat, LayoutVecOrMats, LayoutMatrix, LayoutVector,
62-
AbstractBandedLayout, MemoryLayout, UnknownLayout, reshapedlayout,
63-
sub_materialize, sublayout, ZerosLayout, LayoutVecOrMat
44+
import LazyArrays: AbstractCachedVector, ApplyLayout, CachedArray, CachedVector, InvColumnLayout,
45+
LazyArrayStyle, LazyLayout, LazyMatrix, PaddedLayout, _padded_sub_materialize, sub_paddeddata
6446

65-
import Infinities: ∞, Infinity, InfiniteCardinal
47+
import LinearAlgebra: AdjOrTrans, HermOrSym, diag, norm, norm1, norm2, normp
6648

6749
export ∞, ℵ₀, Hcat, Vcat, Zeros, Ones, Fill, Eye, BroadcastArray, cache
6850
import Base: unitrange, oneto

0 commit comments

Comments
 (0)