Experimental parser: inline rules

tools/lexer_generator/code_generator.jinja

 #include "lexer/even-more-experimental-scanner.h"
 
 
 {# TODO implement CLASS checks #}
 {%- macro do_key(key) -%}
   {%- for r in key.range_iter() -%}
     {%- if not loop.first %} || {% endif -%}
     {%- if r[0] == 'LATIN_1' -%}
       {%- if r[1][0] == r[1][1] -%}
         yych == {{r[1][0]}}
@@ skipping 35 matching lines @@
   {% elif type == 'push_token' %}
     PUSH_TOKEN(Token::{{value}})
   {% elif type == 'push_token_and_go_forward' %}
     PUSH_TOKEN_AND_GO_FORWARD(Token::{{value}})
   {% else %}
     uncompilable code for {{type}}
   {% endif -%}
 {%- endmacro -%}
 
 
-{%- macro do_dfa_state(state) -%}
+{%- macro do_dfa_state(node_number, inline) -%}
 
-  {%- if start_node_number == state.node_number %}
-    code_start:
-  {% else %}
-    code_{{state.node_number}}:
-  {% endif %}
+  {%- set state = dfa_states[node_number] -%}
+
+  {%- if not inline -%}
+    {%- if state['inline'] -%}
+      bad generated code for {{node_number}}
+    {%- endif -%}
+    {%- if start_node_number == node_number -%}
+      code_start:
+    {%- else -%}
+      code_{{node_number}}:
+    {%- endif -%}
+  {%- else -%}
+    // inlined state {{node_number}}
+  {%- endif %}
 
   {% if debug_print %}
     fprintf(stderr, "state {{state.node_number}}\n");
   {% endif -%}
 
   {%- set entry_action = state.entry_action -%}
   {%- if entry_action %}
     {{ dispatch_action(entry_action[0], entry_action[1]) }}
   {%- endif %}
 
   {%- if debug_print %}
     fprintf(stderr, "char at hand is %c (%d)\n", yych, yych);
-  {% endif %}
+  {% endif -%}
 
-  // matchers
-  {%- for match_key, match_state in state.transitions %}
-    if ({{do_key(match_key)}}) {
-      FORWARD();
-      goto code_{{match_state}};
+  {%- for key, transition_state_id in state.transitions %}
+    {%- set inline_transition = dfa_states[transition_state_id]['inline'] -%}
+    if ({{do_key(key)}}) {
+        FORWARD();
+      {%- if inline_transition %}
+        {{ do_dfa_state(transition_state_id, True) }}
+      {% else %}
+        goto code_{{transition_state_id}};
+      {% endif %}
     }
   {% endfor -%}
 
   {%- set match_action = state.match_action -%}
 
   {%- if match_action %}
     {{ dispatch_action(match_action[0], match_action[1]) }}
     goto code_start;
   {% else %}
     goto default_action;
@@ skipping 43 matching lines @@
 
 namespace v8 {
 namespace internal {
 Token::Value EvenMoreExperimentalScanner::Next(int* beg_pos_to_return,
                                                int* end_pos_to_return) {
   // Setup environment.
   YYCTYPE yych = *cursor_;
 
 {# first node is start node #}
 {% for dfa_state in dfa_states -%}
-  {{ do_dfa_state(dfa_state) }}
+  {%- set inline = dfa_state['inline'] -%}
+  {%- if not inline %}
+    {{ do_dfa_state(dfa_state['node_number'], False) }}
+  {%- endif -%}
 {%- endfor %}
 
   // Should never fall off the edge.
   goto fell_through;
   // Execute the default action.
   default_action:
 {%- if debug_print %}
     fprintf(stderr, "default action\n");
 {% endif -%}
     {{dispatch_action(default_action[0], default_action[1])}}
   FORWARD();
   goto code_start;
 
   fell_through:
   CHECK(false);
 }
 } }