LukeParke/libopenapi
1
0
Fork 0
mirror of https://github.com/LukeHagar/libopenapi.git synced 2025-12-09 20:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update to use iterators on orderedmaps

Browse Source
This commit is contained in:
Tristan Cartledge
2024-08-14 12:10:07 +01:00
committed by quobix
parent c3eb16d4e4
commit 161a41f73b
73 changed files with 690 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
datamodel/high/node_builder.go
View File

@@ -78,18 +78,18 @@ func (n *NodeBuilder) add(key string, i int) {
j := 0
if lowExtensions != nil {
// If we have low extensions get the original lowest line number so we end up in the same place
for pair := orderedmap.First(lowExtensions); pair != nil; pair = pair.Next() {
if j == 0 || pair.Key().KeyNode.Line < j {
j = pair.Key().KeyNode.Line
for ext := range lowExtensions.KeysFromOldest() {
if j == 0 || ext.KeyNode.Line < j {
j = ext.KeyNode.Line
}
}
}
for pair := orderedmap.First(extensions); pair != nil; pair = pair.Next() {
nodeEntry := &nodes.NodeEntry{Tag: pair.Key(), Key: pair.Key(), Value: pair.Value(), Line: j}
for ext, node := range extensions.FromOldest() {
nodeEntry := &nodes.NodeEntry{Tag: ext, Key: ext, Value: node, Line: j}
if lowExtensions != nil {
lowItem := low.FindItemInOrderedMap(pair.Key(), lowExtensions)
lowItem := low.FindItemInOrderedMap(ext, lowExtensions)
nodeEntry.LowValue = lowItem
}
n.Nodes = append(n.Nodes, nodeEntry)