Experimental parser: cleanup switch generation

tools/lexer_generator/code_generator.jinja

Index: tools/lexer_generator/code_generator.jinja
diff --git a/tools/lexer_generator/code_generator.jinja b/tools/lexer_generator/code_generator.jinja
index fb5d8ea2986f961ef10a6a0aa3d7c2c87091db14..acc2262b0c513ac435f2ed3af685142a96b79a71 100644
--- a/tools/lexer_generator/code_generator.jinja
+++ b/tools/lexer_generator/code_generator.jinja
@@ -83,30 +83,32 @@
     fprintf(stderr, "char at hand is %c (%d)\n", yych, yych);
   {% endif -%}
 
+  {%- macro do_transition(transition_state_id) -%}
+    {%- set inline_transition = dfa_states[transition_state_id]['inline'] %}
+    FORWARD();
+    {%- if inline_transition %}
+      {{ do_dfa_state(transition_state_id, True) }}
+    {% else %}
+      goto code_{{transition_state_id}};
+    {% endif %}
+  {%- endmacro -%}
+
   {%- if state['switch_transitions'] -%}
     switch(yych) {
-    {%- for key, transition_state_id in state['switch_transitions'] %}
-        case {{key}}:
-      {%- set inline_transition = dfa_states[transition_state_id]['inline'] %}
-      FORWARD();
-      {%- if inline_transition %}
-        {{ do_dfa_state(transition_state_id, True) }}
-      {% else %}
-        goto code_{{transition_state_id}};
-      {% endif %}
+    {%- for ranges, transition_state_id in state['switch_transitions'] %}
+      {%- for r in ranges -%}
+        {%- for key in range(r[0], r[1] + 1) -%}
+          case {{key}}:
+        {% endfor %}
+      {%- endfor -%}
+      {{ do_transition(transition_state_id) }}
     {% endfor -%}
     }
   {%- endif -%}
 
   {%- for key, transition_state_id in state.transitions %}
     if ({{do_key(key)}}) {
-      {%- set inline_transition = dfa_states[transition_state_id]['inline'] %}
-      FORWARD();
-      {%- if inline_transition %}
-        {{ do_dfa_state(transition_state_id, True) }}
-      {% else %}
-        goto code_{{transition_state_id}};
-      {% endif %}
+      {{ do_transition(transition_state_id) }}
     }
   {% endfor -%}