diff options
| author | Juan Carlos <juancarlospaco@gmail.com> | 2021-01-15 23:56:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 18:56:38 -0800 |
| commit | 78a99587a4ad8ad17a179a7992fcda8a6e10f25a (patch) | |
| tree | 18a244e09f7db4636b3bd221130f36f5d5fb8b97 /lib/pure/os.nim | |
| parent | 7b632f9ccbd4d15fa9fe4ca45b6fea22b259c81d (diff) | |
| download | Nim-78a99587a4ad8ad17a179a7992fcda8a6e10f25a.tar.gz | |
Deprecate TaintedString (#15423)
Co-authored-by: Timothee Cour <timothee.cour2@gmail.com> Co-authored-by: Dominik Picheta <dominikpicheta@googlemail.com>
Diffstat (limited to 'lib/pure/os.nim')
| -rw-r--r-- | lib/pure/os.nim | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 77499deea..83e60cf77 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -2670,7 +2670,7 @@ when defined(nimdoc): ## else: ## # Do something else! - proc paramStr*(i: int): TaintedString {.tags: [ReadIOEffect].} = + proc paramStr*(i: int): string {.tags: [ReadIOEffect].} = ## Returns the `i`-th `command line argument`:idx: given to the application. ## ## `i` should be in the range `1..paramCount()`, the `IndexDefect` @@ -2704,7 +2704,7 @@ when defined(nimdoc): elif defined(nimscript): discard elif defined(nintendoswitch) or weirdTarget: - proc paramStr*(i: int): TaintedString {.tags: [ReadIOEffect].} = + proc paramStr*(i: int): string {.tags: [ReadIOEffect].} = raise newException(OSError, "paramStr is not implemented on Nintendo Switch") proc paramCount*(): int {.tags: [ReadIOEffect].} = @@ -2727,17 +2727,17 @@ elif defined(windows): ownParsedArgv = true result = ownArgv.len-1 - proc paramStr*(i: int): TaintedString {.rtl, extern: "nos$1", + proc paramStr*(i: int): string {.rtl, extern: "nos$1", tags: [ReadIOEffect].} = # Docstring in nimdoc block. if not ownParsedArgv: ownArgv = parseCmdLine($getCommandLine()) ownParsedArgv = true - if i < ownArgv.len and i >= 0: return TaintedString(ownArgv[i]) + if i < ownArgv.len and i >= 0: return ownArgv[i] raise newException(IndexDefect, formatErrorIndexBound(i, ownArgv.len-1)) elif defined(genode): - proc paramStr*(i: int): TaintedString = + proc paramStr*(i: int): string = raise newException(OSError, "paramStr is not implemented on Genode") proc paramCount*(): int = @@ -2750,9 +2750,9 @@ elif not defined(createNimRtl) and cmdCount {.importc: "cmdCount".}: cint cmdLine {.importc: "cmdLine".}: cstringArray - proc paramStr*(i: int): TaintedString {.tags: [ReadIOEffect].} = + proc paramStr*(i: int): string {.tags: [ReadIOEffect].} = # Docstring in nimdoc block. - if i < cmdCount and i >= 0: return TaintedString($cmdLine[i]) + if i < cmdCount and i >= 0: return $cmdLine[i] raise newException(IndexDefect, formatErrorIndexBound(i, cmdCount-1)) proc paramCount*(): int {.tags: [ReadIOEffect].} = @@ -2760,7 +2760,7 @@ elif not defined(createNimRtl) and result = cmdCount-1 when declared(paramCount) or defined(nimdoc): - proc commandLineParams*(): seq[TaintedString] = + proc commandLineParams*(): seq[string] = ## Convenience proc which returns the command line parameters. ## ## This returns **only** the parameters. If you want to get the application @@ -2789,7 +2789,7 @@ when declared(paramCount) or defined(nimdoc): for i in 1..paramCount(): result.add(paramStr(i)) else: - proc commandLineParams*(): seq[TaintedString] {.error: + proc commandLineParams*(): seq[string] {.error: "commandLineParams() unsupported by dynamic libraries".} = discard |