Skip to content

Commit 58cdd2a

Browse files
bobzhangbobzhang
committed
fix CI, %C in comment needs be escaped
1 parent 0209b9b commit 58cdd2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+239
-352
lines changed

‎jscomp/core/js_dump.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ and expression_desc cxt ~(level:int) f x : cxt =
672672
Js_number.caml_float_literal_to_js_string f
673673
(* attach string here for float constant folding?*)
674674
| Int { i; c = Some c}
675-
-> Format.asprintf "/* '%c' */%ld" c i
675+
-> Format.asprintf "/* %C */%ld" c i
676676
| Int { i; c = None}
677677
-> Int32.to_string i (* check , js convention with ocaml lexical convention *)
678678
| Uint i

‎jscomp/test/a_string_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ var suites_1 = {
8484
if (x === /* ' ' */32) {
8585
return true;
8686
} else {
87-
return x === /* ' ' */9;
87+
return x === /* '\t' */9;
8888
}
8989
}), "h hgso hgso \t hi")),
9090
_1: {

‎jscomp/test/caml_format_test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2582,8 +2582,7 @@ var int64_suites_1 = {
25822582
_2: /* No_precision */0,
25832583
_3: {
25842584
TAG: /* Char_literal */12,
2585-
_0: /* '
2586-
' */10,
2585+
_0: /* '\n' */10,
25872586
_1: /* End_of_format */0
25882587
}
25892588
},
@@ -2608,8 +2607,7 @@ var int64_suites_1 = {
26082607
_2: /* No_precision */0,
26092608
_3: {
26102609
TAG: /* Char_literal */12,
2611-
_0: /* '
2612-
' */10,
2610+
_0: /* '\n' */10,
26132611
_1: /* End_of_format */0
26142612
}
26152613
},

‎jscomp/test/complex_if_test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ function escaped(s) {
6161
} else {
6262
switch (c) {
6363
case 8 :
64-
s$prime[n] = /* '\' */92;
64+
s$prime[n] = /* '\\' */92;
6565
n = n + 1 | 0;
6666
s$prime[n] = /* 'b' */98;
6767
break;
6868
case 9 :
69-
s$prime[n] = /* '\' */92;
69+
s$prime[n] = /* '\\' */92;
7070
n = n + 1 | 0;
7171
s$prime[n] = /* 't' */116;
7272
break;
7373
case 10 :
74-
s$prime[n] = /* '\' */92;
74+
s$prime[n] = /* '\\' */92;
7575
n = n + 1 | 0;
7676
s$prime[n] = /* 'n' */110;
7777
break;
@@ -88,7 +88,7 @@ function escaped(s) {
8888
exit = 1;
8989
break;
9090
case 13 :
91-
s$prime[n] = /* '\' */92;
91+
s$prime[n] = /* '\\' */92;
9292
n = n + 1 | 0;
9393
s$prime[n] = /* 'r' */114;
9494
break;
@@ -97,7 +97,7 @@ function escaped(s) {
9797
}
9898
switch (exit) {
9999
case 1 :
100-
s$prime[n] = /* '\' */92;
100+
s$prime[n] = /* '\\' */92;
101101
n = n + 1 | 0;
102102
s$prime[n] = 48 + (c / 100 | 0) | 0;
103103
n = n + 1 | 0;
@@ -106,7 +106,7 @@ function escaped(s) {
106106
s$prime[n] = 48 + c % 10 | 0;
107107
break;
108108
case 2 :
109-
s$prime[n] = /* '\' */92;
109+
s$prime[n] = /* '\\' */92;
110110
n = n + 1 | 0;
111111
s$prime[n] = c;
112112
break;

‎jscomp/test/ext_bytes_test.js

9 Bytes
Binary file not shown.

‎jscomp/test/ext_string_test.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ function trim(s) {
5858
var tmp = false;
5959
if (i < j) {
6060
var u = s.charCodeAt(i);
61-
tmp = u === /* ' ' */9 || u === /* '
62-
' */10 || u === /* ' ' */32;
61+
tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32;
6362
}
6463
return tmp;
6564
})()) {
@@ -70,8 +69,7 @@ function trim(s) {
7069
var tmp = false;
7170
if (k >= i) {
7271
var u = s.charCodeAt(k);
73-
tmp = u === /* ' ' */9 || u === /* '
74-
' */10 || u === /* ' ' */32;
72+
tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32;
7573
}
7674
return tmp;
7775
})()) {
@@ -92,8 +90,7 @@ function split(keep_empty, str, on) {
9290

9391
function quick_split_by_ws(str) {
9492
return split_by(false, (function (x) {
95-
if (x === /* ' ' */9 || x === /* '
96-
' */10) {
93+
if (x === /* '\t' */9 || x === /* '\n' */10) {
9794
return true;
9895
} else {
9996
return x === /* ' ' */32;
@@ -597,15 +594,15 @@ function replace_slash_backward(x) {
597594
if (x !== 47) {
598595
return x;
599596
} else {
600-
return /* '\' */92;
597+
return /* '\\' */92;
601598
}
602599
}), x);
603600
}
604601
}
605602

606603
function replace_backward_slash(x) {
607604
var len = x.length;
608-
if (unsafe_no_char(x, /* '\' */92, 0, len - 1 | 0)) {
605+
if (unsafe_no_char(x, /* '\\' */92, 0, len - 1 | 0)) {
609606
return x;
610607
} else {
611608
return $$String.map((function (x) {

‎jscomp/test/flow_parser_reg_test.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3886,8 +3886,7 @@ function comment(env, buf, lexbuf) {
38863886
];
38873887
case 1 :
38883888
Lexing.new_line(lexbuf);
3889-
$$Buffer.add_char(buf, /* '
3890-
' */10);
3889+
$$Buffer.add_char(buf, /* '\n' */10);
38913890
return comment(env, buf, lexbuf);
38923891
case 2 :
38933892
var loc = from_lb(env.lex_source, lexbuf);
@@ -4844,8 +4843,8 @@ function template_part(env, start, cooked, raw, literal, lexbuf) {
48444843
false
48454844
];
48464845
case 3 :
4847-
$$Buffer.add_char(raw, /* '\' */92);
4848-
$$Buffer.add_char(literal, /* '\' */92);
4846+
$$Buffer.add_char(raw, /* '\\' */92);
4847+
$$Buffer.add_char(literal, /* '\\' */92);
48494848
var match = string_escape(env, cooked, lexbuf);
48504849
var str = Lexing.lexeme(lexbuf);
48514850
$$Buffer.add_string(raw, str);
@@ -4862,8 +4861,7 @@ function template_part(env, start, cooked, raw, literal, lexbuf) {
48624861
var lf$1 = Caml_bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos);
48634862
$$Buffer.add_char(raw, lf$1);
48644863
$$Buffer.add_char(literal, lf$1);
4865-
$$Buffer.add_char(cooked, /* '
4866-
' */10);
4864+
$$Buffer.add_char(cooked, /* '\n' */10);
48674865
Lexing.new_line(lexbuf);
48684866
return template_part(env, start, cooked, raw, literal, lexbuf);
48694867
case 6 :
@@ -5341,7 +5339,7 @@ function __ocaml_lex_jsx_tag_rec(_env, lexbuf, ___ocaml_lex_state) {
53415339
var buf$2 = $$Buffer.create(127);
53425340
var raw = $$Buffer.create(127);
53435341
$$Buffer.add_char(raw, quote);
5344-
var mode = quote === /* ''' */39 ? /* JSX_SINGLE_QUOTED_TEXT */0 : /* JSX_DOUBLE_QUOTED_TEXT */1;
5342+
var mode = quote === /* '\'' */39 ? /* JSX_SINGLE_QUOTED_TEXT */0 : /* JSX_DOUBLE_QUOTED_TEXT */1;
53455343
var match$2 = jsx_text(env, mode, buf$2, raw, lexbuf);
53465344
$$Buffer.add_char(raw, quote);
53475345
var value = $$Buffer.contents(buf$2);

‎jscomp/test/hamming_test.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ function pr(param) {
8888
_2: /* No_precision */0,
8989
_3: {
9090
TAG: /* Char_literal */12,
91-
_0: /* '
92-
' */10,
91+
_0: /* '\n' */10,
9392
_1: /* End_of_format */0
9493
}
9594
},
@@ -113,8 +112,7 @@ function pr(param) {
113112
_2: /* No_precision */0,
114113
_3: {
115114
TAG: /* Char_literal */12,
116-
_0: /* '
117-
' */10,
115+
_0: /* '\n' */10,
118116
_1: /* End_of_format */0
119117
}
120118
}

‎jscomp/test/libarg_test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,7 @@ function test(argv) {
526526
},
527527
_1: {
528528
TAG: /* Char_literal */12,
529-
_0: /* '
530-
' */10,
529+
_0: /* '\n' */10,
531530
_1: {
532531
TAG: /* Flush */10,
533532
_0: /* End_of_format */0

‎jscomp/test/ocaml_parsetree_test.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,8 +1335,7 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
13351335
}
13361336
var lines = num_loc_lines.contents;
13371337
for(var i = pos0 ,i_finish = lb.lex_buffer_len; i < i_finish; ++i){
1338-
if (Caml_bytes.get(lb.lex_buffer, i) === /* '
1339-
' */10) {
1338+
if (Caml_bytes.get(lb.lex_buffer, i) === /* '\n' */10) {
13401339
lines = lines + 1 | 0;
13411340
}
13421341

@@ -1372,8 +1371,7 @@ function highlight_terminfo(ppf, num_lines, lb, locs) {
13721371
}
13731372
var c = Caml_bytes.get(lb.lex_buffer, pos + pos0 | 0);
13741373
Pervasives.print_char(c);
1375-
bol = c === /* '
1376-
' */10;
1374+
bol = c === /* '\n' */10;
13771375
}
13781376
Caml_external_polyfill.resolve("caml_terminfo_standout")(false);
13791377
Caml_external_polyfill.resolve("caml_terminfo_resume")(num_loc_lines.contents);
@@ -1392,8 +1390,7 @@ function highlight_dumb(ppf, lb, loc) {
13921390
var line_start = 0;
13931391
var line_end = 0;
13941392
for(var pos = 0; pos <= end_pos; ++pos){
1395-
if (Caml_bytes.get(lb.lex_buffer, pos + pos0 | 0) === /* '
1396-
' */10) {
1393+
if (Caml_bytes.get(lb.lex_buffer, pos + pos0 | 0) === /* '\n' */10) {
13971394
if (loc.loc_start.pos_cnum > pos) {
13981395
line_start = line_start + 1 | 0;
13991396
}
@@ -1871,8 +1868,7 @@ function prerr_warning(loc, w) {
18711868
if (i === (start + len | 0)) {
18721869
return c;
18731870
}
1874-
if (Caml_string.get(str, i) === /* '
1875-
' */10) {
1871+
if (Caml_string.get(str, i) === /* '\n' */10) {
18761872
_c = c + 1 | 0;
18771873
_i = i + 1 | 0;
18781874
continue ;
@@ -11936,25 +11932,24 @@ function char_for_backslash(c) {
1193611932
if (c !== 98) {
1193711933
return c;
1193811934
} else {
11939-
return /* '' */8;
11935+
return /* '\b' */8;
1194011936
}
1194111937
}
1194211938
if (c >= 117) {
1194311939
return c;
1194411940
}
1194511941
switch (c) {
1194611942
case 110 :
11947-
return /* '
11948-
' */10;
11943+
return /* '\n' */10;
1194911944
case 114 :
11950-
return /* '' */13;
11945+
return /* '\r' */13;
1195111946
case 111 :
1195211947
case 112 :
1195311948
case 113 :
1195411949
case 115 :
1195511950
return c;
1195611951
case 116 :
11957-
return /* ' ' */9;
11952+
return /* '\t' */9;
1195811953

1195911954
}
1196011955
}

0 commit comments

Comments
 (0)