Skip to content

Commit 6541ab7

Browse files
bobzhangbobzhang
committed
Add expected js changes
1 parent 0bfddc5 commit 6541ab7

16 files changed

+68
-68
lines changed

‎jscomp/test/basic_module_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ var Mt_global = require("./mt_global.js");
99
var count = /* record */[/* contents */0];
1010

1111
var M = {
12-
Set: Offset.M.Set
12+
$$Set: Offset.M.$$Set
1313
};
1414

1515
function test(set) {
16-
count[0] = Curry._1(M.Set.cardinal, set) + count[0] | 0;
16+
count[0] = Curry._1(M.$$Set.cardinal, set) + count[0] | 0;
1717
return /* () */0;
1818
}
1919

20-
test(Curry._1(Offset.M.Set.singleton, "42"));
20+
test(Curry._1(Offset.M.$$Set.singleton, "42"));
2121

2222
var suites = /* record */[/* contents : [] */0];
2323

‎jscomp/test/class4_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function restricted_point2$prime_init($$class) {
9696
var restricted_point2$prime = CamlinternalOO.make_class(shared$2, restricted_point2$prime_init);
9797

9898
var Point = {
99-
"restricted_point'": restricted_point
99+
restricted_point$prime: restricted_point
100100
};
101101

102102
function abstract_point_001($$class) {

‎jscomp/test/gpr_3519_jsx_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
var React = {
5-
null: /* () */0
5+
$$null: /* () */0
66
};
77

88
function make(param, param$1) {

‎jscomp/test/mario_game.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ function $$process(part) {
788788
var Particle = {
789789
make: make$1,
790790
make_score: make_score,
791-
process: $$process
791+
$$process: $$process
792792
};
793793

794794
var id_counter = /* record */[/* contents */Pervasives.min_int];

‎jscomp/test/ocaml_parsetree_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3211,7 +3211,7 @@ var Ast_helper_Exp = {
32113211
pack: pack,
32123212
open_: open_,
32133213
extension: extension,
3214-
case: $$case
3214+
$$case: $$case
32153215
};
32163216

32173217
var Ast_helper_Ctf = {
@@ -7072,13 +7072,13 @@ var yyact = /* array */[
70727072
(function (__caml_parser_env) {
70737073
var _1 = Parsing.peek_val(__caml_parser_env, 2);
70747074
var _3 = Parsing.peek_val(__caml_parser_env, 0);
7075-
return Curry._3(Ast_helper_Exp.case, _1, undefined, _3);
7075+
return Curry._3(Ast_helper_Exp.$$case, _1, undefined, _3);
70767076
}),
70777077
(function (__caml_parser_env) {
70787078
var _1 = Parsing.peek_val(__caml_parser_env, 4);
70797079
var _3 = Parsing.peek_val(__caml_parser_env, 2);
70807080
var _5 = Parsing.peek_val(__caml_parser_env, 0);
7081-
return Curry._3(Ast_helper_Exp.case, _1, _3, _5);
7081+
return Curry._3(Ast_helper_Exp.$$case, _1, _3, _5);
70827082
}),
70837083
(function (__caml_parser_env) {
70847084
return Parsing.peek_val(__caml_parser_env, 0);

‎jscomp/test/ocaml_re_test.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ function status(s) {
13771377
}
13781378

13791379
var Re_automata_Category = {
1380-
"++": $plus$plus,
1380+
$plus$plus: $plus$plus,
13811381
from_char: from_char,
13821382
inexistant: 1,
13831383
letter: 2,
@@ -1411,7 +1411,7 @@ function category(re, c) {
14111411
if (c === -1) {
14121412
return Re_automata_Category.inexistant;
14131413
} else if (c === re[/* lnl */5]) {
1414-
return Curry._2(Re_automata_Category["++"], Curry._2(Re_automata_Category["++"], Re_automata_Category.lastnewline, Re_automata_Category.newline), Re_automata_Category.not_letter);
1414+
return Curry._2(Re_automata_Category.$plus$plus, Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.lastnewline, Re_automata_Category.newline), Re_automata_Category.not_letter);
14151415
} else {
14161416
return Curry._1(Re_automata_Category.from_char, Caml_bytes.get(re[/* col_repr */3], c));
14171417
}
@@ -2163,27 +2163,27 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _par
21632163
if (typeof param === "number") {
21642164
switch (param) {
21652165
case /* Beg_of_line */0 :
2166-
var c$1 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.newline);
2166+
var c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
21672167
return /* tuple */[
21682168
mk_expr(ids, /* After */Block.__(7, [c$1])),
21692169
kind
21702170
];
21712171
case /* End_of_line */1 :
2172-
var c$2 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.newline);
2172+
var c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
21732173
return /* tuple */[
21742174
mk_expr(ids, /* Before */Block.__(6, [c$2])),
21752175
kind
21762176
];
21772177
case /* Beg_of_word */2 :
2178-
var c$3 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.not_letter);
2179-
var c$4 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.letter);
2178+
var c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
2179+
var c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
21802180
return /* tuple */[
21812181
seq$1(ids, /* First */332064784, mk_expr(ids, /* After */Block.__(7, [c$3])), mk_expr(ids, /* Before */Block.__(6, [c$4]))),
21822182
kind
21832183
];
21842184
case /* End_of_word */3 :
2185-
var c$5 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.letter);
2186-
var c$6 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.not_letter);
2185+
var c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
2186+
var c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
21872187
return /* tuple */[
21882188
seq$1(ids, /* First */332064784, mk_expr(ids, /* After */Block.__(7, [c$5])), mk_expr(ids, /* Before */Block.__(6, [c$6]))),
21892189
kind
@@ -2210,7 +2210,7 @@ function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _par
22102210
kind
22112211
];
22122212
case /* Last_end_of_line */7 :
2213-
var c$7 = Curry._2(Re_automata_Category["++"], Re_automata_Category.inexistant, Re_automata_Category.lastnewline);
2213+
var c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline);
22142214
return /* tuple */[
22152215
mk_expr(ids, /* Before */Block.__(6, [c$7])),
22162216
kind
@@ -2900,14 +2900,14 @@ function exec_internal(name, $staropt$star, $staropt$star$1, groups, re, s) {
29002900
/* pos */pos$1,
29012901
/* last */last
29022902
];
2903-
var initial_cat = pos$1 === 0 ? Curry._2(Re_automata_Category["++"], Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category["++"], Re_automata_Category.search_boundary, category(re$1, get_color(re$1, s$1, pos$1 - 1 | 0)));
2903+
var initial_cat = pos$1 === 0 ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re$1, get_color(re$1, s$1, pos$1 - 1 | 0)));
29042904
var initial_state = find_initial_state(re$1, initial_cat);
29052905
var st = scan_str(info, s$1, initial_state, groups$1);
29062906
var res;
29072907
if (st[/* idx */0] === -3 || partial) {
29082908
res = status(st[/* desc */4]);
29092909
} else {
2910-
var final_cat = last === slen ? Curry._2(Re_automata_Category["++"], Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category["++"], Re_automata_Category.search_boundary, category(re$1, get_color(re$1, s$1, last)));
2910+
var final_cat = last === slen ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re$1, get_color(re$1, s$1, last)));
29112911
var match = $$final(info, st, final_cat);
29122912
if (groups$1) {
29132913
Caml_array.caml_array_set(info[/* positions */2], match[0], last + 1 | 0);

‎jscomp/test/ocaml_typedtree_test.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,7 @@ var Types_TypeOps = {
33983398
};
33993399

34003400
var Types_Variance = {
3401-
null: 0,
3401+
$$null: 0,
34023402
full: 127,
34033403
covariant: 25,
34043404
may_inv: 7,
@@ -7688,7 +7688,7 @@ var Ast_helper_Exp = {
76887688
pack: pack,
76897689
open_: open_,
76907690
extension: extension$2,
7691-
case: $$case
7691+
$$case: $$case
76927692
};
76937693

76947694
var Ast_helper_Ctf = {
@@ -17372,13 +17372,13 @@ var yyact = /* array */[
1737217372
(function (__caml_parser_env) {
1737317373
var _1 = Parsing.peek_val(__caml_parser_env, 2);
1737417374
var _3 = Parsing.peek_val(__caml_parser_env, 0);
17375-
return Curry._3(Ast_helper_Exp.case, _1, undefined, _3);
17375+
return Curry._3(Ast_helper_Exp.$$case, _1, undefined, _3);
1737617376
}),
1737717377
(function (__caml_parser_env) {
1737817378
var _1 = Parsing.peek_val(__caml_parser_env, 4);
1737917379
var _3 = Parsing.peek_val(__caml_parser_env, 2);
1738017380
var _5 = Parsing.peek_val(__caml_parser_env, 0);
17381-
return Curry._3(Ast_helper_Exp.case, _1, _3, _5);
17381+
return Curry._3(Ast_helper_Exp.$$case, _1, _3, _5);
1738217382
}),
1738317383
(function (__caml_parser_env) {
1738417384
return Parsing.peek_val(__caml_parser_env, 0);
@@ -58599,7 +58599,7 @@ function type_expect_(in_function, env, sexp, ty_expected) {
5859958599
/* pexp_desc : Pexp_match */Block.__(6, [
5860058600
match$8[/* pvb_expr */1],
5860158601
/* :: */[
58602-
Curry._3(Ast_helper_Exp.case, spat, undefined, match[2]),
58602+
Curry._3(Ast_helper_Exp.$$case, spat, undefined, match[2]),
5860358603
/* [] */0
5860458604
]
5860558605
]),
@@ -58657,7 +58657,7 @@ function type_expect_(in_function, env, sexp, ty_expected) {
5865758657
];
5865858658
}
5865958659
var default_loc = $$default[/* pexp_loc */1];
58660-
var scases_000 = Curry._3(Ast_helper_Exp.case, construct(default_loc, undefined, /* record */[
58660+
var scases_000 = Curry._3(Ast_helper_Exp.$$case, construct(default_loc, undefined, /* record */[
5866158661
/* txt : Ldot */Block.__(1, [
5866258662
/* Lident */Block.__(0, ["*predef*"]),
5866358663
"Some"
@@ -58671,7 +58671,7 @@ function type_expect_(in_function, env, sexp, ty_expected) {
5867158671
/* loc */none
5867258672
]));
5867358673
var scases_001 = /* :: */[
58674-
Curry._3(Ast_helper_Exp.case, construct(default_loc, undefined, /* record */[
58674+
Curry._3(Ast_helper_Exp.$$case, construct(default_loc, undefined, /* record */[
5867558675
/* txt : Ldot */Block.__(1, [
5867658676
/* Lident */Block.__(0, ["*predef*"]),
5867758677
"None"
@@ -64424,7 +64424,7 @@ function get_variance(ty, visited) {
6442464424
}
6442564425
catch (exn){
6442664426
if (exn === Caml_builtin_exceptions.not_found) {
64427-
return Types_Variance.null;
64427+
return Types_Variance.$$null;
6442864428
} else {
6442964429
throw exn;
6443064430
}
@@ -64521,7 +64521,7 @@ function compute_variance(env, visited, vari, ty) {
6452164521
} else if (match.tag) {
6452264522
var upper = List.fold_left((function (s, f) {
6452364523
return Curry._3(Types_Variance.set, f, true, s);
64524-
}), Types_Variance.null, /* :: */[
64524+
}), Types_Variance.$$null, /* :: */[
6452564525
/* May_pos */0,
6452664526
/* :: */[
6452764527
/* May_neg */1,
@@ -64572,7 +64572,7 @@ function compute_variance(env, visited, vari, ty) {
6457264572
}
6457364573

6457464574
function make(p, n, i) {
64575-
return Curry._3(Types_Variance.set, /* May_pos */0, p, Curry._3(Types_Variance.set, /* May_neg */1, n, Curry._3(Types_Variance.set, /* May_weak */2, n, Curry._3(Types_Variance.set, /* Inj */3, i, Types_Variance.null))));
64575+
return Curry._3(Types_Variance.set, /* May_pos */0, p, Curry._3(Types_Variance.set, /* May_neg */1, n, Curry._3(Types_Variance.set, /* May_weak */2, n, Curry._3(Types_Variance.set, /* Inj */3, i, Types_Variance.$$null))));
6457664576
}
6457764577

6457864578
function compute_variance_type(env, check, param, decl, tyl) {
@@ -64673,7 +64673,7 @@ function compute_variance_type(env, check, param, decl, tyl) {
6467364673
} else {
6467464674
return v;
6467564675
}
64676-
}), tvl2[0], Types_Variance.null);
64676+
}), tvl2[0], Types_Variance.$$null);
6467764677
backtrack(snap);
6467864678
var match = Curry._1(Types_Variance.get_upper, v1);
6467964679
var n1 = match[1];
@@ -65022,7 +65022,7 @@ function compute_variance_fixpoint(env, decls, required, _variances) {
6502265022

6502365023
function init_variance(param) {
6502465024
return List.map((function (param) {
65025-
return Types_Variance.null;
65025+
return Types_Variance.$$null;
6502665026
}), param[1][/* type_params */0]);
6502765027
}
6502865028

@@ -69303,7 +69303,7 @@ function class_expr(cl_num, val_env, met_env, _scl) {
6930369303
if (match$5 !== undefined) {
6930469304
var $$default = match$5;
6930569305
var loc = $$default[/* pexp_loc */1];
69306-
var scases_000 = Curry._3(Ast_helper_Exp.case, construct(loc, undefined, /* record */[
69306+
var scases_000 = Curry._3(Ast_helper_Exp.$$case, construct(loc, undefined, /* record */[
6930769307
/* txt : Ldot */Block.__(1, [
6930869308
/* Lident */Block.__(0, ["*predef*"]),
6930969309
"Some"
@@ -69317,7 +69317,7 @@ function class_expr(cl_num, val_env, met_env, _scl) {
6931769317
/* loc */none
6931869318
]));
6931969319
var scases_001 = /* :: */[
69320-
Curry._3(Ast_helper_Exp.case, construct(loc, undefined, /* record */[
69320+
Curry._3(Ast_helper_Exp.$$case, construct(loc, undefined, /* record */[
6932169321
/* txt : Ldot */Block.__(1, [
6932269322
/* Lident */Block.__(0, ["*predef*"]),
6932369323
"None"
@@ -72000,7 +72000,7 @@ function merge_constraint(initial_env, loc, sg, constr) {
7200072000
var p = !match[1];
7200172001
var n = !match[0];
7200272002
var i = false;
72003-
return Curry._3(Types_Variance.set, /* May_pos */0, p, Curry._3(Types_Variance.set, /* May_neg */1, n, Curry._3(Types_Variance.set, /* May_weak */2, n, Curry._3(Types_Variance.set, /* Inj */3, i, Types_Variance.null))));
72003+
return Curry._3(Types_Variance.set, /* May_pos */0, p, Curry._3(Types_Variance.set, /* May_neg */1, n, Curry._3(Types_Variance.set, /* May_weak */2, n, Curry._3(Types_Variance.set, /* Inj */3, i, Types_Variance.$$null))));
7200472004
}), sdecl[/* ptype_params */1]);
7200572005
var decl_row_007 = /* type_loc */sdecl[/* ptype_loc */7];
7200672006
var decl_row = /* record */[

‎jscomp/test/offset.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ var $$Set = {
782782

783783
var M = {
784784
x: 1,
785-
Set: $$Set
785+
$$Set: $$Set
786786
};
787787

788788
var x = 1;

‎jscomp/test/parser_api.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -3731,7 +3731,7 @@ var $$Location = {
37313731
absolute_path: absolute_path,
37323732
show_filename: show_filename,
37333733
absname: absname,
3734-
Error: $$Error,
3734+
$$Error: $$Error,
37353735
print_error_prefix: print_error_prefix,
37363736
error: error,
37373737
pp_ksprintf: pp_ksprintf,
@@ -4463,7 +4463,7 @@ var Typ = {
44634463
mk: mk,
44644464
attr: attr,
44654465
any: any,
4466-
var: $$var,
4466+
$$var: $$var,
44674467
arrow: arrow,
44684468
tuple: tuple,
44694469
constr: constr,
@@ -4472,7 +4472,7 @@ var Typ = {
44724472
alias: alias,
44734473
variant: variant,
44744474
poly: poly,
4475-
package: $$package,
4475+
$$package: $$package,
44764476
extension: extension,
44774477
force_poly: force_poly
44784478
};
@@ -4591,7 +4591,7 @@ var Pat = {
45914591
mk: mk$1,
45924592
attr: attr$1,
45934593
any: any$1,
4594-
var: $$var$1,
4594+
$$var: $$var$1,
45954595
alias: alias$1,
45964596
constant: constant,
45974597
interval: interval,
@@ -5169,7 +5169,7 @@ function text$1(txt) {
51695169

51705170
var Str = {
51715171
mk: mk$6,
5172-
eval: $$eval,
5172+
$$eval: $$eval,
51735173
value: value$1,
51745174
primitive: primitive,
51755175
type_: type_$2,
@@ -5783,7 +5783,7 @@ var Ast_helper_Exp = {
57835783
pack: pack,
57845784
open_: open_,
57855785
extension: extension$2,
5786-
case: $$case
5786+
$$case: $$case
57875787
};
57885788

57895789
var Ast_helper_Ctf = {
@@ -6002,7 +6002,7 @@ function ill_formed_ast(loc, s) {
60026002
}
60036003

60046004
var Syntaxerr = {
6005-
Error: $$Error$1,
6005+
$$Error: $$Error$1,
60066006
Escape_error: Escape_error,
60076007
report_error: report_error$1,
60086008
location_of_error: location_of_error,
@@ -9698,13 +9698,13 @@ var yyact = /* array */[
96989698
(function (__caml_parser_env) {
96999699
var _1 = Parsing.peek_val(__caml_parser_env, 2);
97009700
var _3 = Parsing.peek_val(__caml_parser_env, 0);
9701-
return Curry._3(Ast_helper_Exp.case, _1, undefined, _3);
9701+
return Curry._3(Ast_helper_Exp.$$case, _1, undefined, _3);
97029702
}),
97039703
(function (__caml_parser_env) {
97049704
var _1 = Parsing.peek_val(__caml_parser_env, 4);
97059705
var _3 = Parsing.peek_val(__caml_parser_env, 2);
97069706
var _5 = Parsing.peek_val(__caml_parser_env, 0);
9707-
return Curry._3(Ast_helper_Exp.case, _1, _3, _5);
9707+
return Curry._3(Ast_helper_Exp.$$case, _1, _3, _5);
97089708
}),
97099709
(function (__caml_parser_env) {
97109710
return Parsing.peek_val(__caml_parser_env, 0);
@@ -12172,7 +12172,7 @@ function parse_pattern(lexfun, lexbuf) {
1217212172

1217312173
var Parser = {
1217412174
implementation: implementation,
12175-
interface: $$interface,
12175+
$$interface: $$interface,
1217612176
toplevel_phrase: toplevel_phrase,
1217712177
use_file: use_file,
1217812178
parse_core_type: parse_core_type,
@@ -14784,7 +14784,7 @@ var Lexer = {
1478414784
init: init$2,
1478514785
token: token$1,
1478614786
skip_sharp_bang: skip_sharp_bang,
14787-
Error: $$Error$2,
14787+
$$Error: $$Error$2,
1478814788
report_error: report_error$2,
1478914789
in_comment: in_comment,
1479014790
in_string: in_string,
@@ -14923,7 +14923,7 @@ function pattern(param) {
1492314923

1492414924
var Parse = {
1492514925
implementation: implementation$1,
14926-
interface: $$interface$1,
14926+
$$interface: $$interface$1,
1492714927
toplevel_phrase: toplevel_phrase$1,
1492814928
use_file: use_file$1,
1492914929
core_type: core_type,

0 commit comments

Comments
 (0)