jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated events.nim to use TEventEmitter instead of PEventEmitter.

Browse source
This commit is contained in:
Amrykid 2011-07-27 17:39:43 -05:00
commit 5209469fd7
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/pure/events.nim
View file

@ -16,43 +16,42 @@
type type
TEventArgs* = object of TObject ## Base object for event arguments TEventArgs* = object of TObject ## Base object for event arguments
## that are passed to callback functions. ## that are passed to callback functions.
TEventHandler = tuple[name: string, handlers: seq[proc(e:TEventArgs)]] TEventHandler* = tuple[name: string, handlers: seq[proc(e:TEventArgs)]]
PEventHandler* = ref TEventHandler ## An eventhandler for an event. #PEventHandler* = ref TEventHandler ## An eventhandler for an event.
type type
TEventEmitter = object {.pure, final.} TEventEmitter* = object {.pure, final.}
s: seq[PEventHandler] s: seq[TEventHandler]
PEventEmitter* = ref TEventEmitter ## An object that fires events and #PEventEmitter* = ref TEventEmitter ## An object that fires events and holds event handlers for an object.
## holds event handlers for an object.
EInvalidEvent* = object of EInvalidValue EInvalidEvent* = object of EInvalidValue
proc newEventHandler*(name: string): PEventHandler = proc newEventHandler*(name: string): TEventHandler =
## Initializes an EventHandler with the specified name and returns it. ## Initializes an EventHandler with the specified name and returns it.
new(result) #new(result)
result.handlers = @[] result.handlers = @[]
result.name = name result.name = name
proc addHandler*(handler: PEventHandler, func: proc(e: TEventArgs)) = proc addHandler*(handler: var TEventHandler, func: proc(e: TEventArgs)) =
## Adds the callback to the specified event handler. ## Adds the callback to the specified event handler.
handler.handlers.add(func) handler.handlers.add(func)
proc removeHandler*(handler: PEventHandler, func: proc(e: TEventArgs)) = proc removeHandler*(handler: var TEventHandler, func: proc(e: TEventArgs)) =
## Removes the callback from the specified event handler. ## Removes the callback from the specified event handler.
for i in countup(0, len(handler.handlers) -1): for i in countup(0, len(handler.handlers) -1):
if func == handler.handlers[i]: if func == handler.handlers[i]:
handler.handlers.del(i) handler.handlers.del(i)
break break
proc clearHandlers*(handler: PEventHandler) = proc clearHandlers*(handler: var TEventHandler) =
## Clears all of the callbacks from the event handler. ## Clears all of the callbacks from the event handler.
setLen(handler.handlers, 0) setLen(handler.handlers, 0)
proc getEventhandler(emitter: PEventEmitter, event: string): int = proc getEventhandler(emitter: var TEventEmitter, event: string): int =
for k in 0..high(emitter.s): for k in 0..high(emitter.s):
if emitter.s[k].name == event: return k if emitter.s[k].name == event: return k
return -1 return -1
proc on*(emitter: PEventEmitter, event: string, func: proc(e: TEventArgs)) = proc on*(emitter: var TEventEmitter, event: string, func: proc(e: TEventArgs)) =
## Assigns a event handler with the specified callback. If the event ## Assigns a event handler with the specified callback. If the event
## doesn't exist, it will be created. ## doesn't exist, it will be created.
var i = getEventHandler(emitter, event) var i = getEventHandler(emitter, event)
@ -63,12 +62,12 @@ proc on*(emitter: PEventEmitter, event: string, func: proc(e: TEventArgs)) =
else: else:
addHandler(emitter.s[i], func) addHandler(emitter.s[i], func)
proc emit*(emitter: PEventEmitter, eventhandler: PEventHandler, proc emit*(emitter: var TEventEmitter, eventhandler: var TEventHandler,
args: TEventArgs) = args: TEventArgs) =
## Fires an event handler with specified event arguments. ## Fires an event handler with specified event arguments.
for func in items(eventhandler.handlers): func(args) for func in items(eventhandler.handlers): func(args)
proc emit*(emitter: PEventEmitter, event: string, args: TEventArgs) = proc emit*(emitter: var TEventEmitter, event: string, args: TEventArgs) =
## Fires an event handler with specified event arguments. ## Fires an event handler with specified event arguments.
var i = getEventHandler(emitter, event) var i = getEventHandler(emitter, event)
if i >= 0: if i >= 0:
@ -76,8 +75,9 @@ proc emit*(emitter: PEventEmitter, event: string, args: TEventArgs) =
else: else:
raise newException(EInvalidEvent, "invalid event: " & event) raise newException(EInvalidEvent, "invalid event: " & event)
proc newEventEmitter*(): PEventEmitter = proc newEventEmitter*(): TEventEmitter =
## Creates and returns a new EventEmitter. ## Creates and returns a new EventEmitter.
new(result) #new(result)
var result : TEventEmitter
result.s = @[] result.s = @[]
return result

2
tests/accept/run/tevents.nim
View file

@ -34,7 +34,7 @@ ee.emit("print", eventargs)
type type
TSomeObject = object of TObject TSomeObject = object of TObject
PrintEvent: PEventHandler PrintEvent: TEventHandler
var obj: TSomeObject var obj: TSomeObject
obj.PrintEvent = newEventHandler("print") obj.PrintEvent = newEventHandler("print")