kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-10-10 20:38:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #427 from dubek/ocaml-fix-unterminated-string

Browse Source 
ocaml: Fix reading of unterminated strings that happen to end with '"'.
This commit is contained in:
Joel Martin 2019-07-24 11:18:26 -05:00 committed by GitHub
commit 7303226945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ocaml/reader.ml
View File

@ -19,6 +19,7 @@ let gsub re f str =
(Str.full_split re str))
let token_re = (Str.regexp "~@\\|[][{}()'`~^@]\\|\"\\(\\\\.\\|[^\"]\\)*\"?\\|;.*\\|[^][ \n{}('\"`,;)]*")
let string_re = (Str.regexp "\"\\(\\\\.\\|[^\\\\\"]\\)*\"")
type reader = {
form : Types.mal_type;
@ -30,6 +31,18 @@ type list_reader = {
tokens : string list;
}
let unescape_string token =
if Str.string_match string_re token 0
then
let without_quotes = String.sub token 1 ((String.length token) - 2) in
gsub (Str.regexp "\\\\.")
(function | "\\n" -> "\n" | x -> String.sub x 1 1)
without_quotes
else
(output_string stderr ("expected '\"', got EOF\n");
flush stderr;
raise End_of_file)
let read_atom token =
match token with
| "nil" -> T.Nil
@ -43,15 +56,7 @@ let read_atom token =
| _ -> (match token.[1] with
| '0'..'9' -> T.Int (int_of_string token)
| _ -> Types.symbol token))
| '"' -> (match token.[String.length token - 1] with
| '"' -> T.String (gsub (Str.regexp "\\\\.")
(function
| "\\n" -> "\n"
| x -> String.sub x 1 1)
(String.sub token 1 ((String.length token) - 2)))
| _ -> output_string stderr ("expected '\"', got EOF\n");
flush stderr;
raise End_of_file)
| '"' -> T.String (unescape_string token)
| ':' -> T.Keyword (Str.replace_first (Str.regexp "^:") "" token)
| _ -> Types.symbol token