mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5522_Dan_orderLifeSetSpans' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2025-03-27 09:31:43 -04:00
parent a5caa4886d 97e6205802
commit fe9acef391
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Ghidra/Framework/Emulation/src/main/java/generic/Span.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -411,7 +411,7 @@ public interface Span<N, S extends Span<N, S>> extends Comparable<S> {
*
* @return the set of spans
*/
Set<S> spans();
NavigableSet<S> spans();
/**
* Get the values in this map
@@ -563,7 +563,7 @@ public interface Span<N, S extends Span<N, S>> extends Comparable<S> {
*
* @return the iterable
*/
Iterable<S> spans();
NavigableSet<S> spans();
/**
* Get a span which encloses all spans in the set
@@ -862,9 +862,12 @@ public interface Span<N, S extends Span<N, S>> extends Comparable<S> {
}
@Override
public Set<S> spans() {
public NavigableSet<S> spans() {
// TODO: Make this a view?
return spanTree.values().stream().map(e -> e.getKey()).collect(Collectors.toSet());
return spanTree.values()
.stream()
.map(e -> e.getKey())
.collect(Collectors.toCollection(TreeSet::new));
}
@Override
@@ -1027,7 +1030,7 @@ public interface Span<N, S extends Span<N, S>> extends Comparable<S> {
}
@Override
public Iterable<S> spans() {
public NavigableSet<S> spans() {
return map.spans();
}