diff options
| -rwxr-xr-x | compiler/semfold.nim | 10 | ||||
| -rw-r--r-- | lib/pure/matchers.nim | 15 | ||||
| -rwxr-xr-x | lib/pure/parseutils.nim | 6 |
3 files changed, 29 insertions, 2 deletions
diff --git a/compiler/semfold.nim b/compiler/semfold.nim index 361353a28..956667091 100755 --- a/compiler/semfold.nim +++ b/compiler/semfold.nim @@ -372,6 +372,14 @@ proc foldFieldAccess(m: PSym, n: PNode): PNode = return localError(n.info, errFieldXNotFound, field.name.s) +proc foldConStrStr(m: PSym, n: PNode): PNode = + result = newNodeIT(nkStrLit, n.info, n.typ) + result.strVal = "" + for i in countup(1, sonsLen(n) - 1): + let a = getConstExpr(m, n.sons[i]) + if a == nil: return nil + result.strVal.add(getStrOrChar(a)) + proc getConstExpr(m: PSym, n: PNode): PNode = result = nil case n.kind @@ -444,6 +452,8 @@ proc getConstExpr(m: PSym, n: PNode): PNode = result = newIntNodeT(ord(sameType(n[1].typ, n[2].typ)), n) of mAstToStr: result = newStrNodeT(renderTree(n[1], {renderNoComments}), n) + of mConStrStr: + result = foldConStrStr(m, n) else: result = magicCall(m, n) except EOverflow: diff --git a/lib/pure/matchers.nim b/lib/pure/matchers.nim index f37d4397d..0495f2c30 100644 --- a/lib/pure/matchers.nim +++ b/lib/pure/matchers.nim @@ -44,8 +44,21 @@ proc validEmailAddress*(s: string): bool {.noSideEffect, "aero", "jobs", "museum": return true return false +proc parseInt*(s: string, value: var int, validRange: TSlice[int]) {. + noSideEffect, rtl, extern: "nmatchParseInt".} = + ## parses `s` into an integer in the range `validRange`. If successful, + ## `value` is modified to contain the result. Otherwise no exception is + ## raised and `value` is not touched; this way a reasonable default value + ## won't be overwritten. + var x = value + try: + x = parseInt(s) + except EOverflow: + nil + if x in validRange: value = x + when isMainModule: - assert "wuseldusel@codehome.com".validEmailAddress + doAssert "wuseldusel@codehome.com".validEmailAddress {.pop.} diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim index f4dbcf7b8..fd9e880c6 100755 --- a/lib/pure/parseutils.nim +++ b/lib/pure/parseutils.nim @@ -196,7 +196,11 @@ proc parseBiggestInt*(s: string, number: var biggestInt, start = 0): int {. ## parses an integer starting at `start` and stores the value into `number`. ## Result is the number of processed chars or 0 if there is no integer. ## `EOverflow` is raised if an overflow occurs. - result = rawParseInt(s, number, start) + var res: biggestInt = number + # use 'res' for exception safety (don't write to 'number' in case of an + # overflow exception: + result = rawParseInt(s, res, start) + number = res proc parseInt*(s: string, number: var int, start = 0): int {. rtl, extern: "npuParseInt", noSideEffect.} = |