diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2016-02-26 14:49:07 +0100 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2016-02-26 14:49:07 +0100 |
| commit | 4b3f164368bbf93b56187633a75bce999e6514c3 (patch) | |
| tree | 176b3cd01d0e545f3c66162dde1697151828ccde /compiler | |
| parent | 696ddbd93b4c16f27d78f608bfd5eaf157d2fcf4 (diff) | |
| parent | cce64c335722bbf6bda39a9d8ca74154e0a3ad4c (diff) | |
| download | Nim-4b3f164368bbf93b56187633a75bce999e6514c3.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/installer.ini | 1 | ||||
| -rw-r--r-- | compiler/semmagic.nim | 4 | ||||
| -rw-r--r-- | compiler/semtypinst.nim | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/compiler/installer.ini b/compiler/installer.ini index 95c07e003..12d9baf82 100644 --- a/compiler/installer.ini +++ b/compiler/installer.ini @@ -104,6 +104,7 @@ Files: "lib/pure/concurrency/*.cfg" Files: "lib/impure/*.nim" Files: "lib/impure/nre/private/*.nim" Files: "lib/wrappers/*.nim" +Files: "lib/arch/*.nim" Files: "lib/wrappers/readline/*.nim" Files: "lib/wrappers/linenoise/*.nim" diff --git a/compiler/semmagic.nim b/compiler/semmagic.nim index f98ff0266..1a70e4a12 100644 --- a/compiler/semmagic.nim +++ b/compiler/semmagic.nim @@ -178,10 +178,6 @@ proc magicsAfterOverloadResolution(c: PContext, n: PNode, result.typ = n[1].typ of mDotDot: result = n - # disallow negative indexing for now: - if not c.p.bracketExpr.isNil: - if isNegative(n.sons[1]) or (n.len > 2 and isNegative(n.sons[2])): - localError(n.info, "use '^' instead of '-'; negative indexing is obsolete") of mRoof: let bracketExpr = if n.len == 3: n.sons[2] else: c.p.bracketExpr if bracketExpr.isNil: diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index 20b60a88d..a7f28feec 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -60,7 +60,7 @@ proc searchInstTypes*(key: PType): PType = if inst.id == key.id: return inst if inst.sons.len < key.sons.len: # XXX: This happens for prematurely cached - # types such as TChannel[empty]. Why? + # types such as Channel[empty]. Why? # See the notes for PActor in handleGenericInvocation return block matchType: |