status-im
/
NimYAML
mirror of https://github.com/status-im/NimYAML.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better error reporting for implicit pragma

This commit is contained in:
Felix Krause 2023-12-09 10:13:14 +01:00
parent da5d37e437
commit 4e84186f93
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yaml/native.nim
View File

@ -1434,20 +1434,20 @@ proc isImplicitVariantObject(t: typedesc): bool {.compileTime.} =
else: else:
return false return false
proc canBeImplicit(t: typedesc): bool {.compileTime.} = proc canBeImplicit(t: typedesc): string {.compileTime.} =
## returns empty string if type can be implicit, else the reason why it can't
let tDesc = getType(t) let tDesc = getType(t)
if tDesc.kind != nnkObjectTy: return false if tDesc.kind != nnkObjectTy: return "type is not an object"
if tDesc[2].len != 1: return false if tDesc[2].len != 1 or tDesc[2][0].kind != nnkRecCase:
if tDesc[2][0].kind != nnkRecCase: return false return "type doesn't exclusively contain record case"
var foundEmptyBranch = false var foundEmptyBranch = false
for i in 1.. tDesc[2][0].len - 1: for i in 1.. tDesc[2][0].len - 1:
case tDesc[2][0][i][1].recListlen # branch contents case tDesc[2][0][i][1].recListlen # branch contents
of 0: of 0:
if foundEmptyBranch: return false if foundEmptyBranch: return "record case has more than one empty branch"
else: foundEmptyBranch = true else: foundEmptyBranch = true
of 1: discard of 1: discard
else: return false else: return "record case contains more than one field"
return true
proc constructChild*[T]( proc constructChild*[T](
ctx : var ConstructionContext, ctx : var ConstructionContext,
@ -1455,8 +1455,9 @@ proc constructChild*[T](
) = ) =
let item = ctx.input.peek() let item = ctx.input.peek()
when isImplicitVariantObject(T): when isImplicitVariantObject(T):
when not canBeImplicit(T): const checkRes = canBeImplicit(T)
{. fatal: "This type cannot be marked as implicit" .} when not len(checkRes) > 0:
{. fatal: "cannot be marked as implicit: " & checkRes .}
var possibleTags = newSeq[Tag]() var possibleTags = newSeq[Tag]()
case item.kind case item.kind
of yamlScalar: of yamlScalar: