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

some bugfixes in Sexp

Browse source
This commit is contained in:
Simon Cruanes 2014-09-17 01:35:15 +02:00
parent c946a4ea26
commit 3615d208dc
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
misc/sexp.ml
View file

@ -46,7 +46,7 @@ let _must_escape s =
for i = 0 to String.length s - 1 do for i = 0 to String.length s - 1 do
let c = String.unsafe_get s i in let c = String.unsafe_get s i in
match c with match c with
| ' ' | ')' | '(' | '\n' | '\t' -> raise Exit | ' ' | ')' | '(' | '"' | '\n' | '\t' -> raise Exit
| _ -> () | _ -> ()
done; done;
false false
@ -141,6 +141,7 @@ module Streaming = struct
) else ( ) else (
let c = Buffer.nth d.buf d.i in let c = Buffer.nth d.buf d.i in
d.i <- d.i + 1; d.i <- d.i + 1;
d.col <- d.col + 1;
c c
) )
@ -160,13 +161,18 @@ module Streaming = struct
d.st <- St_error msg'; d.st <- St_error msg';
raise (Error msg') raise (Error msg')
let _end d =
d.st <- St_end;
raise EOI
(* next token *) (* next token *)
let rec _next d st = match st with let rec _next d st = match st with
| St_error msg -> raise (Error msg) | St_error msg -> raise (Error msg)
| St_end -> raise EOI | St_end -> _end d
| St_yield x -> | St_yield x ->
(* yield the given token, then start a fresh one *) (* yield the given token, then start a fresh one *)
_yield d St_start x _yield d St_start x
| St_start when d.stop -> _end d
| St_start -> | St_start ->
(* start reading next token *) (* start reading next token *)
let c = _next_char d in let c = _next_char d in
@ -196,7 +202,8 @@ module Streaming = struct
| '(' -> | '(' ->
let a = _take_buffer d.atom in let a = _take_buffer d.atom in
_yield d (St_yield Open) (Atom a) _yield d (St_yield Open) (Atom a)
| '\\' -> _error d "unexpected char" | '"' -> _error d "unexpected \""
| '\\' -> _error d "unexpected \\"
| _ -> | _ ->
Buffer.add_char d.atom c; Buffer.add_char d.atom c;
_next d St_atom _next d St_atom
@ -214,7 +221,7 @@ module Streaming = struct
_yield d St_start (Atom a) _yield d St_start (Atom a)
| _ -> | _ ->
Buffer.add_char d.atom c; Buffer.add_char d.atom c;
_next d St_atom _next d St_quoted
end end
| St_escaped -> | St_escaped ->
if d.stop if d.stop
@ -225,6 +232,7 @@ module Streaming = struct
| 'n' -> '\n' | 'n' -> '\n'
| 't' -> '\t' | 't' -> '\t'
| 'r' -> '\r' | 'r' -> '\r'
| '"' -> '"'
| '\\' -> '\\' | '\\' -> '\\'
| _ -> _error d "unexpected escaped character" | _ -> _error d "unexpected escaped character"
); );
@ -237,8 +245,6 @@ module Streaming = struct
let reached_end d = let reached_end d =
d.stop <- true d.stop <- true
let next_exn d = _next d d.st
let next d = let next d =
try try
`Ok (_next d d.st) `Ok (_next d d.st)