add support for parsing chars in scanf macro (#16240)
This commit is contained in:
parent
545c406cbe
commit
2220aaeaef
4 changed files with 33 additions and 1 deletions
|
|
@ -241,6 +241,10 @@ proc parseIdent*(s: string, start = 0): string =
|
|||
while i < s.len and s[i] in IdentChars: inc(i)
|
||||
result = substr(s, start, i-1)
|
||||
|
||||
proc parseChar*(s: string, ident: var char, start = 0): int =
|
||||
ident = s[start]
|
||||
result = 1
|
||||
|
||||
proc skipWhitespace*(s: string, start = 0): int {.inline.} =
|
||||
## Skips the whitespace starting at ``s[start]``. Returns the number of
|
||||
## skipped characters.
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ substrings starting with ``$``. These constructions are available:
|
|||
``$h`` Matches a hex integer. This uses ``parseutils.parseHex``.
|
||||
``$f`` Matches a floating pointer number. Uses ``parseFloat``.
|
||||
``$w`` Matches an ASCII identifier: ``[A-Za-z_][A-Za-z_0-9]*``.
|
||||
``$c`` Matches a single ASCII character.
|
||||
``$s`` Skips optional whitespace.
|
||||
``$$`` Matches a single dollar sign.
|
||||
``$.`` Matches if the end of the input string has been reached.
|
||||
|
|
@ -345,6 +346,12 @@ macro scanf*(input: string; pattern: static[string]; results: varargs[typed]): b
|
|||
else:
|
||||
matchError
|
||||
inc i
|
||||
of 'c':
|
||||
if i < results.len and getType(results[i]).typeKind == ntyChar:
|
||||
matchBind "parseChar"
|
||||
else:
|
||||
matchError
|
||||
inc i
|
||||
of 'b':
|
||||
if i < results.len and getType(results[i]).typeKind == ntyInt:
|
||||
matchBind "parseBin"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue