diff options
author | Araq <rumpf_a@web.de> | 2014-08-31 13:46:27 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-08-31 13:46:27 +0200 |
commit | 3ba34f1762742682a54dfdc30986818b5c1ecd81 (patch) | |
tree | d996f1d21582a365eefd1f863555d5f5045b2be0 /tests/misc/teventemitter.nim | |
parent | 697789a3134b7923edd3fe1bd14faa23da6be35c (diff) | |
download | Nim-3ba34f1762742682a54dfdc30986818b5c1ecd81.tar.gz |
prettified re.nim; make some tests green
Diffstat (limited to 'tests/misc/teventemitter.nim')
-rw-r--r-- | tests/misc/teventemitter.nim | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/misc/teventemitter.nim b/tests/misc/teventemitter.nim index 9ecf72ea2..bfcf95701 100644 --- a/tests/misc/teventemitter.nim +++ b/tests/misc/teventemitter.nim @@ -5,29 +5,29 @@ discard """ import tables, lists type - TEventArgs = object of TObject - TEventEmitter = object of TObject - events*: TTable[string, TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}]] + EventArgs = object of RootObj + EventEmitter = object of RootObj + events*: Table[string, DoublyLinkedList[proc(e: EventArgs) {.nimcall.}]] -proc emit*(emitter: TEventEmitter, event: string, args: TEventArgs) = +proc emit*(emitter: EventEmitter, event: string, args: EventArgs) = 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) {.nimcall.}) = +proc on*(emitter: var EventEmitter, event: string, + func: proc(e: EventArgs) {.nimcall.}) = if not hasKey(emitter.events, event): - var list: TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}] + var list: DoublyLinkedList[proc(e: EventArgs) {.nimcall.}] add(emitter.events, event, list) #if not, add it. append(emitter.events.mget(event), func) -proc initEmitter(emitter: var TEventEmitter) = +proc initEmitter(emitter: var EventEmitter) = emitter.events = initTable[string, - TDoublyLinkedList[proc(e: TEventArgs) {.nimcall.}]]() + DoublyLinkedList[proc(e: EventArgs) {.nimcall.}]]() var - ee: TEventEmitter - args: TEventArgs + ee: EventEmitter + args: EventArgs initEmitter(ee) -ee.on("print", proc(e: TEventArgs) = echo("pie")) +ee.on("print", proc(e: EventArgs) = echo("pie")) ee.emit("print", args) |