`` element. - if n == nil or n.htmlTag != tagHtml: - errors.add(" tag expected") - checkHtmlAux(n, errors) - when isMainModule: import os @@ -429,4 +578,3 @@ when isMainModule: f.close() else: quit("cannot write test.txt") - diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim index c49986087..667b8aed6 100644 --- a/lib/pure/parsexml.nim +++ b/lib/pure/parsexml.nim @@ -131,6 +131,10 @@ proc close*(my: var TXmlParser) {.inline.} = ## closes the parser `my` and its associated input stream. lexbase.close(my) +proc kind*(my: TXmlParser): TXmlEventKind {.inline.} = + ## returns the current event type for the XML parser + return my.kind + proc charData*(my: TXmlParser): string {.inline.} = ## returns the character data for the events: ``xmlCharData``, ## ``xmlWhitespace``, ``xmlComment``, ``xmlCData``, ``xmlSpecial`` @@ -138,10 +142,6 @@ proc charData*(my: TXmlParser): string {.inline.} = xmlSpecial}) return my.a -proc kind*(my: TXmlParser): TXmlEventKind {.inline.} = - ## returns the current event type for the XML parser - return my.kind - proc elementName*(my: TXmlParser): string {.inline.} = ## returns the element name for the events: ``xmlElementStart``, ## ``xmlElementEnd``, ``xmlElementOpen`` @@ -173,6 +173,16 @@ proc PIRest*(my: TXmlParser): string {.inline.} = assert(my.kind == xmlPI) return my.b +proc rawData*(my: TXmlParser): string {.inline.} = + ## returns the underlying 'data' string by reference. + ## This is only used for speed hacks. + shallowCopy(result, my.a) + +proc rawData2*(my: TXmlParser): string {.inline.} = + ## returns the underlying second 'data' string by reference. + ## This is only used for speed hacks. + shallowCopy(result, my.b) + proc getColumn*(my: TXmlParser): int {.inline.} = ## get the current column the parser has arrived at. result = getColNumber(my, my.bufPos) @@ -439,6 +449,7 @@ proc parseTag(my: var TXmlParser) = if my.buf[my.bufpos] == '/' and my.buf[my.bufpos+1] == '>': inc(my.bufpos, 2) my.state = stateEmptyElementTag + my.c = nil elif my.buf[my.bufpos] == '>': inc(my.bufpos) else: diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim index e3fc27237..d5821d8f3 100644 --- a/lib/pure/xmltree.nim +++ b/lib/pure/xmltree.nim @@ -71,6 +71,16 @@ proc text*(n: PXmlNode): string {.inline.} = assert n.k in {xnText, xnComment, xnCData, xnEntity} result = n.fText +proc rawText*(n: PXmlNode): string {.inline.} = + ## returns the underlying 'text' string by reference. + ## This is only used for speed hacks. + shallowCopy(result, n.fText) + +proc rawTag*(n: PXmlNode): string {.inline.} = + ## returns the underlying 'tag' string by reference. + ## This is only used for speed hacks. + shallowCopy(result, n.fTag) + proc innerText*(n: PXmlNode): string = ## gets the inner text of `n`. `n` has to be an ``xnElement`` node. Only ## ``xnText`` and ``xnEntity`` nodes are considered part of `n`'s inner text, diff --git a/lib/system/syslocks.nim b/lib/system/syslocks.nim index 4619eaddb..4d81dee01 100644 --- a/lib/system/syslocks.nim +++ b/lib/system/syslocks.nim @@ -19,7 +19,7 @@ when defined(Windows): OwningThread: int LockSemaphore: int Reserved: int32 - + TSysCond = THandle proc InitSysLock(L: var TSysLock) {.stdcall, noSideEffect, diff --git a/todo.txt b/todo.txt index 4bdd004cd..7f00d8172 100644 --- a/todo.txt +++ b/todo.txt @@ -2,7 +2,6 @@ version 0.9.4 ============= - make 'bind' default for templates and introduce 'mixin' -- prove array accesses - special rule for ``[]=`` - ``=`` should be overloadable; requires specialization for ``=``; general lift mechanism in the compiler is already implemented for 'fields' @@ -16,8 +15,11 @@ version 0.9.4 Bugs ==== +- simple closure iterator doesn't work +- marshal doesn't support unsigned types +- sfAnon is not respected in renderer - docgen: sometimes effects are listed twice -- 'result' is not properly cleaned for NRVO +- 'result' is not properly cleaned for NRVO --> use uninit checking instead - sneaking with qualifiedLookup() is really broken! - aporia.nim(968, 5) Error: ambiguous identifier: 'DELETE' -- use a qualifier @@ -140,6 +142,7 @@ Not essential for 1.0.0 - implement closures that support nesting of *procs* > 1 - object constructors: static check for fields if discriminator is known at compile time +- prove array accesses Optimizations