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

Merge pull request #2892 from apense/patch-6

Browse source 
Fixes #2886 (moves compiler function into the compiler)
This commit is contained in:
Andreas Rumpf 2015-06-10 10:55:31 +02:00
commit cb439d70bc
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/ast.nim
View file

@ -948,6 +948,9 @@ proc add*(father, son: PNode) =
proc `[]`*(n: PNode, i: int): PNode {.inline.} = proc `[]`*(n: PNode, i: int): PNode {.inline.} =
result = n.sons[i] result = n.sons[i]
template `-|`*(b, s: expr): expr =
(if b >= 0: b else: s.len + b)
# son access operators with support for negative indices # son access operators with support for negative indices
template `{}`*(n: PNode, i: int): expr = n[i -| n] template `{}`*(n: PNode, i: int): expr = n[i -| n]
template `{}=`*(n: PNode, i: int, s: PNode): stmt = template `{}=`*(n: PNode, i: int, s: PNode): stmt =

3
lib/system.nim
View file

@ -2859,9 +2859,6 @@ proc `/`*(x, y: int): float {.inline, noSideEffect.} =
## integer division that results in a float. ## integer division that results in a float.
result = toFloat(x) / toFloat(y) result = toFloat(x) / toFloat(y)
template `-|`*(b, s: expr): expr =
(if b >= 0: b else: s.len + b)
template spliceImpl(s, a, L, b: expr): stmt {.immediate.} = template spliceImpl(s, a, L, b: expr): stmt {.immediate.} =
# make room for additional elements or cut: # make room for additional elements or cut:
var slen = s.len var slen = s.len