mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 17:04:41 +00:00
fixes #3669
This commit is contained in:
@@ -203,14 +203,14 @@ proc replaceTypeVarsS(cl: var TReplTypeVars, s: PSym): PSym =
|
||||
# symbol is not our business:
|
||||
if cl.owner != nil and s.owner != cl.owner:
|
||||
return s
|
||||
result = PSym(idTableGet(cl.symMap, s))
|
||||
if result == nil:
|
||||
result = copySym(s, false)
|
||||
incl(result.flags, sfFromGeneric)
|
||||
idTablePut(cl.symMap, s, result)
|
||||
result.owner = s.owner
|
||||
result.typ = replaceTypeVarsT(cl, s.typ)
|
||||
result.ast = replaceTypeVarsN(cl, s.ast)
|
||||
#result = PSym(idTableGet(cl.symMap, s))
|
||||
#if result == nil:
|
||||
result = copySym(s, false)
|
||||
incl(result.flags, sfFromGeneric)
|
||||
#idTablePut(cl.symMap, s, result)
|
||||
result.owner = s.owner
|
||||
result.typ = replaceTypeVarsT(cl, s.typ)
|
||||
result.ast = replaceTypeVarsN(cl, s.ast)
|
||||
|
||||
proc lookupTypeVar(cl: var TReplTypeVars, t: PType): PType =
|
||||
result = PType(idTableGet(cl.typeMap, t))
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
#
|
||||
#
|
||||
# Nim's Runtime Library
|
||||
# (c) Copyright 2015 Andreas Rumpf
|
||||
#
|
||||
# See the file "copying.txt", included in this
|
||||
# distribution, for details about the copyright.
|
||||
#
|
||||
|
||||
## PHP compatibility layer.
|
||||
|
||||
type
|
||||
PhpArray*[Key, Val] = ref object
|
||||
|
||||
PhpObj* = ref object ## can be a string, an int etc.
|
||||
|
||||
proc explode*(sep, x: string): seq[string] {.importc: "explode".}
|
||||
template split*(x, sep: string): seq[string] = explode(sep, x)
|
||||
|
||||
proc `$`*(x: PhpObj): string {.importcpp: "(#)".}
|
||||
proc `++`*(x: PhpObj) {.importcpp: "++(#)".}
|
||||
|
||||
proc `==`*(x, y: PhpObj): string {.importcpp: "((#) == (#))".}
|
||||
proc `<=`*(x, y: PhpObj): string {.importcpp: "((#) <= (#))".}
|
||||
proc `<`*(x, y: PhpObj): string {.importcpp: "((#) < (#))".}
|
||||
|
||||
proc toUpper*(x: string): string {.importc: "strtoupper".}
|
||||
proc toLower*(x: string): string {.importc: "strtolower".}
|
||||
|
||||
proc strtr*(s: string, replacePairs: PhpArray[string, string]): string {.importc.}
|
||||
proc strtr*(s, fromm, to: string): string {.importc.}
|
||||
|
||||
proc toArray*[K,V](pairs: openarray[(K,V)]): PhpArray[K,V] {.magic:
|
||||
"Array".}
|
||||
template strtr*(s: string, replacePairs: openarray[(string, string)]): string =
|
||||
strtr(toArray(replacePairs))
|
||||
|
||||
iterator pairs*[K,V](d: PhpArray[K,V]): (K,V) =
|
||||
var k: K
|
||||
var v: V
|
||||
{.emit: "foreach (`d` as `k`=>`v`) {".}
|
||||
yield (k, v)
|
||||
{.emit: "}".}
|
||||
|
||||
proc `[]`*[K,V](d: PhpArray[K,V]; k: K): V {.importcpp: "#[#]".}
|
||||
proc `[]=`*[K,V](d: PhpArray[K,V]; k: K; v: V) {.importcpp: "#[#] = #".}
|
||||
|
||||
proc ksort*[K,V](d: PhpArray[K,V]) {.importc.}
|
||||
proc krsort*[K,V](d: PhpArray[K,V]) {.importc.}
|
||||
proc keys*[K,V](d: PhpArray[K,V]): seq[K] {.importc.}
|
||||
13
tests/generics/t2tables.nim
Normal file
13
tests/generics/t2tables.nim
Normal file
@@ -0,0 +1,13 @@
|
||||
|
||||
# bug #3669
|
||||
|
||||
import tables
|
||||
|
||||
type
|
||||
G[T] = object
|
||||
inodes: Table[int, T]
|
||||
rnodes: Table[T, int]
|
||||
|
||||
var g: G[string]
|
||||
echo g.rnodes["foo"]
|
||||
|
||||
Reference in New Issue
Block a user