Skip to content

Commit c630f98

Browse files
hhugohhugo
committed
Compiler: change format of locs
1 parent ecb3330 commit c630f98

File tree

5 files changed

+12182
-12182
lines changed

5 files changed

+12182
-12182
lines changed

‎compiler/lib/js_output.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct
6767
| Pi { Parse_info.name = Some file; line; col; _ }
6868
| Pi { Parse_info.src = Some file; line; col; _ } ->
6969
PP.non_breaking_space f;
70-
PP.string f (Format.sprintf "/*<<%s %d %d>>*/" file line col);
70+
PP.string f (Format.sprintf "/*<<%s:%d:%d>>*/" file line col);
7171
PP.non_breaking_space f
7272
| N -> ()
7373
| U | Pi _ ->

‎compiler/tests-compiler/gh747.ml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -79,31 +79,31 @@ print_endline(String.make 1 "Ɋ".[0] ^ String.make 1 "Ɋ".[1]);;
7979
24: Stdlib = global_data.Stdlib,
8080
25: Stdlib_Random = global_data.Stdlib__Random,
8181
26: Stdlib_String = global_data.Stdlib__String;
82-
27: /*<<test.ml 3 0>>*/ /*<<test.ml 3 0>>*/ caml_call1(Stdlib[46], greeting);
83-
28: /*<<test.ml 5 0>>*/ /*<<test.ml 5 0>>*/ caml_call1
82+
27: /*<<test.ml:3:0>>*/ /*<<test.ml:3:0>>*/ caml_call1(Stdlib[46], greeting);
83+
28: /*<<test.ml:5:0>>*/ /*<<test.ml:5:0>>*/ caml_call1
8484
29: (Stdlib[46], greeting$0);
85-
30: /*<<test.ml 7 47>>*/ var
86-
31: /*<<test.ml 7 47>>*/ _a_ =
87-
32: /*<<test.ml 7 47>>*/ caml_call1(Stdlib_Random[5], 30),
88-
33: /*<<test.ml 7 34>>*/ unicodeLength =
89-
34: /*<<test.ml 7 34>>*/ runtime.caml_ml_string_length
90-
35: ( /*<<test.ml 7 34>>*/ caml_call2(Stdlib_String[1], _a_, 105)),
91-
36: /*<<test.ml 8 56>>*/ _b_ =
92-
37: /*<<test.ml 8 56>>*/ caml_call1(Stdlib[33], unicodeLength),
93-
38: /*<<test.ml 8 14>>*/ _c_ =
94-
39: /*<<test.ml 8 14>>*/ caml_call2
85+
30: /*<<test.ml:7:47>>*/ var
86+
31: /*<<test.ml:7:47>>*/ _a_ =
87+
32: /*<<test.ml:7:47>>*/ caml_call1(Stdlib_Random[5], 30),
88+
33: /*<<test.ml:7:34>>*/ unicodeLength =
89+
34: /*<<test.ml:7:34>>*/ runtime.caml_ml_string_length
90+
35: ( /*<<test.ml:7:34>>*/ caml_call2(Stdlib_String[1], _a_, 105)),
91+
36: /*<<test.ml:8:56>>*/ _b_ =
92+
37: /*<<test.ml:8:56>>*/ caml_call1(Stdlib[33], unicodeLength),
93+
38: /*<<test.ml:8:14>>*/ _c_ =
94+
39: /*<<test.ml:8:14>>*/ caml_call2
9595
40: (Stdlib[28],
9696
41: caml_string_of_jsbytes('String.length("\xc9\x8a") should be two:'),
9797
42: _b_);
98-
43: /*<<test.ml 8 0>>*/ /*<<test.ml 8 0>>*/ caml_call1(Stdlib[46], _c_);
99-
44: /*<<test.ml 9 39>>*/ var
100-
45: /*<<test.ml 9 39>>*/ _d_ =
101-
46: /*<<test.ml 9 39>>*/ caml_call2(Stdlib_String[1], 1, 138),
102-
47: /*<<test.ml 9 14>>*/ _e_ =
103-
48: /*<<test.ml 9 14>>*/ caml_call2(Stdlib_String[1], 1, 201),
104-
49: /*<<test.ml 9 13>>*/ _f_ =
105-
50: /*<<test.ml 9 13>>*/ caml_call2(Stdlib[28], _e_, _d_);
106-
51: /*<<test.ml 9 0>>*/ /*<<test.ml 9 0>>*/ caml_call1(Stdlib[46], _f_);
98+
43: /*<<test.ml:8:0>>*/ /*<<test.ml:8:0>>*/ caml_call1(Stdlib[46], _c_);
99+
44: /*<<test.ml:9:39>>*/ var
100+
45: /*<<test.ml:9:39>>*/ _d_ =
101+
46: /*<<test.ml:9:39>>*/ caml_call2(Stdlib_String[1], 1, 138),
102+
47: /*<<test.ml:9:14>>*/ _e_ =
103+
48: /*<<test.ml:9:14>>*/ caml_call2(Stdlib_String[1], 1, 201),
104+
49: /*<<test.ml:9:13>>*/ _f_ =
105+
50: /*<<test.ml:9:13>>*/ caml_call2(Stdlib[28], _e_, _d_);
106+
51: /*<<test.ml:9:0>>*/ /*<<test.ml:9:0>>*/ caml_call1(Stdlib[46], _f_);
107107
52: var Test = [0, greeting$0, unicodeLength];
108108
53: runtime.caml_register_global(8, Test, "Test");
109109
54: return;
@@ -247,22 +247,22 @@ end
247247
22: ? f(a0, a1, a2, a3, a4, a5, a6, a7)
248248
23: : runtime.caml_call_gen(f, [a0, a1, a2, a3, a4, a5, a6, a7]);
249249
24: }
250-
25: /*<<test.ml 14 22>>*/ var
250+
25: /*<<test.ml:14:22>>*/ var
251251
26: global_data = runtime.caml_get_global_data(),
252252
27: cst = caml_string_of_jsbytes(""),
253253
28: partial = [4, 0, 0, 0, [12, 45, [4, 0, 0, 0, 0]]],
254254
29: Stdlib_Printf = global_data.Stdlib__Printf,
255-
30: /*<<test.ml 14 22>>*/ executable_name =
256-
31: /*<<test.ml 14 22>>*/ runtime.caml_sys_executable_name(0),
257-
32: os_type = /*<<test.ml 15 22>>*/ runtime.caml_sys_get_config(0)[1],
255+
30: /*<<test.ml:14:22>>*/ executable_name =
256+
31: /*<<test.ml:14:22>>*/ runtime.caml_sys_executable_name(0),
257+
32: os_type = /*<<test.ml:15:22>>*/ runtime.caml_sys_get_config(0)[1],
258258
33: backend_type = [0, caml_string_of_jsbytes("js_of_ocaml")],
259259
34: unix = runtime.caml_sys_const_ostype_unix(0),
260260
35: win32 = runtime.caml_sys_const_ostype_win32(0),
261261
36: cygwin = runtime.caml_sys_const_ostype_cygwin(0),
262262
37: max_array_length = runtime.caml_sys_const_max_wosize(0),
263263
38: max_floatarray_length = max_array_length / 2 | 0,
264264
39: max_string_length = (4 * max_array_length | 0) - 1 | 0,
265-
40: /*<<test.ml 28 12>>*/ Unhandled =
265+
40: /*<<test.ml:28:12>>*/ Unhandled =
266266
41: [248,
267267
42: caml_string_of_jsbytes("Test.Unhandled"),
268268
43: runtime.caml_fresh_oo_id(0)],
@@ -315,66 +315,66 @@ end
315315
90: int_size = 32;
316316
91: function format_backtrace_slot(pos, slot){
317317
92: function info(is_raise){
318-
93: /*<<test.ml 46 4>>*/ return is_raise
318+
93: /*<<test.ml:46:4>>*/ return is_raise
319319
94: ? 0 === pos ? cst_Raised_at : cst_Re_raised_at
320320
95: : 0 === pos ? cst_Raised_by_primitive_operat : cst_Called_from;
321-
96: /*<<test.ml 49 75>>*/ }
322-
97: /*<<test.ml 51 2>>*/ if(0 === slot[0]){
323-
98: /*<<test.ml 59 14>>*/ var
321+
96: /*<<test.ml:49:75>>*/ }
322+
97: /*<<test.ml:51:2>>*/ if(0 === slot[0]){
323+
98: /*<<test.ml:59:14>>*/ var
324324
99: _h_ = slot[5],
325325
100: _i_ = slot[4],
326326
101: _j_ = slot[3],
327327
102: _k_ = slot[6] ? cst_inlined : cst,
328328
103: _l_ = slot[2],
329329
104: _m_ = slot[7],
330-
105: /*<<test.ml 59 14>>*/ _n_ = info(slot[1]);
331-
106: /*<<test.ml 58 6>>*/ return [0,
332-
107: /*<<test.ml 58 11>>*/ caml_call8
330+
105: /*<<test.ml:59:14>>*/ _n_ = info(slot[1]);
331+
106: /*<<test.ml:58:6>>*/ return [0,
332+
107: /*<<test.ml:58:11>>*/ caml_call8
333333
108: (Stdlib_Printf[4], _a_, _n_, _m_, _l_, _k_, _j_, _i_, _h_)];
334334
109: }
335-
110: if(slot[1]) /*<<test.ml 54 50>>*/ return 0;
336-
111: /*<<test.ml 56 51>>*/ /*<<test.ml 56 51>>*/ var _o_ = info(0);
337-
112: /*<<test.ml 56 8>>*/ return [0,
338-
113: /*<<test.ml 56 13>>*/ caml_call2(Stdlib_Printf[4], _b_, _o_)];
339-
114: /*<<test.ml 61 52>>*/ }
335+
110: if(slot[1]) /*<<test.ml:54:50>>*/ return 0;
336+
111: /*<<test.ml:56:51>>*/ /*<<test.ml:56:51>>*/ var _o_ = info(0);
337+
112: /*<<test.ml:56:8>>*/ return [0,
338+
113: /*<<test.ml:56:13>>*/ caml_call2(Stdlib_Printf[4], _b_, _o_)];
339+
114: /*<<test.ml:61:52>>*/ }
340340
115: function print_exception_backtrace(outchan, backtrace){
341-
116: /*<<test.ml 64 2>>*/ if(! backtrace)
342-
117: /*<<test.ml 66 6>>*/ return /*<<test.ml 66 6>>*/ caml_call2
341+
116: /*<<test.ml:64:2>>*/ if(! backtrace)
342+
117: /*<<test.ml:66:6>>*/ return /*<<test.ml:66:6>>*/ caml_call2
343343
118: (Stdlib_Printf[1], outchan, _d_);
344344
119: var a = backtrace[1], _f_ = a.length - 1 - 1 | 0, _e_ = 0;
345345
120: if(_f_ >= 0){
346346
121: var i = _e_;
347347
122: for(;;){
348-
123: /*<<test.ml 70 14>>*/ /*<<test.ml 70 14>>*/ var
348+
123: /*<<test.ml:70:14>>*/ /*<<test.ml:70:14>>*/ var
349349
124: match = format_backtrace_slot(i, runtime.caml_check_bound(a, i)[1 + i]);
350350
125: if(match){
351351
126: var str = match[1];
352-
127: /*<<test.ml 72 24>>*/ /*<<test.ml 72 24>>*/ caml_call3
352+
127: /*<<test.ml:72:24>>*/ /*<<test.ml:72:24>>*/ caml_call3
353353
128: (Stdlib_Printf[1], outchan, _c_, str);
354354
129: }
355-
130: /*<<test.ml 69 6>>*/ /*<<test.ml 69 6>>*/ var _g_ = i + 1 | 0;
355+
130: /*<<test.ml:69:6>>*/ /*<<test.ml:69:6>>*/ var _g_ = i + 1 | 0;
356356
131: if(_f_ !== i){var i = _g_; continue;}
357357
132: break;
358358
133: }
359359
134: }
360360
135: return 0;
361-
136: /*<<test.ml 73 10>>*/ }
361+
136: /*<<test.ml:73:10>>*/ }
362362
137: function compare(left, right, e1, e2){
363-
138: /*<<test.ml 77 35>>*/ if(0 === e1[0]){
363+
138: /*<<test.ml:77:35>>*/ if(0 === e1[0]){
364364
139: var v1 = e1[1];
365-
140: if(0 !== e2[0]) /*<<test.ml 80 23>>*/ return -1;
365+
140: if(0 !== e2[0]) /*<<test.ml:80:23>>*/ return -1;
366366
141: var v2 = e2[1];
367-
142: /*<<test.ml 78 24>>*/ return /*<<test.ml 78 24>>*/ caml_call2
367+
142: /*<<test.ml:78:24>>*/ return /*<<test.ml:78:24>>*/ caml_call2
368368
143: (left, v1, v2);
369369
144: }
370370
145: var v1$0 = e1[1];
371-
146: if(0 === e2[0]) /*<<test.ml 81 23>>*/ return 1;
371+
146: if(0 === e2[0]) /*<<test.ml:81:23>>*/ return 1;
372372
147: var v2$0 = e2[1];
373-
148: /*<<test.ml 79 26>>*/ return /*<<test.ml 79 26>>*/ caml_call2
373+
148: /*<<test.ml:79:26>>*/ return /*<<test.ml:79:26>>*/ caml_call2
374374
149: (right, v1$0, v2$0);
375-
150: /*<<test.ml 81 24>>*/ }
376-
151: /*<<test.ml 75 16>>*/ var
377-
152: /*<<test.ml 75 16>>*/ Either = [0, compare],
375+
150: /*<<test.ml:81:24>>*/ }
376+
151: /*<<test.ml:75:16>>*/ var
377+
152: /*<<test.ml:75:16>>*/ Either = [0, compare],
378378
153: Test =
379379
154: [0,
380380
155: executable_name,

0 commit comments

Comments
 (0)