diff options
| -rw-r--r-- | compiler/vmops.nim | 2 | ||||
| -rw-r--r-- | lib/system/io.nim | 8 | ||||
| -rw-r--r-- | tests/vm/tfile_rw.nim | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/compiler/vmops.nim b/compiler/vmops.nim index 79c26dd5f..1e3a258f3 100644 --- a/compiler/vmops.nim +++ b/compiler/vmops.nim @@ -147,7 +147,7 @@ proc registerAdditionalOps*(c: PCtx) = wrap1s(fileExists, osop) wrapDangerous(writeFile, ioop) wrap1s(readFile, ioop) - wrap2si(staticReadLines, ioop) + wrap2si(readLines, ioop) systemop getCurrentExceptionMsg systemop getCurrentException registerCallback c, "stdlib.*.staticWalkDir", proc (a: VmArgs) {.nimcall.} = diff --git a/lib/system/io.nim b/lib/system/io.nim index e961b1bb2..4a1f9b84a 100644 --- a/lib/system/io.nim +++ b/lib/system/io.nim @@ -696,10 +696,10 @@ proc writeFile*(filename: string, content: openArray[byte]) {.since: (1, 1).} = else: raise newException(IOError, "cannot open: " & filename) -proc staticReadLines*(filename: string, n: Natural): seq[TaintedString] = - ## Compile time read `n` lines from the file named `filename`. Raises an IO exception +proc readLines*(filename: string, n: Natural): seq[TaintedString] = + ## read `n` lines from the file named `filename`. Raises an IO exception ## in case of an error. Raises EOF if file does not contain at least `n` lines. - ## A line of text may be delimited by ``LF`` or ``CRLF``. + ## Available at compile time. A line of text may be delimited by ``LF`` or ``CRLF``. ## The newline character(s) are not part of the returned strings. var f: File if open(f, filename): @@ -713,6 +713,8 @@ proc staticReadLines*(filename: string, n: Natural): seq[TaintedString] = else: sysFatal(IOError, "cannot open: " & filename) +proc readLines*(filename: string): seq[TaintedString] {.deprecated: "use readLines with two arguments".} = + readLines(filename, 1) iterator lines*(filename: string): TaintedString {.tags: [ReadIOEffect].} = ## Iterates over any line in the file named `filename`. diff --git a/tests/vm/tfile_rw.nim b/tests/vm/tfile_rw.nim index 75242794c..8d7a2ca95 100644 --- a/tests/vm/tfile_rw.nim +++ b/tests/vm/tfile_rw.nim @@ -13,7 +13,7 @@ static: writeFile(filename, mytext) const myfile_str = staticRead(filename) const myfile_str2 = readFile(filename) -const myfile_str_seq = staticReadLines(filename, 3) +const myfile_str_seq = readLines(filename, 3) static: doAssert myfile_str == mytext |