mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-04-05 06:46:56 +00:00
Code Issues 1 Releases Wiki Activity

Ensure no carriage returns end up in doc strings.

Browse Source
This commit is contained in:
Calvin Rose 2019-07-12 09:14:37 -04:00
parent 2e6ee39506
commit e528b86a2a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/boot.janet
View File

@ -1080,7 +1080,7 @@
"Read all data from a file with name path
and then close the file."
[path]
(def f (file/open path :r))
(def f (file/open path :rb))
(if-not f (error (string "could not open file " path)))
(def contents (file/read f :all))
(file/close f)
@ -1090,7 +1090,7 @@
"Write contents to a file at path.
Can optionally append to the file."
[path contents &opt mode]
(default mode :w)
(default mode :wb)
(def f (file/open path mode))
(if-not f (error (string "could not open file " path " with mode " mode)))
(file/write f contents)
@ -1633,7 +1633,7 @@
(defglobal "fexists" (fn fexists [path] (= :file (stat path :mode)))))
(defglobal "fexists"
(fn fexists [path]
(def f (file/open path))
(def f (file/open path :rb))
(when f
(def res
(try (do (file/read f 1) true)
@ -1699,7 +1699,7 @@
:compile-only compile-only} (table ;args))
(def f (if (= (type path) :core/file)
path
(file/open path)))
(file/open path :rb)))
(default env (make-env))
(put env :current-file (string path))
(defn chunks [buf _] (file/read f 2048 buf))
@ -1891,7 +1891,7 @@ _fiber is bound to the suspended fiber
# can be compiled and linked statically into the main janet library
# and example client.
(def chunks (string/bytes image))
(def image-file (file/open (process/args 1) :w))
(def image-file (file/open (process/args 1) :wb))
(file/write image-file
"#ifndef JANET_AMALG\n"
"#include <janet.h>\n"

2
src/core/parse.c
View File

@ -294,7 +294,7 @@ static int stringchar(JanetParser *p, JanetParseState *state, uint8_t c) {
return stringend(p, state);
}
/* normal char */
if (c != '\n')
if (c != '\n' && c != '\r')
push_buf(p, c);
return 1;
}

4
test/suite7.janet
View File

@ -126,4 +126,8 @@
(assert (= (type (buffer-float64-view 0)) :number) "issue #142 nanbox hijack 2")
(assert (= (type (unmarshal @"\xC8\xbc\x9axV4\x92\xfe\xff")) :number) "issue #142 nanbox hijack 3")
# Make sure Carriage Returns don't end up in doc strings.
(assert (not (string/find "\r" (get ((fiber/getenv (fiber/current)) 'cond) :doc))) "no \\r in doc strings")
(end-suite)