mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-11 22:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2323. Fixes #2148.

Browse Source
This commit is contained in:
Dominik Picheta
2015-03-15 22:06:26 +00:00
parent faad6ed67f
commit 1e9ab3bb0a
3 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/jsgen.nim
View File

@@ -961,18 +961,18 @@ proc genAddr(p: PProc, n: PNode, r: var TCompRes) =
of nkCheckedFieldExpr:
genCheckedFieldAddr(p, n, r)
of nkDotExpr:
genFieldAddr(p, n, r)
genFieldAddr(p, n.sons[0], r)
of nkBracketExpr:
var ty = skipTypes(n.sons[0].typ, abstractVarRange)
if ty.kind in {tyRef, tyPtr}: ty = skipTypes(ty.lastSon, abstractVarRange)
case ty.kind
of tyArray, tyArrayConstr, tyOpenArray, tySequence, tyString, tyCString,
tyVarargs:
genArrayAddr(p, n, r)
tyVarargs, tyChar:
genArrayAddr(p, n.sons[0], r)
of tyTuple:
genFieldAddr(p, n, r)
else: internalError(n.info, "expr(nkBracketExpr, " & $ty.kind & ')')
else: internalError(n.info, "genAddr")
genFieldAddr(p, n.sons[0], r)
else: internalError(n.sons[0].info, "expr(nkBracketExpr, " & $ty.kind & ')')
else: internalError(n.sons[0].info, "genAddr")
proc genSym(p: PProc, n: PNode, r: var TCompRes) =
var s = n.sym

18
lib/system/jssys.nim
View File

@@ -322,10 +322,10 @@ when defined(kwin):
}
print(buf);
"""
elif defined(nodejs):
proc ewriteln(x: cstring) = log(x)
proc rawEcho {.compilerproc, asmNoStackFrame.} =
asm """
var buf = "";
@@ -339,12 +339,12 @@ else:
var
document {.importc, nodecl.}: ref TDocument
proc ewriteln(x: cstring) =
proc ewriteln(x: cstring) =
var node = document.getElementsByTagName("body")[0]
if node != nil:
if node != nil:
node.appendChild(document.createTextNode(x))
node.appendChild(document.createElement("br"))
else:
else:
raise newException(ValueError, "<body> element does not exist yet!")
proc rawEcho {.compilerproc.} =
@@ -563,7 +563,11 @@ proc nimCopy(x: pointer, ti: PNimType): pointer =
}
"""
of tyString:
asm "`result` = `x`.slice(0);"
asm """
if (`x` !== null) {
`result` = `x`.slice(0);
}
"""
else:
result = x
@@ -679,7 +683,7 @@ proc nimParseBiggestFloat(s: string, number: var BiggestFloat, start = 0): int {
if s[i] == 'I' or s[i] == 'i':
if s[i+1] == 'N' or s[i+1] == 'n':
if s[i+2] == 'F' or s[i+2] == 'f':
if s[i+3] notin IdentChars:
if s[i+3] notin IdentChars:
number = Inf*sign
return i+3 - start
return 0

36
tests/js/taddr.nim Normal file
View File

@@ -0,0 +1,36 @@
type T = object
x: int
s: string
var obj: T
var fieldAddr = addr(obj.x)
var objAddr = addr(obj)
# Integer tests
var field = fieldAddr[]
doAssert field == 0
var objDeref = objAddr[]
doAssert objDeref.x == 0
# Change value
obj.x = 42
doAssert field == 0
doAssert objDeref.x == 0
field = fieldAddr[]
objDeref = objAddr[]
doAssert field == 42
doAssert objDeref.x == 42
# String tests
obj.s = "lorem ipsum dolor sit amet"
var indexAddr = addr(obj.s[2])
doAssert indexAddr[] == '4'
indexAddr[] = 'd'
doAssert indexAddr[] == 'd'