diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2017-09-28 21:52:45 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-09-28 21:52:45 +0200 |
| commit | 599c429fdd2a75f1f1a66ffb9625208bff63298f (patch) | |
| tree | 1849af174c29188ea5f09bcd2c0d6c117d124734 | |
| parent | f151b7efd169c740e8a971c8b39eeb71ec9007e4 (diff) | |
| parent | 5ae82708aabb8c127aaa1694e384919dd7ac229a (diff) | |
| download | Nim-599c429fdd2a75f1f1a66ffb9625208bff63298f.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
| -rw-r--r-- | lib/pure/json.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pure/json.nim b/lib/pure/json.nim index f02bdbf08..656114fb1 100644 --- a/lib/pure/json.nim +++ b/lib/pure/json.nim @@ -1214,7 +1214,7 @@ proc parseJson(p: var JsonParser): JsonNode = raiseParseErr(p, "{") when not defined(js): - proc parseJson*(s: Stream, filename: string): JsonNode = + proc parseJson*(s: Stream, filename: string = ""): JsonNode = ## Parses from a stream `s` into a `JsonNode`. `filename` is only needed ## for nice error messages. ## If `s` contains extra data, it will raise `JsonParsingError`. |