jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed sets of strings to IntSets

Browse source
This commit is contained in:
yglukhov 2015-06-18 15:09:43 +03:00
commit 85d5c86efa
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
compiler/jsgen.nim
View file

@ -33,7 +33,7 @@ import
ast, astalgo, strutils, hashes, trees, platform, magicsys, extccomp, options, ast, astalgo, strutils, hashes, trees, platform, magicsys, extccomp, options,
nversion, nimsets, msgs, securehash, bitsets, idents, lists, types, os, nversion, nimsets, msgs, securehash, bitsets, idents, lists, types, os,
times, ropes, math, passes, ccgutils, wordrecg, renderer, rodread, rodutils, times, ropes, math, passes, ccgutils, wordrecg, renderer, rodread, rodutils,
intsets, cgmeth, lowerings, sets intsets, cgmeth, lowerings
type type
TTarget = enum TTarget = enum
@ -1098,32 +1098,30 @@ proc putToSeq(s: string, indirect: bool): Rope =
if indirect: result = "[$1]" % [result] if indirect: result = "[$1]" % [result]
proc createVar(p: PProc, typ: PType, indirect: bool): Rope proc createVar(p: PProc, typ: PType, indirect: bool): Rope
proc createRecordVarAux(p: PProc, rec: PNode, excludeMembers: HashSet[string], output: var Rope) = proc createRecordVarAux(p: PProc, rec: PNode, excludedFieldIDs: IntSet, output: var Rope) =
case rec.kind case rec.kind
of nkRecList: of nkRecList:
for i in countup(0, sonsLen(rec) - 1): for i in countup(0, sonsLen(rec) - 1):
createRecordVarAux(p, rec.sons[i], excludeMembers, output) createRecordVarAux(p, rec.sons[i], excludedFieldIDs, output)
of nkRecCase: of nkRecCase:
createRecordVarAux(p, rec.sons[0], excludeMembers, output) createRecordVarAux(p, rec.sons[0], excludedFieldIDs, output)
for i in countup(1, sonsLen(rec) - 1): for i in countup(1, sonsLen(rec) - 1):
createRecordVarAux(p, lastSon(rec.sons[i]), excludeMembers, output) createRecordVarAux(p, lastSon(rec.sons[i]), excludedFieldIDs, output)
of nkSym: of nkSym:
let name = $mangleName(rec.sym) if rec.sym.id notin excludedFieldIDs:
if not (name in excludeMembers):
if output.len > 0: output.add(", ") if output.len > 0: output.add(", ")
output.add(name) output.add(mangleName(rec.sym))
output.add(": ") output.add(": ")
output.add(createVar(p, rec.sym.typ, false)) output.add(createVar(p, rec.sym.typ, false))
else: internalError(rec.info, "createRecordVarAux") else: internalError(rec.info, "createRecordVarAux")
proc createObjInitList(p: PProc, typ: PType, excludeMembers: HashSet[string], output: var Rope) = proc createObjInitList(p: PProc, typ: PType, excludedFieldIDs: IntSet, output: var Rope) =
var t = typ var t = typ
if tfFinal notin t.flags or t.sons[0] != nil: if tfFinal notin t.flags or t.sons[0] != nil:
if not ("m_type" in excludeMembers): if output.len > 0: output.add(", ")
if output.len > 0: output.add(", ") addf(output, "m_type: $1" | "m_type = $#", [genTypeInfo(p, t)])
addf(output, "m_type: $1" | "m_type = $#", [genTypeInfo(p, t)])
while t != nil: while t != nil:
createRecordVarAux(p, t.n, excludeMembers, output) createRecordVarAux(p, t.n, excludedFieldIDs, output)
t = t.sons[0] t = t.sons[0]
proc createVar(p: PProc, typ: PType, indirect: bool): Rope = proc createVar(p: PProc, typ: PType, indirect: bool): Rope =
@ -1166,9 +1164,8 @@ proc createVar(p: PProc, typ: PType, indirect: bool): Rope =
add(result, "}") add(result, "}")
if indirect: result = "[$1]" % [result] if indirect: result = "[$1]" % [result]
of tyObject: of tyObject:
var emptySet = initSet[string](2)
var initList : Rope var initList : Rope
createObjInitList(p, t, emptySet, initList) createObjInitList(p, t, initIntSet(), initList)
result = "{$1}" % [initList] result = "{$1}" % [initList]
if indirect: result = "[$1]" % [result] if indirect: result = "[$1]" % [result]
of tyVar, tyPtr, tyRef: of tyVar, tyPtr, tyRef:
@ -1442,7 +1439,7 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
var a: TCompRes var a: TCompRes
r.res = rope("{") r.res = rope("{")
r.kind = resExpr r.kind = resExpr
var fieldNames = initSet[string]() var fieldIDs = initIntSet()
for i in countup(1, sonsLen(n) - 1): for i in countup(1, sonsLen(n) - 1):
if i > 1: add(r.res, ", ") if i > 1: add(r.res, ", ")
var it = n.sons[i] var it = n.sons[i]
@ -1450,10 +1447,10 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
gen(p, it.sons[1], a) gen(p, it.sons[1], a)
var f = it.sons[0].sym var f = it.sons[0].sym
if f.loc.r == nil: f.loc.r = mangleName(f) if f.loc.r == nil: f.loc.r = mangleName(f)
fieldNames.incl($f.loc.r) fieldIDs.incl(f.id)
addf(r.res, "$#: $#" | "$# = $#" , [f.loc.r, a.res]) addf(r.res, "$#: $#" | "$# = $#" , [f.loc.r, a.res])
let t = skipTypes(n.typ, abstractInst + skipPtrs) let t = skipTypes(n.typ, abstractInst + skipPtrs)
createObjInitList(p, t, fieldNames, r.res) createObjInitList(p, t, fieldIDs, r.res)
r.res.add("}") r.res.add("}")
proc genConv(p: PProc, n: PNode, r: var TCompRes) = proc genConv(p: PProc, n: PNode, r: var TCompRes) =