Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

Conflicts:
	lib/system/jssys.nim
This commit is contained in:
Araq 2014-02-25 01:06:35 +01:00
commit 10768904eb
36 changed files with 948 additions and 413 deletions

View file

@ -2014,8 +2014,10 @@ when not defined(JS): #and not defined(NimrodVM):
## Flushes `f`'s buffer.
proc readAll*(file: TFile): TaintedString {.tags: [FReadIO].}
## Reads all data from the stream `file`. Raises an IO exception
## in case of an error
## Reads all data from the stream `file`.
##
## Raises an IO exception in case of an error. It is an error if the
## current file position is not at the beginning of the file.
proc readFile*(filename: string): TaintedString {.tags: [FReadIO].}
## Opens a file named `filename` for reading. Then calls `readAll`