diff options
| author | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
|---|---|---|
| committer | Andreas Rumpf <ar@kimeta.de> | 2014-04-10 01:47:20 +0200 |
| commit | dcfc7a8896166563f6fd80fbab81bc50e0b5a217 (patch) | |
| tree | 4a247ec2d64bafec53e5ab24b0fda89642908a07 /lib/pure/xmlparser.nim | |
| parent | a86c774932afd8b6782df1925837df9df04ef381 (diff) | |
| parent | 8b82004359b8d852fa0107d79cc78b21eb35c028 (diff) | |
| download | Nim-dcfc7a8896166563f6fd80fbab81bc50e0b5a217.tar.gz | |
resolved conflict
Diffstat (limited to 'lib/pure/xmlparser.nim')
| -rw-r--r-- | lib/pure/xmlparser.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/xmlparser.nim b/lib/pure/xmlparser.nim index 16bbe1455..8b8bb3b03 100644 --- a/lib/pure/xmlparser.nim +++ b/lib/pure/xmlparser.nim @@ -96,7 +96,7 @@ proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode = ## &entity; errors.add(errorMsg(x, "unknown entity: " & x.entityName)) next(x) - of xmlEof: nil + of xmlEof: discard proc parseXml*(s: PStream, filename: string, errors: var seq[string]): PXmlNode = @@ -110,7 +110,7 @@ proc parseXml*(s: PStream, filename: string, of xmlElementOpen, xmlElementStart: result = parse(x, errors) break - of xmlComment, xmlWhitespace, xmlSpecial, xmlPI: nil # just skip it + of xmlComment, xmlWhitespace, xmlSpecial, xmlPI: discard # just skip it of xmlError: errors.add(errorMsg(x)) else: |