Skip to content

fix error when atomicArc shallowCopy is not defined #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flyx merged 2 commits into from
Nov 23, 2025
Merged

fix error when atomicArc shallowCopy is not defined #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80efbe1
fix error when atomicArc shallowCopy is not defined
YesDrX Nov 4, 2025
3bc304d
use when compiles to check if shallowCopy is defined (arc/orc/atomicArc)
YesDrX Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions yaml/dom.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,11 @@ proc constructChild*(
c.refs[target] = (tag: yamlTag(YamlNode), p: cast[pointer](result))

var start: Event
when defined(gcArc) or defined(gcOrc):
start = ctx.input.next()
else:
# instead of checking whether gcArc, gcOrc, or gcAtomicArc are defined, we use compiles to make it future proof. note that shallowCopy is only defined when for mm:arc/orc/atomicArc
when compiles(shallowCopy(start, ctx.input.next())):
shallowCopy(start, ctx.input.next())
else:
start = ctx.input.next()

case start.kind
of yamlStartMap:
Expand Down Expand Up @@ -213,10 +214,10 @@ proc constructChild*(
endPos: start.endPos,
)
ctx.addAnchor(start.scalarProperties.anchor)
when defined(gcArc) or defined(gcOrc):
result.content = move start.scalarContent
else:
when compiles(shallowCopy(result.content, start.scalarContent)):
shallowCopy(result.content, start.scalarContent)
else:
result.content = move start.scalarContent
of yamlAlias:
result = cast[YamlNode](ctx.refs.getOrDefault(start.aliasTarget).p)
else: internalError("Malformed YamlStream")
Expand Down
6 changes: 3 additions & 3 deletions yaml/tojson.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ proc jsonFromScalar(
result = JsonNode(kind: JNull)
else:
result = JsonNode(kind: JString)
when defined(gcArc) or defined(gcOrc):
result.str = content
else:
when compiles(shallowCopy(result.str, content)): # instead of checking whether gcArc, gcOrc, or gcAtomicArc are defined, we use compiles to make it future proof. note that shallowCopy is only defined when for mm:arc/orc/atomicArc
shallowCopy(result.str, content)
else:
result.str = content
except ValueError as ve:
var e = newException(YamlConstructionError, "Cannot parse numeric value")
e.parent = ve
Expand Down