Merge branch 'master' of github.com:Araq/Nimrod

compiler/sigmatch.nim

@@ -374,19 +374,18 @@ proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation =
     # tyArrayConstr cannot happen really, but
     # we wanna be safe here
     case a.kind
-    of tyArray: 
+    of tyArray, tyArrayConstr:
-      result = minRel(typeRel(c, f.sons[0], a.sons[0]), 
+      var fRange = f.sons[0]
-                      typeRel(c, f.sons[1], a.sons[1]))
+      if fRange.kind == tyGenericParam:
-      if result < isGeneric: result = isNone
+        var prev = PType(idTableGet(c.bindings, fRange))
-    of tyArrayConstr: 
+        if prev == nil:
-      result = typeRel(c, f.sons[1], a.sons[1])
+          put(c.bindings, fRange, a.sons[0])
-      if result < isGeneric: 
+          fRange = a
-        result = isNone
         else:
-        if (result != isGeneric) and (lengthOrd(f) != lengthOrd(a)): 
+          fRange = prev
-          result = isNone
+      result = typeRel(c, f.sons[1], a.sons[1])
-        elif f.sons[0].kind in GenericTypes: 
+      if result < isGeneric: result = isNone
-          result = minRel(result, typeRel(c, f.sons[0], a.sons[0]))
+      elif lengthOrd(fRange) != lengthOrd(a): result = isNone
     else: nil
   of tyOpenArray, tyVarargs:
     case a.Kind

lib/pure/asyncio.nim

@@ -119,6 +119,8 @@ type
 
     handleAccept*: proc (s:  PAsyncSocket) {.closure.}
 
+    handleTask*: proc (s: PAsyncSocket) {.closure.}
+
     lineBuffer: TaintedString ## Temporary storage for ``recvLine``
     sslNeedAccept: bool
     proto: TProtocol
@@ -145,6 +147,7 @@ proc newAsyncSocket(): PAsyncSocket =
   result.handleRead = (proc (s: PAsyncSocket) = nil)
   result.handleConnect = (proc (s: PAsyncSocket) = nil)
   result.handleAccept = (proc (s: PAsyncSocket) = nil)
+  result.handleTask = (proc (s: PAsyncSocket) = nil)
 
   result.lineBuffer = "".TaintedString
 
@@ -196,6 +199,13 @@ when defined(ssl):
         # handshake will set socket's ``sslNoHandshake`` field.
         discard PAsyncSocket(h).socket.handshake()
         
+
+proc asyncSockTask(h: PObject) =
+  when defined(ssl):
+    h.asyncSockDoHandshake()
+
+  PAsyncSocket(h).handleTask(PAsyncSocket(h))
+
 proc toDelegate(sock: PAsyncSocket): PDelegate =
   result = newDelegate()
   result.deleVal = sock
@@ -204,6 +214,7 @@ proc toDelegate(sock: PAsyncSocket): PDelegate =
   result.mode = fmReadWrite
   result.handleRead = asyncSockHandleRead
   result.handleWrite = asyncSockHandleWrite
+  result.task = asyncSockTask
   # TODO: Errors?
   #result.handleError = (proc (h: PObject) = assert(false))
 
@@ -217,9 +228,6 @@ proc toDelegate(sock: PAsyncSocket): PDelegate =
   else:
     sock.deleg.open = false
 
-  when defined(ssl):
-    result.task = asyncSockDoHandshake
-
 proc connect*(sock: PAsyncSocket, name: string, port = TPort(0),
                    af: TDomain = AF_INET) =
   ## Begins connecting ``sock`` to ``name``:``port``.
@@ -257,6 +265,7 @@ proc acceptAddr*(server: PAsyncSocket, client: var PAsyncSocket,
   ##
   ## **Note**: ``client`` needs to be initialised.
   assert(client != nil)
+  client = newAsyncSocket()
   var c: TSocket
   new(c)
   when defined(ssl):

lib/pure/irc.nim

@@ -44,10 +44,8 @@ type
 
   PAsyncIRC* = ref TAsyncIRC
   TAsyncIRC* = object of TIRC
-    userArg: PObject
+    handleEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent) {.closure.}
-    handleEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent, 
+    asyncSock: PAsyncSocket
-                       userArg: PObject) {.nimcall.}
-    lineBuffer: TaintedString
 
   TIRCMType* = enum
     MUnknown,
@@ -320,12 +318,16 @@ proc connect*(irc: PAsyncIRC) =
   assert(irc.address != "")
   assert(irc.port != TPort(0))
   
-  irc.sock = socket()
+  irc.asyncSock = AsyncSocket()
-  irc.sock.setBlocking(false)
+  irc.asyncSock.connect(irc.address, irc.port)
-  irc.sock.connectAsync(irc.address, irc.port)
-  irc.status = SockConnecting
 
-proc handleConnect(h: PObject) =
+proc handleConnect(s: PAsyncSocket, irc: PAsyncIRC) =  
+  # Greet the server :)
+  if irc.serverPass != "": irc[].send("PASS " & irc.serverPass, true)
+  irc[].send("NICK " & irc.nick, true)
+  irc[].send("USER $1 * 0 :$2" % [irc.user, irc.realname], true)
+
+discard """proc handleConnect(h: PObject) =
   var irc = PAsyncIRC(h)
   
   # Greet the server :)
@@ -334,8 +336,22 @@ proc handleConnect(h: PObject) =
   irc[].send("USER $1 * 0 :$2" % [irc.user, irc.realname], true)
 
   irc.status = SockConnected
+"""
 
-proc handleRead(h: PObject) =
+proc handleRead(s: PAsyncSocket, irc: PAsyncIRC) =
+  var line = "".TaintedString
+  var ret = s.recvLine(line)
+  if ret:
+    if line == "":
+      var ev: TIRCEvent
+      irc[].close()
+      ev.typ = EvDisconnected
+      irc.handleEvent(irc[], ev)
+    else:
+      var ev = irc[].processLine(line.string)
+      irc.handleEvent(irc[], ev)
+
+discard """proc handleRead(h: PObject) =
   var irc = PAsyncIRC(h)
   var line = "".TaintedString
   var ret = irc.sock.recvLineAsync(line)
@@ -352,13 +368,18 @@ proc handleRead(h: PObject) =
     irc[].close()
     ev.typ = EvDisconnected
     irc.handleEvent(irc[], ev, irc.userArg)
-  of RecvFail: nil
+  of RecvFail: nil"""
   
-proc handleTask(h: PObject) =
+proc handleTask(s: PAsyncSocket, irc: PAsyncIRC) =
+  var ev: TIRCEvent
+  if irc[].processOther(ev):
+    irc.handleEvent(irc[], ev)
+  
+discard """proc handleTask(h: PObject) =
   var irc = PAsyncIRC(h)
   var ev: TIRCEvent
   if PAsyncIRC(h)[].processOther(ev):
-    irc.handleEvent(irc[], ev, irc.userArg)
+    irc.handleEvent(irc[], ev, irc.userArg)"""
 
 proc asyncIRC*(address: string, port: TPort = 6667.TPort,
               nick = "NimrodBot",
@@ -366,9 +387,8 @@ proc asyncIRC*(address: string, port: TPort = 6667.TPort,
               realname = "NimrodBot", serverPass = "",
               joinChans: seq[string] = @[],
               msgLimit: bool = true,
-              ircEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent,
+              ircEvent: proc (irc: var TAsyncIRC, ev: TIRCEvent) {.closure.}
-                  userArg: PObject) {.nimcall.},
+              ): PAsyncIRC =
-              userArg: PObject = nil): PAsyncIRC =
   ## Use this function if you want to use asyncio's dispatcher.
   ## 
   ## **Note:** Do **NOT** use this if you're writing a simple IRC bot which only
@@ -389,28 +409,25 @@ proc asyncIRC*(address: string, port: TPort = 6667.TPort,
   result.msgLimit = msgLimit
   result.messageBuffer = @[]
   result.handleEvent = ircEvent
-  result.userArg = userArg
-  result.lineBuffer = ""
 
 proc register*(d: PDispatcher, irc: PAsyncIRC) =
   ## Registers ``irc`` with dispatcher ``d``.
-  var dele = newDelegate()
+  irc.asyncSock.handleConnect =
-  dele.deleVal = irc
+    proc (s: PAsyncSocket) =
-  dele.getSocket = (proc (h: PObject): tuple[info: TInfo, sock: TSocket] =
+      handleConnect(s, irc)
-                      if PAsyncIRC(h).status == SockConnecting or
+  irc.asyncSock.handleRead =
-                            PAsyncIRC(h).status == SockConnected:
+    proc (s: PAsyncSocket) =
-                        return (PAsyncIRC(h).status, PAsyncIRC(h).sock)
+      handleRead(s, irc)
-                      else: return (SockIdle, PAsyncIRC(h).sock))
+  irc.asyncSock.handleTask =
-  dele.handleConnect = handleConnect
+    proc (s: PAsyncSocket) =
-  dele.handleRead = handleRead
+      handleTask(s, irc)
-  dele.task = handleTask
+  d.register(irc.asyncSock)
-  d.register(dele)
   
 when isMainModule:
   #var m = parseMessage("ERROR :Closing Link: dom96.co.cc (Ping timeout: 252 seconds)")
   #echo(repr(m))
 
-  #discard """
+
   
   var client = irc("amber.tenthbit.net", nick="TestBot1234",
                    joinChans = @["#flood"])
@@ -431,5 +448,5 @@ when isMainModule:
 
         #echo( repr(event) )
       #echo("Lag: ", formatFloat(client.getLag()))
-  #"""
+  
     

lib/pure/unittest.nim

@@ -7,7 +7,7 @@
 #    distribution, for details about the copyright.
 #
 
-## :Author: Zahary Karadjov (zah@github)
+## :Author: Zahary Karadjov
 ##
 ## This module implements the standard unit testing facilities such as
 ## suites, fixtures and test cases as well as facilities for combinatorial 
@@ -95,14 +95,6 @@ template fail* =
 macro check*(conditions: stmt): stmt {.immediate.} =
   let conditions = callsite()
   
-  proc standardRewrite(e: PNimrodNode): PNimrodNode =
-    template rewrite(Exp, lineInfoLit: expr, expLit: string): stmt =
-      if not Exp:
-        checkpoint(lineInfoLit & ": Check failed: " & expLit)
-        fail()
- 
-    result = getAst(rewrite(e, e.lineinfo, e.toStrLit))
-  
   case conditions.kind
   of nnkCall, nnkCommand, nnkMacroStmt:
     case conditions[1].kind
@@ -133,8 +125,38 @@ macro check*(conditions: stmt): stmt {.immediate.} =
       result = rewriteBinaryOp(conditions[1])
   
     of nnkCall, nnkCommand:
-      # TODO: We can print out the call arguments in case of failure
+      proc rewriteCall(op: PNimrodNode): PNimrodNode =
-      result = standardRewrite(conditions[1])
+        template rewrite(call, lineInfoLit: expr, expLit: string,
+                         argAssgs, argPrintOuts: stmt): stmt =
+          block:
+            argAssgs
+            if not call:
+              checkpoint(lineInfoLit & ": Check failed: " & expLit)
+              argPrintOuts
+              fail()
+
+        template asgn(a, value: expr): stmt =
+          let a = value
+        
+        template print(name, value: expr): stmt =
+          checkpoint(name & " was " & $value)
+
+        var 
+          argsAsgns = newNimNode(nnkStmtList)
+          argsPrintOuts = newNimNode(nnkStmtList)
+          opStr = op.toStrLit
+        
+        for i in 1 .. <op.len:
+          if op[i].kind notin nnkLiterals:
+            # TODO: print only types that are printable
+            var arg = newIdentNode(":param" & ($i))
+            argsAsgns.add getAst(asgn(arg, op[i]))
+            argsPrintOuts.add getAst(print(op[i].toStrLit, arg))
+            op[i] = arg
+
+        result = getAst(rewrite(op, op.lineinfo, opStr, argsAsgns, argsPrintOuts))
+
+      result = rewriteCall(conditions[1])
 
     of nnkStmtList:
       result = newNimNode(nnkStmtList)
@@ -142,7 +164,13 @@ macro check*(conditions: stmt): stmt {.immediate.} =
         result.add(newCall(!"check", conditions[1][i]))
 
     else:
-      result = standardRewrite(conditions[1])
+      template rewrite(Exp, lineInfoLit: expr, expLit: string): stmt =
+        if not Exp:
+          checkpoint(lineInfoLit & ": Check failed: " & expLit)
+          fail()
+
+      let e = conditions[1]
+      result = getAst(rewrite(e, e.lineinfo, e.toStrLit))
 
   else:
     var ast = conditions.treeRepr

tests/compile/tseq2.nim

@@ -1,4 +1,4 @@
-
+var s = @[]
   
 proc `*` *(a, b: seq[int]): seq[int] = 
   # allocate a new sequence:

tests/reject/tarrayplus.nim

@@ -0,0 +1,13 @@
+discard """
+  msg: "type mismatch: got (array[0..2, float], array[0..1, float])"
+"""
+
+proc `+`*[R, T] (v1, v2: array[R, T]): array[R, T] =
+  for i in low(v1)..high(v1):
+    result[i] = v1[i] + v2[i]
+
+var 
+  v1: array[0..2, float] = [3.0, 1.2, 3.0]
+  v2: array[0..1, float] = [2.0, 1.0]
+  v3 = v1 + v2
+