preparations for making 'closure' the default calling convention for proc types

This commit is contained in:
Araq 2012-07-16 23:00:57 +02:00
commit 8d99753d63
36 changed files with 117 additions and 102 deletions

View file

@ -6,13 +6,13 @@ discard """
proc main =
const n = 30
for iterations in 0..50_000:
var s: seq[proc(): int {.closure.}] = @[]
var s: seq[proc(): string {.closure.}] = @[]
for i in 0 .. n-1:
let ii = i
s.add(proc(): int = return ii*ii)
s.add(proc(): string = return $(ii*ii))
for i in 0 .. n-1:
let val = s[i]()
if val != i*i: echo "bug ", val
if val != $(i*i): echo "bug ", val
if getOccupiedMem() > 3000_000: quit("still a leak!")
echo "success"

View file

@ -7,20 +7,22 @@ import tables, lists
type
TEventArgs = object of TObject
TEventEmitter = object of TObject
events*: TTable[string, TDoublyLinkedList[proc(e: TEventArgs)]]
events*: TTable[string, TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}]]
proc emit*(emitter: TEventEmitter, event: string, args: TEventArgs) =
for func in nodes(emitter.events[event]):
func.value(args) #call function with args.
proc on*(emitter: var TEventEmitter, event: string, func: proc(e: TEventArgs)) =
proc on*(emitter: var TEventEmitter, event: string,
func: proc(e: TEventArgs) {.nimcall.}) =
if not hasKey(emitter.events, event):
var list: TDoublyLinkedList[proc(e: TEventArgs)]
var list: TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}]
add(emitter.events, event, list) #if not, add it.
append(emitter.events.mget(event), func)
proc initEmitter(emitter: var TEventEmitter) =
emitter.events = initTable[string, TDoublyLinkedList[proc(e: TEventArgs)]]()
emitter.events = initTable[string,
TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}]]()
var
ee: TEventEmitter