simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-07 11:45:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix behavior of CCSexp

Browse source 
- allow "\123" escape codes
- allow "\b" escape codes
This commit is contained in:
Simon Cruanes 2016-11-03 20:45:47 +01:00
parent c3e6e798e6
commit 610990e945
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sexp/CCSexp.ml
View file

@ -205,6 +205,7 @@ let parse_string s : t or_error =
(*$T (*$T
CCResult.to_opt (parse_string "(abc d/e/f \"hello \\\" () world\" )") <> None CCResult.to_opt (parse_string "(abc d/e/f \"hello \\\" () world\" )") <> None
CCResult.to_opt (parse_string "(abc ( d e ffff ) \"hello/world\")") <> None CCResult.to_opt (parse_string "(abc ( d e ffff ) \"hello/world\")") <> None
CCResult.to_opt (parse_string "\"\123\bcoucou\"") <> None
*) *)
(*$inject (*$inject

41
src/sexp/CCSexp_lex.mll
View file

@ -14,23 +14,39 @@
let col = start.Lexing.pos_cnum - start.Lexing.pos_bol in let col = start.Lexing.pos_cnum - start.Lexing.pos_bol in
raise (Error (line,col,msg)) raise (Error (line,col,msg))
type unescape_state =
| Not_escaped
| Escaped
| Escaped_int_1 of int
| Escaped_int_2 of int
(* remove quotes + unescape *) (* remove quotes + unescape *)
let remove_quotes lexbuf s = let remove_quotes lexbuf s =
assert (s.[0] = '"' && s.[String.length s - 1] = '"'); assert (s.[0] = '"' && s.[String.length s - 1] = '"');
let buf = Buffer.create (String.length s) in let buf = Buffer.create (String.length s) in
let escaped = ref false in let st = ref Not_escaped in
for i = 1 to String.length s-2 do for i = 1 to String.length s-2 do
match s.[i] with match !st, s.[i] with
| '\\' when !escaped -> Buffer.add_char buf '\\'; escaped := false | Escaped, '\\' -> Buffer.add_char buf '\\'; st := Not_escaped
| '\\' -> escaped := true | Not_escaped, '\\' -> st := Escaped
| 'n' when !escaped -> Buffer.add_char buf '\n'; escaped := false | Escaped, 'n' -> Buffer.add_char buf '\n'; st := Not_escaped
| 'r' when !escaped -> Buffer.add_char buf '\r'; escaped := false | Escaped, 'r' -> Buffer.add_char buf '\r'; st := Not_escaped
| 't' when !escaped -> Buffer.add_char buf '\t'; escaped := false | Escaped, 't' -> Buffer.add_char buf '\t'; st := Not_escaped
| '"' when !escaped -> Buffer.add_char buf '"'; escaped := false | Escaped, 'b' -> Buffer.add_char buf '\b'; st := Not_escaped
| c when !escaped -> error lexbuf (Printf.sprintf "wrong escape `%c`" c) | Escaped, '"' -> Buffer.add_char buf '"'; st := Not_escaped
| c -> Buffer.add_char buf c; | Escaped, ('0'..'9' as c) ->
st := Escaped_int_1 (Char.code c - Char.code '0')
| Escaped_int_1 i, ('0'..'9' as c) ->
st := Escaped_int_2 (10*i+Char.code c - Char.code '0')
| Escaped_int_2 i, ('0'..'9' as c) ->
Buffer.add_char buf (Char.chr (10*i+Char.code c - Char.code '0'));
st := Not_escaped
| (Escaped | Escaped_int_1 _ | Escaped_int_2 _), c ->
error lexbuf (Printf.sprintf "wrong escape `%c`" c)
| Not_escaped, c -> Buffer.add_char buf c;
done; done;
Buffer.contents buf Buffer.contents buf
} }
let newline = '\n' | "\r\n" let newline = '\n' | "\r\n"
@ -40,7 +56,10 @@ let comment_line = ';' [^ '\n']*
let printable_char = [^ '\n'] let printable_char = [^ '\n']
let id = [^ ')' '(' '"' ' ' '\t' '\r' '\n']+ let id = [^ ')' '(' '"' ' ' '\t' '\r' '\n']+
let string = '"' ([^ '"' '\\'] | "\\\"" | "\\\\" | "\\n" | "\\t" | "\\r")* '"' let num = ['0'-'9']
let string_item =
([^ '"' '\\'] | "\\\"" | "\\\\" | "\\b" | "\\n" | "\\t" | "\\r" | '\\' num num num )
let string = '"' string_item* '"'
rule token = parse rule token = parse
| comment_line { token lexbuf } | comment_line { token lexbuf }