Skip to content

Commit fc7e53b

Browse files
committed
wip
1 parent 8100949 commit fc7e53b

2 files changed

Lines changed: 194 additions & 137 deletions

File tree

confutils.nim

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,6 @@ proc fullFieldName(cf: ConfFieldDesc): string =
717717

718718
proc fieldCaseFieldFullName(cf: ConfFieldDesc): string =
719719
if cf.field.caseField != nil:
720-
# return to workaround Nim 1.6 bug
721720
if cf.parent != nil:
722721
fullFieldName(cf.parent[]) & "Dot" & $cf.field.caseField.getFieldName
723722
else:
@@ -902,9 +901,9 @@ proc cmdInfoFromType(T: NimNode): CmdInfo =
902901
if caseField != nil and caseBranch != nil:
903902
let fieldName = cf.fieldCaseFieldFullName()
904903
var discriminator: OptInfo
905-
for (fname, fopt) in discriminatorFields:
906-
if fieldName == fname:
907-
discriminator = fopt
904+
for (name, opt) in discriminatorFields:
905+
if fieldName == name:
906+
discriminator = opt
908907

909908
if discriminator == nil:
910909
error "Unable to find " & $caseField.getFieldName

0 commit comments

Comments
 (0)