yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2025-03-27 09:35:27 -04:00
commit eb45b79fd0
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * 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 * @return the set of spans
*/ */
Set<S> spans(); NavigableSet<S> spans();
/** /**
* Get the values in this map * 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 * @return the iterable
*/ */
Iterable<S> spans(); NavigableSet<S> spans();
/** /**
* Get a span which encloses all spans in the set * 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 @Override
public Set<S> spans() { public NavigableSet<S> spans() {
// TODO: Make this a view? // 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 @Override
@ -1027,7 +1030,7 @@ public interface Span<N, S extends Span<N, S>> extends Comparable<S> {
} }
@Override @Override
public Iterable<S> spans() { public NavigableSet<S> spans() {
return map.spans(); return map.spans();
} }