Merge branch 'master' into newparser
This commit is contained in:
commit
23bd3ccd8b
31 changed files with 277 additions and 63 deletions
|
|
@ -34,7 +34,10 @@ const
|
|||
proc getIdent(e: PNimrodNode): string {.compileTime.} =
|
||||
case e.kind
|
||||
of nnkIdent: result = normalize($e.ident)
|
||||
of nnkAccQuoted: result = getIdent(e[0])
|
||||
of nnkAccQuoted:
|
||||
result = getIdent(e[0])
|
||||
for i in 1 .. e.len-1:
|
||||
result.add getIdent(e[i])
|
||||
else: error("cannot extract identifier from node: " & toStrLit(e).strVal)
|
||||
|
||||
proc delete[T](s: var seq[T], attr: T): bool =
|
||||
|
|
@ -478,4 +481,5 @@ macro `var`*(e: expr): expr {.immediate.} =
|
|||
when isMainModule:
|
||||
var nim = "Nimrod"
|
||||
echo h1(a(href="http://nimrod-code.org", nim))
|
||||
echo form(action="test", `accept-charset` = "Content-Type")
|
||||
|
||||
|
|
|
|||
|
|
@ -106,6 +106,12 @@ proc write*(s: PStream, x: string) =
|
|||
## terminating zero is written.
|
||||
writeData(s, cstring(x), x.len)
|
||||
|
||||
proc writeln*(s: PStream, args: varargs[string, `$`]) =
|
||||
## writes one or more strings to the the stream `s` followed
|
||||
## by a new line. No length field or terminating zero is written.
|
||||
for str in args: write(s, str)
|
||||
write(s, "\n")
|
||||
|
||||
proc read[T](s: PStream, result: var T) =
|
||||
## generic read procedure. Reads `result` from the stream `s`.
|
||||
if readData(s, addr(result), sizeof(T)) != sizeof(T):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue