Skip to content

Commit 859a6a8

Browse files
bobzhangbobzhang
committed
tweak
1 parent 2554e2a commit 859a6a8

File tree

3 files changed

+117
-117
lines changed

3 files changed

+117
-117
lines changed

‎jscomp/runtime/caml_lexer.ml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@ let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = [%raw{|fun
118118
var lex_trans = 'lex_trans';
119119
var lex_check = 'lex_check';
120120
if (!tbl.processed) {
121-
tbl.lex_base = caml_lex_array(tbl[lex_base]);
122-
tbl.lex_backtrk = caml_lex_array(tbl[lex_backtrk]);
123-
tbl.lex_check = caml_lex_array(tbl[lex_check]);
124-
tbl.lex_trans = caml_lex_array(tbl[lex_trans]);
125-
tbl.lex_default = caml_lex_array(tbl[lex_default]);
121+
tbl.lex_base = caml_lex_array(tbl.lex_base);
122+
tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
123+
tbl.lex_check = caml_lex_array(tbl.lex_check);
124+
tbl.lex_trans = caml_lex_array(tbl.lex_trans);
125+
tbl.lex_default = caml_lex_array(tbl.lex_default);
126126
tbl.processed = true;
127127
}
128128
var c;
129129
var state = start_state;
130-
//var buffer = bytes_of_string(lexbuf[lex_buffer]);
131-
var buffer = lexbuf[lex_buffer];
130+
//var buffer = bytes_of_string(lexbuf.lex_buffer);
131+
var buffer = lexbuf.lex_buffer;
132132
if (state >= 0) {
133133
/* First entry */
134-
lexbuf[lex_last_pos] = lexbuf[lex_start_pos] = lexbuf[lex_curr_pos];
135-
lexbuf[lex_last_action] = -1;
134+
lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
135+
lexbuf.lex_last_action = -1;
136136
}
137137
else {
138138
/* Reentry after refill */
@@ -146,20 +146,20 @@ let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = [%raw{|fun
146146
/* See if it's a backtrack point */
147147
var backtrk = tbl.lex_backtrk[state];
148148
if (backtrk >= 0) {
149-
lexbuf[lex_last_pos] = lexbuf[lex_curr_pos];
150-
lexbuf[lex_last_action] = backtrk;
149+
lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
150+
lexbuf.lex_last_action = backtrk;
151151
}
152152
/* See if we need a refill */
153-
if (lexbuf[lex_curr_pos] >= lexbuf[lex_buffer_len]) {
154-
if (lexbuf[lex_eof_reached] === 0)
153+
if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
154+
if (lexbuf.lex_eof_reached === 0)
155155
return -state - 1;
156156
else
157157
c = 256;
158158
}
159159
else {
160160
/* Read next input char */
161-
c = buffer[lexbuf[lex_curr_pos]];
162-
lexbuf[lex_curr_pos]++;
161+
c = buffer[lexbuf.lex_curr_pos];
162+
lexbuf.lex_curr_pos++;
163163
}
164164
/* Determine next state */
165165
if (tbl.lex_check[base + c] === state) {
@@ -170,18 +170,18 @@ let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = [%raw{|fun
170170
}
171171
/* If no transition on this char, return to last backtrack point */
172172
if (state < 0) {
173-
lexbuf[lex_curr_pos] = lexbuf[lex_last_pos];
174-
if (lexbuf[lex_last_action] == -1)
173+
lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
174+
if (lexbuf.lex_last_action == -1)
175175
throw exn
176176
else
177-
return lexbuf[lex_last_action];
177+
return lexbuf.lex_last_action;
178178
}
179179
else {
180180
/* Erase the EOF condition only if the EOF pseudo-character was
181181
consumed by the automaton (i.e. there was no backtrack above)
182182
*/
183183
if (c == 256)
184-
lexbuf[lex_eof_reached] = 0;
184+
lexbuf.lex_eof_reached = 0;
185185
}
186186
}
187187
}
@@ -274,11 +274,11 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|
274274
var lex_check_code = 'lex_check_code';
275275
var lex_code = 'lex_code';
276276
if (!tbl.processed) {
277-
tbl.lex_base = caml_lex_array(tbl[lex_base]);
278-
tbl.lex_backtrk = caml_lex_array(tbl[lex_backtrk]);
279-
tbl.lex_check = caml_lex_array(tbl[lex_check]);
280-
tbl.lex_trans = caml_lex_array(tbl[lex_trans]);
281-
tbl.lex_default = caml_lex_array(tbl[lex_default]);
277+
tbl.lex_base = caml_lex_array(tbl.lex_base);
278+
tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
279+
tbl.lex_check = caml_lex_array(tbl.lex_check);
280+
tbl.lex_trans = caml_lex_array(tbl.lex_trans);
281+
tbl.lex_default = caml_lex_array(tbl.lex_default);
282282
tbl.lex_base_code = caml_lex_array(tbl[lex_base_code]);
283283
tbl.lex_backtrk_code = caml_lex_array(tbl[lex_backtrk_code]);
284284
tbl.lex_check_code = caml_lex_array(tbl[lex_check_code]);
@@ -287,12 +287,12 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|
287287
tbl.processed = true;
288288
}
289289
var c, state = start_state;
290-
//var buffer = caml_bytes_of_string(lexbuf[lex_buffer]);
291-
var buffer = lexbuf[lex_buffer];
290+
//var buffer = caml_bytes_of_string(lexbuf.lex_buffer);
291+
var buffer = lexbuf.lex_buffer;
292292
if (state >= 0) {
293293
/* First entry */
294-
lexbuf[lex_last_pos] = lexbuf[lex_start_pos] = lexbuf[lex_curr_pos];
295-
lexbuf[lex_last_action] = -1;
294+
lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
295+
lexbuf.lex_last_action = -1;
296296
}
297297
else {
298298
/* Reentry after refill */
@@ -311,20 +311,20 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|
311311
if (backtrk >= 0) {
312312
var pc_off = tbl.lex_backtrk_code[state];
313313
caml_lex_run_tag(tbl.lex_code, pc_off, lexbuf[lex_mem]);
314-
lexbuf[lex_last_pos] = lexbuf[lex_curr_pos];
315-
lexbuf[lex_last_action] = backtrk;
314+
lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
315+
lexbuf.lex_last_action = backtrk;
316316
}
317317
/* See if we need a refill */
318-
if (lexbuf[lex_curr_pos] >= lexbuf[lex_buffer_len]) {
319-
if (lexbuf[lex_eof_reached] == 0)
318+
if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
319+
if (lexbuf.lex_eof_reached == 0)
320320
return -state - 1;
321321
else
322322
c = 256;
323323
}
324324
else {
325325
/* Read next input char */
326-
c = buffer[lexbuf[lex_curr_pos]];
327-
lexbuf[lex_curr_pos]++;
326+
c = buffer[lexbuf.lex_curr_pos];
327+
lexbuf.lex_curr_pos++;
328328
}
329329
/* Determine next state */
330330
var pstate = state;
@@ -334,11 +334,11 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|
334334
state = tbl.lex_default[state];
335335
/* If no transition on this char, return to last backtrack point */
336336
if (state < 0) {
337-
lexbuf[lex_curr_pos] = lexbuf[lex_last_pos];
338-
if (lexbuf[lex_last_action] == -1)
337+
lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
338+
if (lexbuf.lex_last_action == -1)
339339
throw exn;
340340
else
341-
return lexbuf[lex_last_action];
341+
return lexbuf.lex_last_action;
342342
}
343343
else {
344344
/* If some transition, get and perform memory moves */
@@ -348,12 +348,12 @@ let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|
348348
else
349349
pc_off = tbl.lex_default_code[pstate];
350350
if (pc_off > 0)
351-
caml_lex_run_mem(tbl.lex_code, pc_off, lexbuf[lex_mem], lexbuf[lex_curr_pos]);
351+
caml_lex_run_mem(tbl.lex_code, pc_off, lexbuf[lex_mem], lexbuf.lex_curr_pos);
352352
/* Erase the EOF condition only if the EOF pseudo-character was
353353
consumed by the automaton (i.e. there was no backtrack above)
354354
*/
355355
if (c == 256)
356-
lexbuf[lex_eof_reached] = 0;
356+
lexbuf.lex_eof_reached = 0;
357357
}
358358
}
359359
}

‎lib/es6/caml_lexer.js‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){
4747
var lex_trans = 'lex_trans';
4848
var lex_check = 'lex_check';
4949
if (!tbl.processed) {
50-
tbl.lex_base = caml_lex_array(tbl[lex_base]);
51-
tbl.lex_backtrk = caml_lex_array(tbl[lex_backtrk]);
52-
tbl.lex_check = caml_lex_array(tbl[lex_check]);
53-
tbl.lex_trans = caml_lex_array(tbl[lex_trans]);
54-
tbl.lex_default = caml_lex_array(tbl[lex_default]);
50+
tbl.lex_base = caml_lex_array(tbl.lex_base);
51+
tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
52+
tbl.lex_check = caml_lex_array(tbl.lex_check);
53+
tbl.lex_trans = caml_lex_array(tbl.lex_trans);
54+
tbl.lex_default = caml_lex_array(tbl.lex_default);
5555
tbl.processed = true;
5656
}
5757
var c;
5858
var state = start_state;
59-
//var buffer = bytes_of_string(lexbuf[lex_buffer]);
60-
var buffer = lexbuf[lex_buffer];
59+
//var buffer = bytes_of_string(lexbuf.lex_buffer);
60+
var buffer = lexbuf.lex_buffer;
6161
if (state >= 0) {
6262
/* First entry */
63-
lexbuf[lex_last_pos] = lexbuf[lex_start_pos] = lexbuf[lex_curr_pos];
64-
lexbuf[lex_last_action] = -1;
63+
lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
64+
lexbuf.lex_last_action = -1;
6565
}
6666
else {
6767
/* Reentry after refill */
@@ -75,20 +75,20 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){
7575
/* See if it's a backtrack point */
7676
var backtrk = tbl.lex_backtrk[state];
7777
if (backtrk >= 0) {
78-
lexbuf[lex_last_pos] = lexbuf[lex_curr_pos];
79-
lexbuf[lex_last_action] = backtrk;
78+
lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
79+
lexbuf.lex_last_action = backtrk;
8080
}
8181
/* See if we need a refill */
82-
if (lexbuf[lex_curr_pos] >= lexbuf[lex_buffer_len]) {
83-
if (lexbuf[lex_eof_reached] === 0)
82+
if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
83+
if (lexbuf.lex_eof_reached === 0)
8484
return -state - 1;
8585
else
8686
c = 256;
8787
}
8888
else {
8989
/* Read next input char */
90-
c = buffer[lexbuf[lex_curr_pos]];
91-
lexbuf[lex_curr_pos]++;
90+
c = buffer[lexbuf.lex_curr_pos];
91+
lexbuf.lex_curr_pos++;
9292
}
9393
/* Determine next state */
9494
if (tbl.lex_check[base + c] === state) {
@@ -99,18 +99,18 @@ var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){
9999
}
100100
/* If no transition on this char, return to last backtrack point */
101101
if (state < 0) {
102-
lexbuf[lex_curr_pos] = lexbuf[lex_last_pos];
103-
if (lexbuf[lex_last_action] == -1)
102+
lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
103+
if (lexbuf.lex_last_action == -1)
104104
throw exn
105105
else
106-
return lexbuf[lex_last_action];
106+
return lexbuf.lex_last_action;
107107
}
108108
else {
109109
/* Erase the EOF condition only if the EOF pseudo-character was
110110
consumed by the automaton (i.e. there was no backtrack above)
111111
*/
112112
if (c == 256)
113-
lexbuf[lex_eof_reached] = 0;
113+
lexbuf.lex_eof_reached = 0;
114114
}
115115
}
116116
});
@@ -193,11 +193,11 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
193193
var lex_check_code = 'lex_check_code';
194194
var lex_code = 'lex_code';
195195
if (!tbl.processed) {
196-
tbl.lex_base = caml_lex_array(tbl[lex_base]);
197-
tbl.lex_backtrk = caml_lex_array(tbl[lex_backtrk]);
198-
tbl.lex_check = caml_lex_array(tbl[lex_check]);
199-
tbl.lex_trans = caml_lex_array(tbl[lex_trans]);
200-
tbl.lex_default = caml_lex_array(tbl[lex_default]);
196+
tbl.lex_base = caml_lex_array(tbl.lex_base);
197+
tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
198+
tbl.lex_check = caml_lex_array(tbl.lex_check);
199+
tbl.lex_trans = caml_lex_array(tbl.lex_trans);
200+
tbl.lex_default = caml_lex_array(tbl.lex_default);
201201
tbl.lex_base_code = caml_lex_array(tbl[lex_base_code]);
202202
tbl.lex_backtrk_code = caml_lex_array(tbl[lex_backtrk_code]);
203203
tbl.lex_check_code = caml_lex_array(tbl[lex_check_code]);
@@ -206,12 +206,12 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
206206
tbl.processed = true;
207207
}
208208
var c, state = start_state;
209-
//var buffer = caml_bytes_of_string(lexbuf[lex_buffer]);
210-
var buffer = lexbuf[lex_buffer];
209+
//var buffer = caml_bytes_of_string(lexbuf.lex_buffer);
210+
var buffer = lexbuf.lex_buffer;
211211
if (state >= 0) {
212212
/* First entry */
213-
lexbuf[lex_last_pos] = lexbuf[lex_start_pos] = lexbuf[lex_curr_pos];
214-
lexbuf[lex_last_action] = -1;
213+
lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
214+
lexbuf.lex_last_action = -1;
215215
}
216216
else {
217217
/* Reentry after refill */
@@ -230,20 +230,20 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
230230
if (backtrk >= 0) {
231231
var pc_off = tbl.lex_backtrk_code[state];
232232
caml_lex_run_tag(tbl.lex_code, pc_off, lexbuf[lex_mem]);
233-
lexbuf[lex_last_pos] = lexbuf[lex_curr_pos];
234-
lexbuf[lex_last_action] = backtrk;
233+
lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
234+
lexbuf.lex_last_action = backtrk;
235235
}
236236
/* See if we need a refill */
237-
if (lexbuf[lex_curr_pos] >= lexbuf[lex_buffer_len]) {
238-
if (lexbuf[lex_eof_reached] == 0)
237+
if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
238+
if (lexbuf.lex_eof_reached == 0)
239239
return -state - 1;
240240
else
241241
c = 256;
242242
}
243243
else {
244244
/* Read next input char */
245-
c = buffer[lexbuf[lex_curr_pos]];
246-
lexbuf[lex_curr_pos]++;
245+
c = buffer[lexbuf.lex_curr_pos];
246+
lexbuf.lex_curr_pos++;
247247
}
248248
/* Determine next state */
249249
var pstate = state;
@@ -253,11 +253,11 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
253253
state = tbl.lex_default[state];
254254
/* If no transition on this char, return to last backtrack point */
255255
if (state < 0) {
256-
lexbuf[lex_curr_pos] = lexbuf[lex_last_pos];
257-
if (lexbuf[lex_last_action] == -1)
256+
lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
257+
if (lexbuf.lex_last_action == -1)
258258
throw exn;
259259
else
260-
return lexbuf[lex_last_action];
260+
return lexbuf.lex_last_action;
261261
}
262262
else {
263263
/* If some transition, get and perform memory moves */
@@ -267,12 +267,12 @@ var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
267267
else
268268
pc_off = tbl.lex_default_code[pstate];
269269
if (pc_off > 0)
270-
caml_lex_run_mem(tbl.lex_code, pc_off, lexbuf[lex_mem], lexbuf[lex_curr_pos]);
270+
caml_lex_run_mem(tbl.lex_code, pc_off, lexbuf[lex_mem], lexbuf.lex_curr_pos);
271271
/* Erase the EOF condition only if the EOF pseudo-character was
272272
consumed by the automaton (i.e. there was no backtrack above)
273273
*/
274274
if (c == 256)
275-
lexbuf[lex_eof_reached] = 0;
275+
lexbuf.lex_eof_reached = 0;
276276
}
277277
}
278278
});

0 commit comments

Comments
 (0)