diff options
| -rwxr-xr-x | compiler/sem.nim | 13 | ||||
| -rwxr-xr-x | compiler/semexprs.nim | 6 | ||||
| -rwxr-xr-x | lib/pure/scgi.nim | 33 | ||||
| -rw-r--r-- | tests/compile/ttypeselectors.nim | 3 |
4 files changed, 31 insertions, 24 deletions
diff --git a/compiler/sem.nim b/compiler/sem.nim index 315ff92cd..397581f63 100755 --- a/compiler/sem.nim +++ b/compiler/sem.nim @@ -114,6 +114,16 @@ proc semConstExpr(c: PContext, n: PNode): PNode = include hlo, seminst, semcall +proc symFromType(t: PType, info: TLineInfo): PSym = + if t.sym != nil: return t.sym + result = newSym(skType, getIdent"AnonType", t.owner, info) + result.flags.incl sfAnon + result.typ = t + +proc symNodeFromType(c: PContext, t: PType, info: TLineInfo): PNode = + result = newSymNode(symFromType(t, info), info) + result.typ = makeTypeDesc(c, t) + proc semAfterMacroCall(c: PContext, n: PNode, s: PSym): PNode = inc(evalTemplateCounter) if evalTemplateCounter > 100: @@ -133,7 +143,8 @@ proc semAfterMacroCall(c: PContext, n: PNode, s: PSym): PNode = result = semStmt(c, result) of tyTypeDesc: if n.kind == nkStmtList: result.kind = nkStmtListType - result.typ = semTypeNode(c, result, nil) + var typ = semTypeNode(c, result, nil) + result = symNodeFromType(c, typ, n.info) else: result = semExpr(c, result) result = fitNode(c, s.typ.sons[0], result) diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim index 5dedc9b82..7c147e778 100755 --- a/compiler/semexprs.nim +++ b/compiler/semexprs.nim @@ -1573,11 +1573,7 @@ proc semExpr(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = result = semExpr(c, n.sons[0], flags) of nkTypeOfExpr: var typ = semTypeNode(c, n, nil).skipTypes({tyTypeDesc}) - typ = makeTypedesc(c, typ) - var sym = newSym(skType, getIdent"TypeOfExpr", - typ.owner, n.info).linkTo(typ) - sym.flags.incl(sfAnon) - result = newSymNode(sym, n.info) + result = symNodeFromType(c, typ, n.info) of nkCall, nkInfix, nkPrefix, nkPostfix, nkCommand, nkCallStrLit: # check if it is an expression macro: checkMinSonsLen(n, 1) diff --git a/lib/pure/scgi.nim b/lib/pure/scgi.nim index 3ee6198d6..825fbd833 100755 --- a/lib/pure/scgi.nim +++ b/lib/pure/scgi.nim @@ -142,22 +142,7 @@ proc run*(handleRequest: proc (client: TSocket, input: string, s.close() # -- AsyncIO start - -proc open*(handleRequest: proc (server: var TAsyncScgiState, client: TSocket, - input: string, headers: PStringTable) {.closure.}, - port = TPort(4000), address = "127.0.0.1"): PAsyncScgiState = - ## Alternative of ``open`` for asyncio compatible SCGI. - new(result) - result.bufLen = 4000 - result.input = newString(result.buflen) # will be reused - - result.asyncServer = AsyncSocket() - bindAddr(result.asyncServer, port, address) - listen(result.asyncServer) - result.handleRequest = handleRequest - -proc handleAccept(h: PObject) = - var s = PAsyncScgiState(h) +proc handleAccept(sock: PAsyncSocket, s: PAsyncScgiState) = accept(getSocket(s.asyncServer), s.client) var L = 0 @@ -179,6 +164,22 @@ proc handleAccept(h: PObject) = s.handleRequest(s[], s.client, s.input, s.headers) +proc open*(handleRequest: proc (server: var TAsyncScgiState, client: TSocket, + input: string, headers: PStringTable) {.closure.}, + port = TPort(4000), address = "127.0.0.1"): PAsyncScgiState = + ## Alternative of ``open`` for asyncio compatible SCGI. + var cres: PAsyncScgiState + new(cres) + cres.bufLen = 4000 + cres.input = newString(cres.buflen) # will be reused + + cres.asyncServer = AsyncSocket() + cres.asyncServer.handleAccept = proc (s: PAsyncSocket) = handleAccept(s, cres) + bindAddr(cres.asyncServer, port, address) + listen(cres.asyncServer) + cres.handleRequest = handleRequest + result = cres + proc register*(d: PDispatcher, s: PAsyncScgiState): PDelegate {.discardable.} = ## Registers ``s`` with dispatcher ``d``. result = d.register(s.asyncServer) diff --git a/tests/compile/ttypeselectors.nim b/tests/compile/ttypeselectors.nim index 9ed7e2008..cca643e1f 100644 --- a/tests/compile/ttypeselectors.nim +++ b/tests/compile/ttypeselectors.nim @@ -9,8 +9,7 @@ template selectType(x: int): typeDesc = template simpleTypeTempl: typeDesc = string -macro typeFromMacro(s: expr): typeDesc = - result = newIdentNode"string" +macro typeFromMacro: typedesc = string proc t1*(x: int): simpleTypeTempl() = result = "test" |