mirror of
https://github.com/nim-lang/Nim.git
synced 2026-06-05 03:14:08 +00:00
Fix modules that import both strutils and unicode
This is only an issue when a proc in both modules that is named the same is used, such as toLower or toUpper for strings.
This commit is contained in:
@@ -433,7 +433,7 @@ proc htmlTag*(n: XmlNode): HtmlTag =
|
||||
proc htmlTag*(s: string): HtmlTag =
|
||||
## converts `s` to a ``HtmlTag``. If `s` is no HTML tag, ``tagUnknown`` is
|
||||
## returned.
|
||||
let s = if allLower(s): s else: s.toLower
|
||||
let s = if allLower(s): s else: toLowerAscii(s)
|
||||
result = toHtmlTag(s)
|
||||
|
||||
proc entityToUtf8*(entity: string): string =
|
||||
@@ -513,13 +513,13 @@ proc parse(x: var XmlParser, errors: var seq[string]): XmlNode =
|
||||
errors.add(errorMsg(x))
|
||||
next(x)
|
||||
of xmlElementStart:
|
||||
result = newElement(x.elemName.toLower)
|
||||
result = newElement(toLowerAscii(x.elemName))
|
||||
next(x)
|
||||
untilElementEnd(x, result, errors)
|
||||
of xmlElementEnd:
|
||||
errors.add(errorMsg(x, "unexpected ending tag: " & x.elemName))
|
||||
of xmlElementOpen:
|
||||
result = newElement(x.elemName.toLower)
|
||||
result = newElement(toLowerAscii(x.elemName))
|
||||
next(x)
|
||||
result.attrs = newStringTable()
|
||||
while true:
|
||||
|
||||
@@ -1841,8 +1841,8 @@ when isMainModule:
|
||||
result.add ", "
|
||||
|
||||
result.add case n:
|
||||
of 2: c[0].toLower & ": '" & c[1] & "'"
|
||||
of 1: c[0].toLower & ": ''"
|
||||
of 2: toLowerAscii(c[0]) & ": '" & c[1] & "'"
|
||||
of 1: toLowerAscii(c[0]) & ": ''"
|
||||
else: ""
|
||||
|
||||
assert("Var1=key1;var2=Key2; VAR3".
|
||||
|
||||
Reference in New Issue
Block a user