Skip to content

keep order of provided object constructor fields in sem #1058

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

keep order of provided object constructor fields in sem #1058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7a8824
test not reordering already given object constructor fields
metagn May 2, 2025
69192d5
remove test
metagn May 2, 2025
d8dd396
Merge branch 'master' of https://github.com/nim-lang/nif into reorder…
metagn May 2, 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
22 changes: 11 additions & 11 deletions src/nimony/sem.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5217,12 +5217,10 @@ proc callDefault(c: var SemContext; typ: Cursor; info: PackedLineInfo) =
semCall c, it, {}

proc buildObjConstrField(c: var SemContext; field: Local;
setFields: Table[SymId, Cursor]; info: PackedLineInfo;
setFields: OrderedTable[SymId, Cursor]; info: PackedLineInfo;
bindings: Table[SymId, Cursor]; depth: int) =
let fieldSym = field.name.symId
if fieldSym in setFields:
c.dest.addSubtree setFields[fieldSym]
else:
if fieldSym notin setFields:
c.dest.addParLe(KvU, info)
c.dest.add symToken(fieldSym, info)
var typ = field.typ
Expand All @@ -5236,7 +5234,7 @@ proc buildObjConstrField(c: var SemContext; field: Local;
c.dest.addIntLit(depth, info)
c.dest.addParRi()

proc fieldsPresentInInitExpr(c: var SemContext; n: Cursor; setFields: Table[SymId, Cursor]): bool =
proc fieldsPresentInInitExpr(c: var SemContext; n: Cursor; setFields: OrderedTable[SymId, Cursor]): bool =
var n = n
inc n
result = false
Expand All @@ -5249,7 +5247,7 @@ proc fieldsPresentInInitExpr(c: var SemContext; n: Cursor; setFields: Table[SymI
break

proc fieldsPresentInBranch(c: var SemContext; n: var Cursor;
setFields: Table[SymId, Cursor]; info: PackedLineInfo;
setFields: OrderedTable[SymId, Cursor]; info: PackedLineInfo;
bindings: Table[SymId, Cursor]; depth: int) =
var branches = 0
block matched:
Expand Down Expand Up @@ -5287,7 +5285,7 @@ proc fieldsPresentInBranch(c: var SemContext; n: var Cursor;
error "illformed AST inside case object: ", n

proc buildObjConstrFields(c: var SemContext; n: var Cursor;
setFields: Table[SymId, Cursor]; info: PackedLineInfo;
setFields: OrderedTable[SymId, Cursor]; info: PackedLineInfo;
bindings: Table[SymId, Cursor]; depth = 0) =
# XXX for now counts each case object field as separate
var iter = initObjFieldIter()
Expand All @@ -5306,7 +5304,7 @@ proc buildObjConstrFields(c: var SemContext; n: var Cursor;
buildObjConstrField(c, field, setFields, info, bindings, depth)

proc buildDefaultObjConstr(c: var SemContext; typ: Cursor;
setFields: Table[SymId, Cursor]; info: PackedLineInfo;
setFields: OrderedTable[SymId, Cursor]; info: PackedLineInfo;
prebuiltBindings = initTable[SymId, Cursor]()) =
var constrKind = NoExpr
var objImpl = typ
Expand All @@ -5330,6 +5328,8 @@ proc buildDefaultObjConstr(c: var SemContext; typ: Cursor;
return
c.dest.addParLe(constrKind, info)
c.dest.addSubtree typ
for _, setField in setFields:
c.dest.addSubtree setField
var obj = asObjectDecl(objImpl)
# bindings for invoked object type to get proper types for fields:
var bindings = prebuiltBindings
Expand Down Expand Up @@ -5404,7 +5404,7 @@ proc semObjConstr(c: var SemContext, it: var Item) =
# build bindings for invoked object type to get proper types for fields:
let bindings = bindInvokeArgs(decl, invokeArgs)
var fieldBuf = createTokenBuf(16)
var setFieldPositions = initTable[SymId, int]()
var setFieldPositions = initOrderedTable[SymId, int]() # order is important
while it.n.kind != ParRi:
if it.n.substructureKind != KvU:
c.buildErr it.n.info, "expected key/value pair in object constructor"
Expand Down Expand Up @@ -5466,7 +5466,7 @@ proc semObjConstr(c: var SemContext, it: var Item) =
fieldBuf.addParRi()
skipParRi it.n
skipParRi it.n
var setFields = initTable[SymId, Cursor]()
var setFields = initOrderedTable[SymId, Cursor]() # order is important
for field, pos in setFieldPositions:
setFields[field] = cursorAt(fieldBuf, pos)
buildDefaultObjConstr(c, it.typ, setFields, info, bindings)
Expand All @@ -5480,7 +5480,7 @@ proc semObjDefault(c: var SemContext; it: var Item) =
it.typ = semLocalType(c, it.n)
c.dest.shrink exprStart
skipParRi it.n
buildDefaultObjConstr(c, it.typ, initTable[SymId, Cursor](), info)
buildDefaultObjConstr(c, it.typ, default(OrderedTable[SymId, Cursor]), info)
commonType c, it, exprStart, expected

proc semNewref(c: var SemContext; it: var Item) =
Expand Down