Skip to content

Commit e1f9beb

Browse files
authored
Merge pull request #4704 from rescript-lang/fix_native_int_removal_issues
snapshot after removal
2 parents 4edb439 + aacbdf8 commit e1f9beb

File tree

10 files changed

+14
-182
lines changed

10 files changed

+14
-182
lines changed

jscomp/build_tests/ocamlgraph/libx/bitv.ml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,7 @@ let to_int64_us _ = failwith "todo"
595595
let of_int64_s _ = failwith "todo"
596596
let to_int64_s _ = failwith "todo"
597597

598+
#if 0 then
598599
(* [Nativeint] *)
599600
let select_of f32 f64 = match Sys.word_size with
600601
| 32 -> (fun i -> f32 (Nativeint.to_int32 i))
@@ -608,3 +609,4 @@ let select_to f32 f64 = match Sys.word_size with
608609
| _ -> assert false
609610
let to_nativeint_s = select_to to_int32_s to_int64_s
610611
let to_nativeint_us = select_to to_int32_us to_int64_us
612+
#end

jscomp/build_tests/ocamlgraph/libx/bitv.mli

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,13 @@ val of_int64_s : Int64.t -> t
183183
val to_int64_s : t -> Int64.t
184184
val of_int64_us : Int64.t -> t
185185
val to_int64_us : t -> Int64.t
186+
#if 0 then
186187
(* type [Nativeint.t] (length 32/64 with sign, 31/63 without) *)
187188
val of_nativeint_s : Nativeint.t -> t
188189
val to_nativeint_s : t -> Nativeint.t
189190
val of_nativeint_us : Nativeint.t -> t
190191
val to_nativeint_us : t -> Nativeint.t
191-
192+
#end
192193
(*s Only if you know what you are doing... *)
193194

194195
val unsafe_set : t -> int -> bool -> unit

jscomp/main/builtin_cmi_datasets.ml

Lines changed: 1 addition & 3 deletions
Large diffs are not rendered by default.

jscomp/main/builtin_cmj_datasets.ml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(* 4547a40f91f713746ee61ab7699f92f8 *)
1+
(* ba272ef6ec9c8d46455800ab2cc344fc *)
22
let module_names : string array = Obj.magic (
33
"Js" (* 23 *),
44
"Arg" (* 289 *),
@@ -65,7 +65,6 @@ let module_names : string array = Obj.magic (
6565
"Js_result" (* 23 *),
6666
"Js_string" (* 23 *),
6767
"Js_vector" (* 528 *),
68-
"Nativeint" (* 513 *),
6968
"Node_path" (* 23 *),
7069
"StdLabels" (* 23 *),
7170
"Belt_Array" (* 1149 *),
@@ -198,7 +197,6 @@ let module_data : string array = Obj.magic (
198197
(* Js_result *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
199198
(* Js_string *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
200199
(* Js_vector *)"\132\149\166\190\000\000\001\252\000\000\000\157\000\000\001\255\000\000\001\233\160\b\000\0008\000\176#map\144\160\160B@@@\176$copy\144\160\160A@@@\176$init\144\160\160B@@@\176$iter\144\160\160B@@@\176$mapi\144\160\160B@@@\176%empty\144\160\160A@@\144\148\192A\160\176\001\004\146!a@@\174\151\176\181&splice\160\160AA\160\160A@@\197&splice@@@\160\144\004\015\160\146\160@@@\176\1923others/js_vector.mlt\001\bY\001\b[\192\004\002t\001\bY\001\b\127@\146A\160BA\176%iteri\144\160\160B@@@\176&append\144\160\160B@@\144\148\192B\160\176\001\004\204!x@\160\176\001\004\205!a@@\151\176\181&concat\160\160AA\160\004\002@\197&concat@@@\160\144\004\r\160\151\176e\160\144\004\021@\176\192\004)\001\000\140\001\015S\001\015h\192\004*\001\000\140\001\015S\001\015m@@\176\192\004,\001\000\140\001\015S\001\015U\004\003@\160BA\176&toList\144\160\160A@@@\176(foldLeft\144\160\160C@@@\176(memByRef\144\160\160B@@@\176(pushBack\144\160\160B@@\144\148\192B\160\176\001\004\148!x@\160\176\001\004\149\"xs@@\174\151\176\181$push\160\0044\160\0045@\197$push@@@\160\144\004\r\160\144\004\018@\176\192\004Yw\001\b\159\001\b\161\192\004Zw\001\b\159\001\b\180@\004X\160BA\176)foldRight\144\160\160C@@@\176-filterInPlace\144\160\160B@@@A",
201-
(* Nativeint *)"\132\149\166\190\000\000\001\237\000\000\000\141\000\000\001\192\000\000\001\175\160\b\000\000 \000\176#abs\144\160\160A@@@\176$pred\144\160\160A@@\144\148\192A\160\176\001\004\002!n@@\151\176\b\000\000\004\018@\160\144\004\007\160\146\151\018_n\000\001\000\000\000\001@\176\1927stdlib-406/nativeint.mlm\001\t\227\001\t\240\192\004\002m\001\t\227\001\t\248@\160BA\176$succ\144\160\160A@@\144\148\192A\160\176\001\004\000!n@@\151\176\b\000\000\004\017@\160\144\004\007\160\146\151\018_n\000\001\000\000\000\001@\176\192\004\025l\001\t\205\001\t\218\192\004\026l\001\t\205\001\t\226@\160BA\176%equal\144\160\160B@@@\176&lognot\144\160\160A@@\144\148\192A\160\176\001\004\t!n@@\151\176\b\000\000\004\024@\160\144\004\007\160\146\151\018_n\000\001\255\255\255\255@\176\192\0046x\001\011\005\001\011\020\192\0047x\001\011\005\001\011\"@\160BA\176'compare\144\160\160B@@\144\148\192B\160\176\001\004\018!x@\160\176\001\004\019!y@@\151\176\1486caml_nativeint_compare\160\144\004\011\160\144\004\n@\176\192\004P\000F\001\012i\001\012\133\192\004Q\000F\001\012i\001\012\155@\160BA\176)to_string\144\160\160A@@\144\148\192A\160\176\001\004\012!n@@\151\176\1485caml_nativeint_format\160\146\146\"%d\160\144\004\012@\176\192\004i{\001\011n\001\011\128\192\004j{\001\011n\001\011\141@\160BA\176-of_string_opt\144\160\160A@@@A",
202200
(* Node_path *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
203201
(* StdLabels *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
204202
(* Belt_Array *)"\132\149\166\190\000\000\004i\000\000\001L\000\000\004K\000\000\004\000\160\b\000\001\b\000\176\"eq\144\160\160C@@@\176#cmp\144\160\160C@@@\176#eqU\144\160\160C@@@\176#get\144\160\160B@@@\176#map\144\160\160B@@@\176#set\144\160\160C@@@\176#zip\144\160\160B@@@\176$blit\144\160\160E@@@\176$cmpU\144\160\160C@@@\176$fill\144\160\160D@@@\176$keep\144\160\160B@@@\176$make\144\160\160B@@@\176$mapU\144\160\160B@@@\176$some\144\160\160B@@@\176%every\144\160\160B@@@\176%getBy\144\160\160B@@@\176%keepU\144\160\160B@@@\176%range\144\160\160B@@@\176%slice\144\160\160C@@@\176%some2\144\160\160C@@@\176%someU\144\160\160B@@@\176%unzip\144\160\160A@@@\176%zipBy\144\160\160C@@@\176&concat\144\160\160B@@@\176&every2\144\160\160C@@@\176&everyU\144\160\160B@@@\176&getByU\144\160\160B@@@\176&getExn\144\160\160B@@@\176&makeBy\144\160\160B@@@\176&reduce\144\160\160C@@@\176&setExn\144\160\160C@@@\176&some2U\144\160\160C@@@\176&zipByU\144\160\160C@@@\176'every2U\144\160\160C@@@\176'forEach\144\160\160B@@@\176'keepMap\144\160\160B@@@\176'makeByU\144\160\160B@@@\176'rangeBy\144\160\160C@@@\176'reduceU\144\160\160C@@@\176'reverse\144\160\160A@@@\176'shuffle\144\160\160A@@@\176(forEachU\144\160\160B@@@\176(keepMapU\144\160\160B@@@\176)partition\144\160\160B@@@\176*blitUnsafe\144\160\160E@@@\176*concatMany\144\160\160A@@@\176*getIndexBy\144\160\160B@@@\176*partitionU\144\160\160B@@@\176*sliceToEnd\144\160\160B@@@\176+getIndexByU\144\160\160B@@@\176,mapWithIndex\144\160\160B@@@\176-keepWithIndex\144\160\160B@@@\176-mapWithIndexU\144\160\160B@@@\176-reduceReverse\144\160\160C@@@\176.keepWithIndexU\144\160\160B@@@\176.reduceReverse2\144\160\160D@@@\176.reduceReverseU\144\160\160C@@@\176.reverseInPlace\144\160\160A@@@\176.shuffleInPlace\144\160\160A@@@\176/reduceReverse2U\144\160\160D@@@\176/reduceWithIndex\144\160\160C@@@\1760forEachWithIndex\144\160\160B@@@\1760makeByAndShuffle\144\160\160B@@@\1760reduceWithIndexU\144\160\160C@@@\1761forEachWithIndexU\144\160\160B@@@\1761makeByAndShuffleU\144\160\160B@@@A",

jscomp/test/ocaml_typedtree_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var Process = require("process");
2525
var Caml_obj = require("../../lib/js/caml_obj.js");
2626
var Caml_sys = require("../../lib/js/caml_sys.js");
2727
var Filename = require("../../lib/js/filename.js");
28-
var Nativeint = require("../../lib/js/nativeint.js");
28+
var Nativeint = require("./nativeint.js");
2929
var Caml_array = require("../../lib/js/caml_array.js");
3030
var Caml_bytes = require("../../lib/js/caml_bytes.js");
3131
var Caml_int64 = require("../../lib/js/caml_int64.js");

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 2 additions & 6 deletions
Large diffs are not rendered by default.

lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 2 additions & 6 deletions
Large diffs are not rendered by default.

lib/4.06.1/whole_compiler.ml

Lines changed: 3 additions & 7 deletions
Large diffs are not rendered by default.

lib/es6/nativeint.js

Lines changed: 0 additions & 79 deletions
This file was deleted.

lib/js/nativeint.js

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)