better strict funcs, WIP (#15199)
* better strict funcs, WIP * progress
This commit is contained in:
parent
e194cb41a4
commit
ddff13f01b
5 changed files with 36 additions and 14 deletions
|
|
@ -374,12 +374,14 @@ func checkNamedCaptured(pattern: RegexMatch, name: string): void =
|
|||
func `[]`*(pattern: CaptureBounds, name: string): HSlice[int, int] =
|
||||
let pattern = RegexMatch(pattern)
|
||||
checkNamedCaptured(pattern, name)
|
||||
pattern.captureBounds[pattern.pattern.captureNameToId[name]]
|
||||
{.noSideEffect.}:
|
||||
result = pattern.captureBounds[pattern.pattern.captureNameToId[name]]
|
||||
|
||||
func `[]`*(pattern: Captures, name: string): string =
|
||||
let pattern = RegexMatch(pattern)
|
||||
checkNamedCaptured(pattern, name)
|
||||
return pattern.captures[pattern.pattern.captureNameToId[name]]
|
||||
{.noSideEffect.}:
|
||||
result = pattern.captures[pattern.pattern.captureNameToId[name]]
|
||||
|
||||
template toTableImpl() {.dirty.} =
|
||||
for key in RegexMatch(pattern).pattern.captureNameId.keys:
|
||||
|
|
|
|||
|
|
@ -1914,7 +1914,8 @@ func register*(mimedb: var MimeDB, ext: string, mimetype: string) =
|
|||
## ``mimetype`` and ``ext`` are lowercased before registering on ``mimedb``.
|
||||
assert ext.strip.len > 0, "ext argument can not be empty string"
|
||||
assert mimetype.strip.len > 0, "mimetype argument can not be empty string"
|
||||
mimedb.mimes[ext.toLowerAscii()] = mimetype.toLowerAscii()
|
||||
{.noSideEffect.}:
|
||||
mimedb.mimes[ext.toLowerAscii()] = mimetype.toLowerAscii()
|
||||
|
||||
runnableExamples:
|
||||
static:
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ proc `[]=`*(t: StringTableRef, key, val: string) {.
|
|||
inc(t.counter)
|
||||
|
||||
proc newStringTable*(mode: StringTableMode): owned(StringTableRef) {.
|
||||
rtlFunc, extern: "nst$1".} =
|
||||
rtlFunc, extern: "nst$1", noSideEffect.} =
|
||||
## Creates a new empty string table.
|
||||
##
|
||||
## See also:
|
||||
|
|
@ -265,7 +265,7 @@ proc newStringTable*(mode: StringTableMode): owned(StringTableRef) {.
|
|||
|
||||
proc newStringTable*(keyValuePairs: varargs[string],
|
||||
mode: StringTableMode): owned(StringTableRef) {.
|
||||
rtlFunc, extern: "nst$1WithPairs".} =
|
||||
rtlFunc, extern: "nst$1WithPairs", noSideEffect.} =
|
||||
## Creates a new string table with given `key, value` string pairs.
|
||||
##
|
||||
## `StringTableMode` must be specified.
|
||||
|
|
@ -276,12 +276,13 @@ proc newStringTable*(keyValuePairs: varargs[string],
|
|||
result = newStringTable(mode)
|
||||
var i = 0
|
||||
while i < high(keyValuePairs):
|
||||
result[keyValuePairs[i]] = keyValuePairs[i + 1]
|
||||
{.noSideEffect.}:
|
||||
result[keyValuePairs[i]] = keyValuePairs[i + 1]
|
||||
inc(i, 2)
|
||||
|
||||
proc newStringTable*(keyValuePairs: varargs[tuple[key, val: string]],
|
||||
mode: StringTableMode = modeCaseSensitive): owned(StringTableRef) {.
|
||||
rtlFunc, extern: "nst$1WithTableConstr".} =
|
||||
rtlFunc, extern: "nst$1WithTableConstr", noSideEffect.} =
|
||||
## Creates a new string table with given `(key, value)` tuple pairs.
|
||||
##
|
||||
## The default mode is case sensitive.
|
||||
|
|
@ -291,7 +292,9 @@ proc newStringTable*(keyValuePairs: varargs[tuple[key, val: string]],
|
|||
mytab2 = newStringTable([("key3", "val3"), ("key4", "val4")])
|
||||
|
||||
result = newStringTable(mode)
|
||||
for key, val in items(keyValuePairs): result[key] = val
|
||||
for key, val in items(keyValuePairs):
|
||||
{.noSideEffect.}:
|
||||
result[key] = val
|
||||
|
||||
proc raiseFormatException(s: string) =
|
||||
raise newException(ValueError, "format string: key not found: " & s)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue