ocaml-json: narrow catch-alls and drop verb prefixes on internals

+17 -17

lib/bytesrw/json_bytesrw.ml

··· 117 117 ws : tokbuf; (* Bufferizes whitespace when layout is [true]. *) 118 118 } 119 119 120 - let make_decoder ?(locs = false) ?(layout = false) ?(file = "-") reader = 120 + let decoder ?(locs = false) ?(layout = false) ?(file = "-") reader = 121 121 let overlap = Stdlib.Bytes.create uchar_max_utf8_bytes in 122 122 let token = tokbuf_create 255 and ws = tokbuf_create 255 in 123 123 let meta_none = Json.Meta.make (Loc.(set_file none) file) in ··· 141 141 142 142 (* Decoder positions *) 143 143 144 - let get_last_byte d = 144 + let last_byte_of d = 145 145 if d.u <= 0x7F then d.byte_count - 1 146 146 else if d.u = sot || d.u = eot then d.byte_count 147 147 else ··· 156 156 ~first_line_byte ~last_line_num ~last_line_byte 157 157 158 158 let error_meta d = 159 - let first_byte = get_last_byte d in 159 + let first_byte = last_byte_of d in 160 160 let first_line_num = d.line and first_line_byte = d.line_start in 161 161 Json.Meta.make 162 162 @@ textloc_of_pos d ~first_byte ~last_byte:first_byte ~first_line_num ··· 164 164 ~last_line_byte:first_line_byte 165 165 166 166 let error_meta_to_current ~first_byte ~first_line_num ~first_line_byte d = 167 - let last_byte = get_last_byte d in 167 + let last_byte = last_byte_of d in 168 168 let last_line_num = d.line and last_line_byte = d.line_start in 169 169 Json.Meta.make 170 170 @@ textloc_of_pos d ~first_byte ~last_byte ~first_line_num ~first_line_byte ··· 372 372 buffer content byte-for-byte, without allocating a string. Returns 373 373 the matching mem_dec together with the key string (owned by the 374 374 map). Used as a fast-path for object member dispatch. *) 375 - let find_mem_by_token d mem_decs = 375 + let mem_by_token d mem_decs = 376 376 let r = ref None in 377 377 (try 378 378 String_map.iter ··· 407 407 let textloc_to_current ~first_byte ~first_line_num ~first_line_byte d = 408 408 if not d.locs then Loc.none 409 409 else 410 - let last_byte = get_last_byte d in 410 + let last_byte = last_byte_of d in 411 411 let last_line_num = d.line and last_line_byte = d.line_start in 412 412 textloc_of_pos d ~first_byte ~last_byte ~first_line_num ~first_line_byte 413 413 ~last_line_num ~last_line_byte ··· 417 417 a single byte *) 418 418 if not d.locs then Loc.none 419 419 else 420 - let last_byte = get_last_byte d - 1 in 420 + let last_byte = last_byte_of d - 1 in 421 421 let last_line_num = d.line and last_line_byte = d.line_start in 422 422 textloc_of_pos d ~first_byte ~last_byte ~first_line_num ~first_line_byte 423 423 ~last_line_num ~last_line_byte ··· 447 447 let read_json_const d const = 448 448 (* First character was checked. *) 449 449 let ws_before = ws_pop d in 450 - let first_byte = get_last_byte d in 450 + let first_byte = last_byte_of d in 451 451 let first_line_num = d.line and first_line_byte = d.line_start in 452 452 for i = 1 to Array.length const - 1 do 453 453 nextc d; ··· 504 504 if is_digit d.u then read_digits d else err_exp_digit d 505 505 | _ -> () 506 506 in 507 - let first_byte = get_last_byte d in 507 + let first_byte = last_byte_of d in 508 508 let first_line_num = d.line and first_line_byte = d.line_start in 509 509 let ws_before = ws_pop d in 510 510 token_clear d; ··· 523 523 524 524 let read_json_string d = 525 525 (* d.u is 0x0022 *) 526 - let first_byte = get_last_byte d in 526 + let first_byte = last_byte_of d in 527 527 let first_line_num = d.line and first_line_byte = d.line_start in 528 528 let rec read_uescape d hi uc count = 529 529 if count > 0 then ··· 787 787 and decode_array : type a elt b. decoder -> (a, elt, b) array_map -> a = 788 788 fun d map -> 789 789 let ws_before = ws_pop d in 790 - let first_byte = get_last_byte d in 790 + let first_byte = last_byte_of d in 791 791 let first_line_num = d.line and first_line_byte = d.line_start in 792 792 let b, len = 793 793 match ··· 803 803 try 804 804 while !next do 805 805 begin 806 - let first_byte = get_last_byte d in 806 + let first_byte = last_byte_of d in 807 807 let first_line_num = d.line and first_line_byte = d.line_start in 808 808 try 809 809 if map.dec_skip !i !b then decode d Json.ignore ··· 846 846 and decode_object : type a. decoder -> (a, a) object_map -> a = 847 847 fun d map -> 848 848 let ws_before = ws_pop d in 849 - let first_byte = get_last_byte d in 849 + let first_byte = last_byte_of d in 850 850 let first_line_num = d.line and first_line_byte = d.line_start in 851 851 let dict = 852 852 try ··· 986 986 keys without allocating. Only materialise the name as a 987 987 string if no match was found (for Unknown_keep paths and 988 988 error messages). *) 989 - begin match find_mem_by_token d mem_decs with 989 + begin match mem_by_token d mem_decs with 990 990 | Some (Mem_dec mem, name) -> 991 991 token_clear d; 992 992 let mem_miss = String_map.remove name mem_miss in ··· 1117 1117 1118 1118 let decode' ?layout ?locs ?file t reader = 1119 1119 try 1120 - let d = make_decoder ?layout ?locs ?file reader in 1120 + let d = decoder ?layout ?locs ?file reader in 1121 1121 let v = 1122 1122 nextc d; 1123 1123 decode d t ··· 1145 1145 number_format : string; 1146 1146 } 1147 1147 1148 - let make_encoder ?buf ?(format = Json.Minify) 1148 + let encoder ?buf ?(format = Json.Minify) 1149 1149 ?(number_format = Json.default_number_format) writer = 1150 1150 let o = 1151 1151 match buf with ··· 1471 1471 umap.enc (encode_unknown_mem ~nest map umap e) mems start 1472 1472 1473 1473 let encode' ?buf ?format ?number_format t v ~eod w = 1474 - let e = make_encoder ?buf ?format ?number_format w in 1474 + let e = encoder ?buf ?format ?number_format w in 1475 1475 let t = t in 1476 1476 try 1477 1477 Ok

+6 -6

lib/tape.ml

··· 49 49 50 50 let length t = Bytes.length t.words / 8 51 51 let word_byte_offset i = i * 8 52 - let get_word t i = Bytes.get_int64_le t.words (word_byte_offset i) 52 + let word_at t i = Bytes.get_int64_le t.words (word_byte_offset i) 53 53 let mask56 = 0x00FFFFFFFFFFFFFFL 54 54 55 55 let pack tag payload = ··· 68 68 Fmt.invalid_arg "Tape.tag_at: index %d out of bounds (length %d)" i 69 69 (length t) 70 70 else 71 - match fst (unpack (get_word t i)) with 71 + match fst (unpack (word_at t i)) with 72 72 | Some tg -> tg 73 73 | None -> Fmt.invalid_arg "Tape.tag_at: malformed tag at word %d" i 74 74 75 75 let payload_at t i = 76 76 if i < 0 || i >= length t then 77 77 Fmt.invalid_arg "Tape.payload_at: index %d out of bounds" i 78 - else snd (unpack (get_word t i)) 78 + else snd (unpack (word_at t i)) 79 79 80 80 let string_at t i = 81 81 match tag_at t i with ··· 242 242 let words = Bytes.sub b 8 (wc * 8) in 243 243 let strings = Bytes.sub b (8 + (wc * 8)) sb in 244 244 Ok { words; strings } 245 - with _ -> Error "tape parse error" 245 + with Invalid_argument _ -> Error "tape parse error" 246 246 247 247 (* Debug *) 248 248 249 249 let pp ppf t = 250 250 Format.pp_open_vbox ppf 0; 251 251 for i = 0 to length t - 1 do 252 - let w = get_word t i in 252 + let w = word_at t i in 253 253 let tg_opt, payload = unpack w in 254 254 let tg = match tg_opt with Some t -> tag_char t | None -> '?' in 255 255 Fmt.pf ppf "[%04d] %c %Ld" i tg payload; 256 256 (if tg_opt = Some String then 257 - try Fmt.pf ppf " %S" (string_at t i) with _ -> ()); 257 + try Fmt.pf ppf " %S" (string_at t i) with Invalid_argument _ -> ()); 258 258 if i < length t - 1 then Format.pp_print_cut ppf () 259 259 done; 260 260 Format.pp_close_box ppf ()

+2 -2

test/test_json.ml

··· 159 159 really_input ic b 0 n; 160 160 close_in ic; 161 161 Some (Bytes.unsafe_to_string b) 162 - with _ -> None 162 + with Sys_error _ | End_of_file -> None 163 163 164 164 let corpus_dir = "/tmp/jsont_corpus" 165 165 ··· 168 168 Sys.readdir corpus_dir |> Array.to_list 169 169 |> List.filter (fun n -> Filename.check_suffix n ".json") 170 170 |> List.sort compare 171 - with _ -> [] 171 + with Sys_error _ -> [] 172 172 173 173 let test_corpus_file name () = 174 174 match read_file (Filename.concat corpus_dir name) with

Configure Feed

Configure Feed