From a71c5f98ea92c4c9f96ffe9265600f9cc2b7a8ee Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Tue, 18 Sep 2012 00:36:48 +0200
Subject: [PATCH] made tests green again

---
 compiler/semexprs.nim     |  2 +-
 compiler/semgnrc.nim      | 17 ++++++++++++-----
 lib/pure/algorithm.nim    |  2 +-
 lib/system.nim            |  8 ++++----
 tests/reject/tenummix.nim |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index ae9cf26d68..3c630eeec8 100755
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1427,7 +1427,7 @@ proc buildCall(n: PNode): PNode =
   elif n.kind in nkCallKinds and n.sons[0].kind == nkDotExpr:
     # x.y(a) -> y(x, a)
     let a = n.sons[0]
-    result = newNodeI(nkDotCall, n.info, n.len+1)
+    result = newNodeI(nkCall, n.info, n.len+1)
     result.sons[0] = a.sons[1]
     result.sons[1] = a.sons[0]
     for i in 1 .. <n.len: result.sons[i+1] = n.sons[i]
diff --git a/compiler/semgnrc.nim b/compiler/semgnrc.nim
index 861161accd..a330e17e72 100755
--- a/compiler/semgnrc.nim
+++ b/compiler/semgnrc.nim
@@ -19,7 +19,7 @@
 
 type
   TSemGenericFlag = enum
-    withinBind, withinTypeDesc
+    withinBind, withinTypeDesc, withinMixin
   TSemGenericFlags = set[TSemGenericFlag]
 
 proc getIdentNode(n: PNode): PNode =
@@ -80,13 +80,15 @@ proc semGenericStmt(c: PContext, n: PNode,
   of nkIdent, nkAccQuoted:
     var s = SymtabGet(c.Tab, n.ident)
     if s == nil:
-      localError(n.info, errUndeclaredIdentifier, n.ident.s)
+      if withinMixin notin flags:
+        localError(n.info, errUndeclaredIdentifier, n.ident.s)
     else:
       if withinBind in flags or s.id in toBind:
         result = symChoice(c, n, s, scClosed)
       else: result = semGenericStmtSymbol(c, n, s)
   of nkDotExpr:
-    var s = QualifiedLookUp(c, n, {checkUndeclared})
+    let luf = if withinMixin notin flags: {checkUndeclared} else: {}
+    var s = QualifiedLookUp(c, n, luf)
     if s != nil: result = semGenericStmtSymbol(c, n, s)
     # XXX for example: ``result.add`` -- ``add`` needs to be looked up here...
   of nkEmpty, nkSym..nkNilLit: 
@@ -98,7 +100,8 @@ proc semGenericStmt(c: PContext, n: PNode,
   of nkCall, nkHiddenCallConv, nkInfix, nkPrefix, nkCommand, nkCallStrLit: 
     # check if it is an expression macro:
     checkMinSonsLen(n, 1)
-    var s = qualifiedLookup(c, n.sons[0], {checkUndeclared})
+    let luf = if withinMixin notin flags: {checkUndeclared} else: {}
+    var s = qualifiedLookup(c, n.sons[0], luf)
     var first = 0
     var isDefinedMagic = false
     if s != nil: 
@@ -143,7 +146,8 @@ proc semGenericStmt(c: PContext, n: PNode,
     var a: PNode
     if isCallExpr(n.sons[0]): a = n.sons[0].sons[0]
     else: a = n.sons[0]
-    var s = qualifiedLookup(c, a, {checkUndeclared})
+    let luf = if withinMixin notin flags: {checkUndeclared} else: {}
+    var s = qualifiedLookup(c, a, luf)
     if s != nil and macroToExpand(s):
       result = semMacroStmt(c, n, {}, false)
     for i in countup(0, sonsLen(result)-1): 
@@ -151,6 +155,9 @@ proc semGenericStmt(c: PContext, n: PNode,
   of nkIfStmt: 
     for i in countup(0, sonsLen(n)-1): 
       n.sons[i] = semGenericStmtScope(c, n.sons[i], flags, toBind)
+  of nkWhenStmt:
+    for i in countup(0, sonsLen(n)-1):
+      n.sons[i] = semGenericStmt(c, n.sons[i], flags+{withinMixin}, toBind)
   of nkWhileStmt: 
     openScope(c.tab)
     for i in countup(0, sonsLen(n)-1): 
diff --git a/lib/pure/algorithm.nim b/lib/pure/algorithm.nim
index 03eb7da393..8b44e69d9b 100755
--- a/lib/pure/algorithm.nim
+++ b/lib/pure/algorithm.nim
@@ -41,7 +41,7 @@ proc binarySearch*[T](a: openarray[T], key: T): int =
     var mid = (result + b) div 2
     if a[mid] < key: result = mid + 1
     else: b = mid
-  if result >= len(x) or a[result] != key: result = -1
+  if result >= len(a) or a[result] != key: result = -1
 
 proc smartBinarySearch*[T](a: openArray[T], key: T): int =
   ## ``a.len`` must be a power of 2 for this to work.
diff --git a/lib/system.nim b/lib/system.nim
index a60433e57c..575c6abc77 100755
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1673,6 +1673,10 @@ template newException*(exceptn: typeDesc, message: string): expr =
   e.msg = message
   e
 
+proc getTypeInfo*[T](x: T): pointer {.magic: "GetTypeInfo".}
+  ## get type information for `x`. Ordinary code should not use this, but
+  ## the `typeinfo` module instead.
+
 when not defined(EcmaScript) and not defined(NimrodVM):
   {.push stack_trace: off, profiler:off.}
 
@@ -2201,10 +2205,6 @@ proc `[]=`*[T](s: var seq[T], x: TSlice[int], b: openArray[T]) =
     for i in 0 .. <L: s[i+a] = b[i]
   else:
     spliceImpl(s, a, L, b)
-
-proc getTypeInfo*[T](x: T): pointer {.magic: "GetTypeInfo".}
-  ## get type information for `x`. Ordinary code should not use this, but
-  ## the `typeinfo` module instead.
   
 proc slurp*(filename: string): string {.magic: "Slurp".}
 proc staticRead*(filename: string): string {.magic: "Slurp".}
diff --git a/tests/reject/tenummix.nim b/tests/reject/tenummix.nim
index 53be02ffaf..55c0c05a95 100644
--- a/tests/reject/tenummix.nim
+++ b/tests/reject/tenummix.nim
@@ -1,6 +1,6 @@
 discard """
   file: "system.nim"
-  line: 646
+  line: 643
   errormsg: "type mismatch"
 """