Skip to content

Commit af3fabd

Browse files
authored
Merge pull request JuliaCollections#146 from ReubenJ/master
Update `Documenter`, fix errors/warnings
2 parents e9f0ee7 + 88123fb commit af3fabd

File tree

8 files changed

+18
-14
lines changed

8 files changed

+18
-14
lines changed

.github/workflows/Documenter.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
name: Documentation
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
14+
- uses: julia-actions/cache@v2
1415
- uses: julia-actions/julia-buildpkg@latest
1516
- uses: julia-actions/julia-docdeploy@latest
1617
env:

docs/Project.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
2+
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
23
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
34

45
[compat]
5-
Documenter = "0.26"
6+
Documenter = "1.4"

docs/src/index.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Types with the `IndexedChildren` trait *must* return an indexable object from `c
8585
NodeType
8686
NodeTypeUnknown
8787
HasNodeType
88+
nodetype
8889
```
8990

9091
Providing the `HasNodeType` trait will guarantee that all nodes connected to the node must be of the
@@ -180,12 +181,18 @@ ischild
180181
isroot
181182
intree
182183
isdescendant
184+
treesize
183185
treebreadth
184186
treeheight
185187
descendleft
186188
getroot
187-
printtree
189+
print_tree
188190
printnode
191+
print_child_key
192+
TreeCharSet
193+
shouldprintkeys
194+
repr_tree
195+
repr_node
189196
```
190197

191198
## Example Implementations

docs/src/iteration.md

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ PostOrderDFS
3434
Leaves
3535
Siblings
3636
StatelessBFS
37+
MapNode
3738
treemap
3839
```
3940

@@ -56,4 +57,6 @@ instance
5657
initial
5758
next
5859
statetype
60+
ascend
61+
descend
5962
```

src/AbstractTrees.jl

-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
"""
2-
AbstractTrees
3-
4-
This package is intended to provide an abstract interface for working
5-
with tree structures.
6-
Though the package itself is not particularly sophisticated, it defines
7-
the interface that can be used by other packages to talk about trees.
8-
"""
91
module AbstractTrees
102

113
using Base: HasLength, SizeUnknown, HasEltype, EltypeUnknown

src/base.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
nodevalue(node)
44
5-
Get the value associated with a node in a tree. This removes wrappers such as [`Indexed`](@ref) or [`TreeCursor`](@ref)s.
5+
Get the value associated with a node in a tree. This removes wrappers such as [`IndexNode`](@ref) or [`TreeCursor`](@ref)s.
66
77
By default, this function is the identity.
88

src/iteration.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Obtain the next [`IteratorState`](@ref) after the current one. If `s` is the fi
3636
`nothing`.
3737
3838
This provides an alternative iteration protocol which only uses the states directly as opposed to
39-
[`Base.iterate`](@ref) which takes an iterator object and the current state as separate arguments.
39+
`Base.iterate` which takes an iterator object and the current state as separate arguments.
4040
"""
4141
function next end
4242

src/printing.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ signature `g(io::IO, key;)`.
1919
truncated nodes.
2020
* `charset::TreeCharSet` - [`TreeCharSet`](@ref) to use to print branches.
2121
* `printkeys::Union{Bool, Nothing}` - Whether to print keys of child nodes (using
22-
`pairs(children(node))`). A value of `nothing` uses [`printkeys_default`](@ref) do decide the
22+
`pairs(children(node))`). A value of `nothing` uses [`shouldprintkeys`](@ref) to decide the
2323
behavior on a node-by-node basis.
2424
* `printnode_kw = (;)` - keyword arguments to forward to `f`.
2525

0 commit comments

Comments
 (0)