prettified re.nim; make some tests green
This commit is contained in:
parent
697789a313
commit
3ba34f1762
7 changed files with 98 additions and 94 deletions
|
|
@ -2,9 +2,9 @@ import os
|
|||
|
||||
proc getDllName: string =
|
||||
result = "mylib.dll"
|
||||
if ExistsFile(result): return
|
||||
if fileExists(result): return
|
||||
result = "mylib2.dll"
|
||||
if ExistsFile(result): return
|
||||
if fileExists(result): return
|
||||
quit("could not load dynamic library")
|
||||
|
||||
proc myImport(s: cstring) {.cdecl, importc, dynlib: getDllName().}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ macrotest(stdout)
|
|||
|
||||
#GC_disable()
|
||||
|
||||
echo("This was compiled by Nim version " & system.nimVersion)
|
||||
echo("This was compiled by Nim version " & system.NimVersion)
|
||||
writeln(stdout, "Hello", " World", "!")
|
||||
|
||||
echo(["a", "b", "c", "d"].len)
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@ test(`shl`, 0xff'i8, 0x4'i8, 0xf0'i8)
|
|||
test(`shl`, 0xffffffff'i64, 0x4'i64, 0xffffffff0'i64)
|
||||
test(`shl`, 0xffffffff'i32, 0x4'i32, 0xfffffff0'i32)
|
||||
|
||||
Echo("Success") #OUT Success
|
||||
echo("Success") #OUT Success
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue