Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix placement of `[@inline always]`

master
Demi Obenour 2016-03-21 19:57:18 -04:00
parent 8d5a80f620
commit 1f6722b022
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stdlib/obj.ml
View File

@ -21,8 +21,7 @@ external repr : 'a -> t = "%identity"
external obj : t -> 'a = "%identity"
external magic : 'a -> 'b = "%identity"
external is_int : t -> bool = "%obj_is_int"
let is_block a = not (is_int a)
[@@inline always]
let [@inline always] is_block a = not (is_int a)
external tag : t -> int = "caml_obj_tag"
external set_tag : t -> int -> unit = "caml_obj_set_tag"
external size : t -> int = "%obj_size"
@ -31,10 +30,9 @@ external field : t -> int -> t = "%obj_field"
external set_field : t -> int -> t -> unit = "%obj_set_field"
external array_get: 'a array -> int -> 'a = "%array_safe_get"
external array_set: 'a array -> int -> 'a -> unit = "%array_safe_set"
let double_field x i = array_get (obj x : float array) i
[@@inline always]
let set_double_field x i v = array_set (obj x : float array) i v
[@@inline always]
let [@inline always] double_field x i = array_get (obj x : float array) i
let [@inline always] set_double_field x i v =
array_set (obj x : float array) i v
external new_block : int -> int -> t = "caml_obj_block"
external dup : t -> t = "caml_obj_dup"
external truncate : t -> int -> unit = "caml_obj_truncate"
@ -81,12 +79,10 @@ let extension_constructor x =
if (tag name) = string_tag then (obj slot : extension_constructor)
else invalid_arg "Obj.extension_constructor"
[@@inline always]
let extension_name (slot : extension_constructor) =
let [@inline always] extension_name (slot : extension_constructor) =
(obj (field (repr slot) 0) : string)
[@@inline always]
let extension_id (slot : extension_constructor) =
let [@inline always] extension_id (slot : extension_constructor) =
(obj (field (repr slot) 1) : int)
module Ephemeron = struct

15
stdlib/obj.mli
View File

@ -23,8 +23,7 @@ type t
external repr : 'a -> t = "%identity"
external obj : t -> 'a = "%identity"
external magic : 'a -> 'b = "%identity"
val is_block : t -> bool
[@@inline always]
val [@inline always] is_block : t -> bool
external is_int : t -> bool = "%obj_is_int"
external tag : t -> int = "caml_obj_tag"
external size : t -> int = "%obj_size"
@ -57,10 +56,9 @@ external field : t -> int -> t = "%obj_field"
external set_field : t -> int -> t -> unit = "%obj_set_field"
external set_tag : t -> int -> unit = "caml_obj_set_tag"
val double_field : t -> int -> float (* @since 3.11.2 *)
[@@inline always]
val set_double_field : t -> int -> float -> unit (* @since 3.11.2 *)
[@@inline always]
val [@inline always] double_field : t -> int -> float (* @since 3.11.2 *)
val [@inline always] set_double_field : t -> int -> float -> unit
(* @since 3.11.2 *)
external new_block : int -> int -> t = "caml_obj_block"
external dup : t -> t = "caml_obj_dup"
external truncate : t -> int -> unit = "caml_obj_truncate"
@ -89,9 +87,8 @@ val out_of_heap_tag : int
val unaligned_tag : int (* should never happen @since 3.11.0 *)
val extension_constructor : 'a -> extension_constructor
[@@inline always]
val extension_name : extension_constructor -> string
val extension_id : extension_constructor -> int
val [@inline always] extension_name : extension_constructor -> string
val [@inline always] extension_id : extension_constructor -> int
(** The following two functions are deprecated. Use module {!Marshal}
instead. *)