Skip to content

prepare for singleton variant -> undefined #3985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobzhang merged 2 commits into from
Nov 24, 2019
Merged

prepare for singleton variant -> undefined #3985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf74e36
prepare for singleton variant -> undefined
bobzhang Nov 24, 2019
547df72
use enhanced pointer info
bobzhang Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jscomp/core/lam.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ let false_ : t =
Lconst (Const_js_false)

let unit : t =
Lconst (Const_pointer( 0, Pt_constructor "()"))
Lconst (Const_pointer( 0, Pt_constructor {name = "()"; cstrs = 1,0}))



Expand Down
4 changes: 2 additions & 2 deletions jscomp/core/lam_compile_util.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let comment_of_tag_info (x : Lam_tag_info.t) =
| Blk_na s -> if s = "" then None else Some s
let comment_of_pointer_info (x : Lam_pointer_info.t)=
match x with
| Pt_constructor x -> Some x
| Pt_variant x -> Some x
| Pt_constructor {name}
| Pt_variant {name} -> Some name
| Pt_module_alias -> None (* FIXME *)
| Pt_na -> None
4 changes: 2 additions & 2 deletions jscomp/core/lam_constant_convert.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ let rec convert_constant ( const : Lambda.structured_constant) : Lam_constant.t
| Const_base (Const_nativeint i) -> (Const_nativeint i)
| Const_pointer(i,p) ->
begin match p with
| Pt_constructor p -> Const_pointer(i, Pt_constructor p)
| Pt_variant p -> Const_pointer(i,Pt_variant p)
| Pt_constructor {name;cstrs} -> Const_pointer(i, Pt_constructor {name; cstrs})
| Pt_variant {name} -> Const_pointer(i,Pt_variant {name})
| Pt_module_alias -> Const_pointer(i, Pt_module_alias)
| Pt_builtin_boolean -> if i = 0 then Const_js_false else Const_js_true
| Pt_shape_none ->
Expand Down
4 changes: 2 additions & 2 deletions jscomp/core/lam_pointer_info.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


type t =
| Pt_constructor of string
| Pt_variant of string
| Pt_constructor of {name : string ; cstrs : int * int}
| Pt_variant of {name : string }
| Pt_module_alias
| Pt_na
4 changes: 2 additions & 2 deletions jscomp/core/lam_pointer_info.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@


type t =
| Pt_constructor of string
| Pt_variant of string
| Pt_constructor of {name : string ; cstrs : int * int}
| Pt_variant of { name : string}
| Pt_module_alias
| Pt_na
2 changes: 1 addition & 1 deletion jscomp/runtime/release.ninja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ build runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml_bui
build runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
build runtime/caml_gc.cmj : cc_cmi runtime/caml_gc.ml | runtime/caml_gc.cmi
build runtime/caml_gc.cmi : cc runtime/caml_gc.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
build runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/caml_obj_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
build runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.ml | runtime/caml_builtin_exceptions.cmj runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/caml_obj_extern.cmj runtime/js.cmj
build runtime/caml_hash.cmi : cc runtime/caml_hash.mli | runtime/bs_stdlib_mini.cmi runtime/caml_obj_extern.cmj runtime/js.cmi runtime/js.cmj
build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml | runtime/caml_char.cmj runtime/caml_hash_primitive.cmi runtime/caml_int32.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
Expand Down
1 change: 1 addition & 0 deletions jscomp/test/build.ninja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ build test/simple_derive_use.cmi : cc test/simple_derive_use.mli | $stdlib
build test/simple_lexer_test.cmi test/simple_lexer_test.cmj : cc test/simple_lexer_test.ml | test/mt.cmj $stdlib
build test/simplify_lambda_632o.cmi test/simplify_lambda_632o.cmj : cc test/simplify_lambda_632o.ml | $stdlib
build test/single_module_alias.cmi test/single_module_alias.cmj : cc test/single_module_alias.ml | $stdlib
build test/singular_unit_test.cmi test/singular_unit_test.cmj : cc test/singular_unit_test.ml | $stdlib
build test/small_inline_test.cmi test/small_inline_test.cmj : cc test/small_inline_test.ml | $stdlib
build test/splice_test.cmi test/splice_test.cmj : cc test/splice_test.ml | test/mt.cmj $stdlib
build test/sprintf_reg_test.cmi test/sprintf_reg_test.cmj : cc test/sprintf_reg_test.ml | test/mt.cmj test/mt_global.cmj $stdlib
Expand Down
10 changes: 5 additions & 5 deletions jscomp/test/class3_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ function vpoint_init($$class) {
var move = ids[0];
var get_x = ids[1];
var x = ids[2];
var inh = CamlinternalOO.inherits($$class, 0, shared$5, /* array */["get_offset"], abstract_point, 1);
var inh = CamlinternalOO.inherits($$class, 0, shared$5, /* array */["get_offset"], abstract_point, true);
var obj_init = inh[0];
CamlinternalOO.set_methods($$class, /* array */[
get_x,
Expand Down Expand Up @@ -404,7 +404,7 @@ var abstract_point2 = /* class */[
function point2_init($$class) {
var x_init = CamlinternalOO.new_variable($$class, "");
var get_offset = CamlinternalOO.get_method_label($$class, "get_offset");
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$8, abstract_point2, 1);
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$8, abstract_point2, true);
var obj_init = inh[0];
var x = inh[1];
CamlinternalOO.set_method($$class, get_offset, (function (self$10) {
Expand Down Expand Up @@ -482,7 +482,7 @@ eq("File \"class3_test.ml\", line 144, characters 12-19", h$2, 1);
function point_again_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
CamlinternalOO.get_method_label($$class, "move");
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
var obj_init = inh[0];
return (function (env, self, x$1) {
var self$1 = CamlinternalOO.create_object_opt(self, $$class);
Expand All @@ -508,7 +508,7 @@ eq("File \"class3_test.ml\", line 161, characters 12-19", hh, 8);

function point_again2_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
var obj_init = inh[0];
return (function (env, self, x$1) {
var self$1 = CamlinternalOO.create_object_opt(self, $$class);
Expand All @@ -535,7 +535,7 @@ eq("File \"class3_test.ml\", line 177, characters 12-19", hhh, 35);
function point_again3_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
var move = CamlinternalOO.get_method_label($$class, "move");
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, 1);
var inh = CamlinternalOO.inherits($$class, shared$3, 0, shared$7, restricted_point, true);
var obj_init = inh[0];
var move$1 = inh[4];
CamlinternalOO.set_method($$class, move, Curry.__1(move$1));
Expand Down
8 changes: 4 additions & 4 deletions jscomp/test/class4_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function restricted_point_init($$class) {
var restricted_point = CamlinternalOO.make_class(shared$2, restricted_point_init);

function restricted_point$prime_init($$class) {
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, 1);
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, true);
var obj_init = inh[0];
return (function (env, self, x) {
return Curry._2(obj_init, self, x);
Expand All @@ -90,7 +90,7 @@ function restricted_point$prime_init($$class) {
var restricted_point$prime = CamlinternalOO.make_class(shared$2, restricted_point$prime_init);

function restricted_point2$prime_init($$class) {
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, 1);
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$2, restricted_point, true);
var obj_init = inh[0];
return (function (env, self, x) {
return Curry._2(obj_init, self, x);
Expand Down Expand Up @@ -135,7 +135,7 @@ function point_init($$class) {
var move = ids[0];
var get_x = ids[1];
var x = ids[2];
var inh = CamlinternalOO.inherits($$class, 0, shared$1, /* array */["get_offset"], abstract_point, 1);
var inh = CamlinternalOO.inherits($$class, 0, shared$1, /* array */["get_offset"], abstract_point, true);
var obj_init = inh[0];
CamlinternalOO.set_methods($$class, /* array */[
get_x,
Expand Down Expand Up @@ -173,7 +173,7 @@ function colored_point_init($$class) {
"get_offset",
"get_x",
"move"
], point, 1);
], point, true);
var obj_init = inh[0];
CamlinternalOO.set_method($$class, color, (function (self$7) {
return self$7[c$1];
Expand Down
4 changes: 2 additions & 2 deletions jscomp/test/class5_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function printable_colored_point_init($$class) {
"get_x",
"move",
"print"
], printable_point, 1);
], printable_point, true);
var obj_init = inh[0];
var print$1 = inh[4];
CamlinternalOO.set_method($$class, print, (function (self$2) {
Expand Down Expand Up @@ -289,7 +289,7 @@ function distance_point_init($$class) {
var inh = CamlinternalOO.inherits($$class, shared$1, 0, /* array */[
"get_x",
"move"
], point, 1);
], point, true);
var obj_init = inh[0];
var x$1 = inh[1];
CamlinternalOO.set_method($$class, distance, (function (self$7, other) {
Expand Down
4 changes: 2 additions & 2 deletions jscomp/test/class6_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function colored_point_init($$class) {
var inh = CamlinternalOO.inherits($$class, shared, 0, /* array */[
"get_x",
"move"
], point, 1);
], point, true);
var obj_init = inh[0];
CamlinternalOO.set_method($$class, color, (function (self$2) {
return self$2[c$1];
Expand Down Expand Up @@ -144,7 +144,7 @@ function d_init($$class) {
]);
var n = ids[0];
var as_c = ids[1];
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$1, c, 1);
var inh = CamlinternalOO.inherits($$class, 0, 0, shared$1, c, true);
var obj_init = inh[0];
CamlinternalOO.set_methods($$class, /* array */[
n,
Expand Down
8 changes: 4 additions & 4 deletions jscomp/test/class7_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ var backup = CamlinternalOO.make_class(shared$5, backup_init);

function backup_ref_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
var inh = CamlinternalOO.inherits($$class, shared$2, 0, shared$6, ref, 1);
var inh = CamlinternalOO.inherits($$class, shared$2, 0, shared$6, ref, true);
var obj_init = inh[0];
var inh$1 = CamlinternalOO.inherits($$class, shared$3, 0, /* array */[
"restore",
"save"
], backup, 1);
], backup, true);
var obj_init$1 = inh$1[0];
return (function (env, self, x$1) {
var self$1 = CamlinternalOO.create_object_opt(self, $$class);
Expand Down Expand Up @@ -269,13 +269,13 @@ var backup2 = CamlinternalOO.make_class(/* array */[

function backup_ref2_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
var inh = CamlinternalOO.inherits($$class, shared$2, 0, shared$6, ref, 1);
var inh = CamlinternalOO.inherits($$class, shared$2, 0, shared$6, ref, true);
var obj_init = inh[0];
var inh$1 = CamlinternalOO.inherits($$class, shared$3, 0, /* array */[
"clear",
"restore",
"save"
], backup2, 1);
], backup2, true);
var obj_init$1 = inh$1[0];
return (function (env, self, x$1) {
var self$1 = CamlinternalOO.create_object_opt(self, $$class);
Expand Down
4 changes: 2 additions & 2 deletions jscomp/test/class8_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function money_init($$class) {
var value = ids[0];
var leq = ids[1];
var repr = ids[2];
var inh = CamlinternalOO.inherits($$class, 0, /* array */["leq"], 0, comparable, 1);
var inh = CamlinternalOO.inherits($$class, 0, /* array */["leq"], 0, comparable, true);
var obj_init = inh[0];
CamlinternalOO.set_methods($$class, /* array */[
value,
Expand All @@ -75,7 +75,7 @@ var money = CamlinternalOO.make_class(shared, money_init);
function money2_init($$class) {
var x = CamlinternalOO.new_variable($$class, "");
var times = CamlinternalOO.get_method_label($$class, "times");
var inh = CamlinternalOO.inherits($$class, shared$1, 0, shared, money, 1);
var inh = CamlinternalOO.inherits($$class, shared$1, 0, shared, money, true);
var obj_init = inh[0];
var repr = inh[1];
CamlinternalOO.set_method($$class, times, (function (self$3, k) {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/test/class_fib_open_recursion_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function memo_fib_init($$class) {
var ids = CamlinternalOO.new_methods_variables($$class, shared, /* array */["cache"]);
var calc = ids[0];
var cache = ids[1];
var inh = CamlinternalOO.inherits($$class, 0, 0, shared, fib, 1);
var inh = CamlinternalOO.inherits($$class, 0, 0, shared, fib, true);
var obj_init = inh[0];
var calc$1 = inh[1];
CamlinternalOO.set_method($$class, calc, (function (self$2, x) {
Expand Down
Loading