diff options
Diffstat (limited to 'compiler/vmgen.nim')
| -rw-r--r-- | compiler/vmgen.nim | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index 9086b17d9..2fbb78c8f 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -1958,14 +1958,6 @@ proc matches(s: PSym; x: string): bool = for i in 1..y.len: if s == nil or (y[^i].cmpIgnoreStyle(s.name.s) != 0 and y[^i] != "*"): return false - s = s.owner - result = true - -proc matches(s: PSym; y: varargs[string]): bool = - var s = s - for i in 1..y.len: - if s == nil or (y[^i].cmpIgnoreStyle(s.name.s) != 0 and y[^i] != "*"): - return false s = if sfFromGeneric in s.flags: s.owner.owner else: s.owner result = true @@ -2024,11 +2016,11 @@ proc gen(c: PCtx; n: PNode; dest: var TDest; flags: TGenFlags = {}) = elif s.kind == skMethod: localError(c.config, n.info, "cannot call method " & s.name.s & " at compile time") - elif matches(s, "stdlib", "marshal", "to"): + elif matches(s, "stdlib.marshal.to"): # XXX marshal load&store should not be opcodes, but use the # general callback mechanisms. genMarshalLoad(c, n, dest) - elif matches(s, "stdlib", "marshal", "$$"): + elif matches(s, "stdlib.marshal.$$"): genMarshalStore(c, n, dest) else: genCall(c, n, dest) |