Merge branch 'devel' of github.com:nim-lang/Nim into devel

This commit is contained in:
Andreas Rumpf 2016-02-29 14:39:53 +01:00
commit 4bd901d3e1
15 changed files with 21 additions and 21 deletions

View file

@ -2,7 +2,7 @@ import unittest
include nre
suite "Test NRE initialization":
test "correct intialization":
test "correct initialization":
check(re("[0-9]+") != nil)
check(re("(?i)[0-9]+") != nil)

View file

@ -345,7 +345,7 @@ proc writeformat(o: var Writer; p: pointer; fmt: Format) =
## Write pointer `i` according to format `fmt` using output object
## `o` and output function `add`.
##
## Pointers are casted to unsigned int and formated as hexadecimal
## Pointers are casted to unsigned int and formatted as hexadecimal
## with prefix unless specified otherwise.
var f = fmt
if f.typ == 0.char:
@ -584,7 +584,7 @@ proc splitfmt(s: string): seq[Part] {.compiletime, nosideeffect.} =
## Each part is either a literal string or a format specification. A
## format specification is a substring of the form
## "{[arg][:format]}" where `arg` is either empty or a number
## refering to the arg-th argument and an additional field or array
## referring to the arg-th argument and an additional field or array
## index. The format string is a string accepted by `parse`.
let subpeg = sequence(capture(digits()),
capture(?sequence(charSet({'.'}), *pegs.identStartChars(), *identChars())),