clean up lexing runtime

Author: bobzhang

jscomp/runtime/caml_lexer.ml

@@ -104,13 +104,12 @@ function caml_lex_array(s) {
  *)
 let caml_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int = [%raw{|function (tbl, start_state, lexbuf, exn){
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
-        tbl.lex_default = caml_lex_array(tbl.lex_default);
-        tbl.processed = true;
+        tbl.lex_default = caml_lex_array(tbl.lex_default);  
     }
     var c;
     var state = start_state;
@@ -240,18 +239,19 @@ function caml_lex_run_tag(s, i, mem) {
 
 let caml_new_lex_engine_aux : lex_tables -> int -> lexbuf -> exn -> int= [%raw{|function (tbl, start_state, lexbuf, exn) {
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
         tbl.lex_default = caml_lex_array(tbl.lex_default);
+    }
+    if(!Array.isArray(tbl.lex_default_code)){    
         tbl.lex_base_code = caml_lex_array(tbl.lex_base_code);
         tbl.lex_backtrk_code = caml_lex_array(tbl.lex_backtrk_code);
         tbl.lex_check_code = caml_lex_array(tbl.lex_check_code);
         tbl.lex_trans_code = caml_lex_array(tbl.lex_trans_code);
         tbl.lex_default_code = caml_lex_array(tbl.lex_default_code);
-        tbl.processed = true;
     }
     var c, state = start_state;
     //var buffer = caml_bytes_of_string(lexbuf.lex_buffer);

lib/es6/caml_lexer.js

@@ -33,13 +33,12 @@ function caml_lex_array(s) {
 
 var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
-        tbl.lex_default = caml_lex_array(tbl.lex_default);
-        tbl.processed = true;
+        tbl.lex_default = caml_lex_array(tbl.lex_default);  
     }
     var c;
     var state = start_state;
@@ -159,18 +158,19 @@ function caml_lex_run_tag(s, i, mem) {
 
 var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
         tbl.lex_default = caml_lex_array(tbl.lex_default);
+    }
+    if(!Array.isArray(tbl.lex_default_code)){    
         tbl.lex_base_code = caml_lex_array(tbl.lex_base_code);
         tbl.lex_backtrk_code = caml_lex_array(tbl.lex_backtrk_code);
         tbl.lex_check_code = caml_lex_array(tbl.lex_check_code);
         tbl.lex_trans_code = caml_lex_array(tbl.lex_trans_code);
         tbl.lex_default_code = caml_lex_array(tbl.lex_default_code);
-        tbl.processed = true;
     }
     var c, state = start_state;
     //var buffer = caml_bytes_of_string(lexbuf.lex_buffer);

lib/js/caml_lexer.js

@@ -33,13 +33,12 @@ function caml_lex_array(s) {
 
 var caml_lex_engine_aux = (function (tbl, start_state, lexbuf, exn){
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
-        tbl.lex_default = caml_lex_array(tbl.lex_default);
-        tbl.processed = true;
+        tbl.lex_default = caml_lex_array(tbl.lex_default);  
     }
     var c;
     var state = start_state;
@@ -159,18 +158,19 @@ function caml_lex_run_tag(s, i, mem) {
 
 var caml_new_lex_engine_aux = (function (tbl, start_state, lexbuf, exn) {
 
-    if (!tbl.processed) {
+    if (!Array.isArray(tbl.lex_default)) {
         tbl.lex_base = caml_lex_array(tbl.lex_base);
         tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
         tbl.lex_check = caml_lex_array(tbl.lex_check);
         tbl.lex_trans = caml_lex_array(tbl.lex_trans);
         tbl.lex_default = caml_lex_array(tbl.lex_default);
+    }
+    if(!Array.isArray(tbl.lex_default_code)){    
         tbl.lex_base_code = caml_lex_array(tbl.lex_base_code);
         tbl.lex_backtrk_code = caml_lex_array(tbl.lex_backtrk_code);
         tbl.lex_check_code = caml_lex_array(tbl.lex_check_code);
         tbl.lex_trans_code = caml_lex_array(tbl.lex_trans_code);
         tbl.lex_default_code = caml_lex_array(tbl.lex_default_code);
-        tbl.processed = true;
     }
     var c, state = start_state;
     //var buffer = caml_bytes_of_string(lexbuf.lex_buffer);