Experimental parser: cleanup deferred transitions

tools/lexer_generator/code_generator.jinja

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 25 matching lines @@
     {%- if r[0] == 'PRIMARY_RANGE' -%}
       {%- if r[1][0] == r[1][1] -%}
         primary_char == {{r[1][0]}}
       {%- elif r[1][0] == 0 -%}
         primary_char <= {{r[1][1]}}
       {%- elif r[1][1] == upper_bound and not encoding == 'utf16'-%}
         primary_char >= {{r[1][0]}}
       {%- else -%}
         ({{r[1][0]}} <= primary_char && primary_char <= {{r[1][1]}})
       {%- endif -%}
-    {%- elif r[0] == 'CLASS' -%}
-      {%- if r[1] == 'eos' -%}
-        (primary_char == 0 && cursor_ >= buffer_end_)
-      {%- elif r[1] == 'zero' -%}
-        (primary_char == 0 && cursor_ < buffer_end_)
-      {%- else %}
-        uncompilable code for {{encoding}} {{r[0]}} {{r[1]}}
-      {%- endif -%}
     {# These classes require long_char and to be outside the primary range #}
     {%- elif r[0] == 'LONG_CHAR_CLASS' and encoding in ['utf16', 'utf8'] -%}
       {%- if r[1] == 'byte_order_mark' -%}
         (long_char == 0xfffe || long_char == 0xfeff)
       {%- elif r[1] == 'call' -%}
         unicode_cache_->{{r[2]}}(long_char)
       {%- elif r[1] == 'invert' -%}
         !({{do_key(r[2])}})
       {%- elif r[1] == 'catch_all' -%}
         (true || long_char == 0) /* {{r[1]}} */
@@ skipping 203 matching lines @@
     {% endfor -%}
     }
   {%- endif -%}
 
   {%- for key, jump_id in state['if_transitions'] %}
     if ({{do_key(key)}}) { // normal if transition
       {{ do_transition(jump_id) }}
     }
   {% endfor -%}
 
-  {%- for key, jump_id in state['deferred_transitions'] %}
-    if ({{do_key(key)}}) { // deferred transition
-      {{ do_transition(jump_id) }}
-    }
-  {% endfor -%}
-
-  {%- if state['long_char_transitions'] -%}
+  {%- if state['deferred_transitions'] -%}
     if ({{long_char_check()}}) {
       next_.is_onebyte = false;
       {{long_char_create()}}
-      {%- for key, jump_id in state['long_char_transitions'] %}
+      {%- for key, jump_id in state['deferred_transitions'] %}
         if ({{do_key(key)}}) { // long_char transition
           {{ do_transition(jump_id) }}
         }
       {% endfor -%}
     }
   {%- endif-%}
 
   {{ write_label('before_match', node_number) }}
 
   {%- set match_action = state.match_action -%}
@@ skipping 69 matching lines @@
     // force use of stored_token
     stored_token = Token::ILLEGAL;
     // force use of marker
     marker = NULL;
     // force use of state_entry_0
     goto state_entry_0;
   }
 }
 } }