Skip to content

Commit 4028514

Browse files
cooldomenarimiran
authored andcommitted
fixes nim-lang#13013, reverts previous changes to readLines() (nim-lang#13036) [backport]
* Revert "remove default argument for readLines (nim-lang#12807) [backport]" This reverts commit c949b81. (cherry picked from commit a3df1b5)
1 parent 8b956db commit 4028514

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

compiler/vmops.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ proc registerAdditionalOps*(c: PCtx) =
143143
wrap1s(fileExists, osop)
144144
wrapDangerous(writeFile, ioop)
145145
wrap1s(readFile, ioop)
146-
wrap2si(staticReadLines, ioop)
146+
wrap2si(readLines, ioop)
147147
systemop getCurrentExceptionMsg
148148
systemop getCurrentException
149149
registerCallback c, "stdlib.*.staticWalkDir", proc (a: VmArgs) {.nimcall.} =

lib/system/io.nim

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,10 +686,10 @@ proc writeFile*(filename, content: string) {.tags: [WriteIOEffect], benign.} =
686686
sysFatal(IOError, "cannot open: " & filename)
687687
688688
689-
proc staticReadLines*(filename: string, n: Natural): seq[TaintedString] =
690-
## Compile time read `n` lines from the file named `filename`. Raises an IO exception
689+
proc readLines*(filename: string, n: Natural): seq[TaintedString] =
690+
## read `n` lines from the file named `filename`. Raises an IO exception
691691
## in case of an error. Raises EOF if file does not contain at least `n` lines.
692-
## A line of text may be delimited by ``LF`` or ``CRLF``.
692+
## Available at compile time. A line of text may be delimited by ``LF`` or ``CRLF``.
693693
## The newline character(s) are not part of the returned strings.
694694
var f: File
695695
if open(f, filename):
@@ -703,6 +703,8 @@ proc staticReadLines*(filename: string, n: Natural): seq[TaintedString] =
703703
else:
704704
sysFatal(IOError, "cannot open: " & filename)
705705
706+
proc readLines*(filename: string): seq[TaintedString] {.deprecated: "use readLines with two arguments".} =
707+
readLines(filename, 1)
706708
707709
iterator lines*(filename: string): TaintedString {.tags: [ReadIOEffect].} =
708710
## Iterates over any line in the file named `filename`.

tests/vm/tfile_rw.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ static:
1313
writeFile(filename, mytext)
1414
const myfile_str = staticRead(filename)
1515
const myfile_str2 = readFile(filename)
16-
const myfile_str_seq = staticReadLines(filename, 3)
16+
const myfile_str_seq = readLines(filename, 3)
1717

1818
static:
1919
doAssert myfile_str == mytext

0 commit comments

Comments
 (0)