Experimental parser: cleanup naming a bit

tools/lexer_generator/code_generator.jinja

 #include "lexer/experimental-scanner.h"
 
 {%- macro do_key(key) -%}
   {%- for r in key -%}
     {%- if not loop.first %} || {% endif -%}
     {%- 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]}}
@@ skipping 27 matching lines @@
       uncompilable code for {{encoding}} {{r[0]}} {{r[1]}}
     {%- endif -%}
   {%- endfor -%}
 {%- endmacro -%}
 
 
 {% macro dispatch_action(type, value) -%}
   {%- if type == 'code' %}
     {{value}}
   {% elif type == 'terminate' %}
-    PUSH_EOS();
+    DO_EOS();
   {% elif type == 'terminate_illegal' %}
-    start_ = marker_; BACKWARD(1); PUSH_TOKEN(Token::ILLEGAL);
+    start_ = marker_;
+    BACKWARD(1);
+    DO_TOKEN(Token::ILLEGAL);
   {% elif type == 'skip' %}
     SKIP();
   {% elif type == 'skip_and_terminate' %}
     SKIP();
     --start_;
     {{dispatch_action('terminate', None)}}
-  {% elif type == 'push_line_terminator' %}
-    PUSH_LINE_TERMINATOR();
-  {% elif type == 'push_token' %}
-    PUSH_TOKEN(Token::{{value}})
-  {% elif type == 'push_token_and_go_forward' %}
-    PUSH_TOKEN_AND_GO_FORWARD(Token::{{value}})
-  {% elif type == 'push_harmony_token' %}
+  {% elif type == 'line_terminator' %}
+    DO_LINE_TERMINATOR();
+  {% elif type == 'token' %}
+    DO_TOKEN(Token::{{value}})
+  {% elif type == 'do_token_and_go_forward' %}
+    DO_TOKEN_AND_GO_FORWARD(Token::{{value}})
+  {% elif type == 'harmony_token' %}
     if (harmony_{{value[0]}}_) {
-      PUSH_TOKEN(Token::{{value[1][0]}});
+      DO_TOKEN(Token::{{value[1][0]}});
     } else {
-      PUSH_TOKEN(Token::{{value[1][1]}});
+      DO_TOKEN(Token::{{value[1][1]}});
     }
   {% elif type == 'set_marker' %}
     marker_ = cursor_ - {{value}};
   {% else %}
     uncompilable code for {{type}}
   {% endif -%}
 {%- endmacro -%}
 
 
 {%- macro long_char_check() -%}
@@ skipping 104 matching lines @@
 
   {%- if match_action %}
     {{ dispatch_action(match_action[0], match_action[1]) }}
     goto code_start;
   {% else %}
     goto default_action;
   {%- endif %}
 
 {%- endmacro %}
 
-#define PREPARE_PUSH_TOKEN() {        \
+#define PREPARE_TOKEN() {             \
   next_.beg_pos = start_ - buffer_;   \
   next_.end_pos = cursor_ - buffer_;  \
   start_ = cursor_;                   \
 }
 
-#define PUSH_TOKEN(T) {               \
-  PREPARE_PUSH_TOKEN();               \
+#define DO_TOKEN(T) {                 \
+  PREPARE_TOKEN();                    \
   next_.token = T;                    \
   return;                             \
 }
 
-#define PUSH_TOKEN_AND_GO_FORWARD(T) {\
-  PREPARE_PUSH_TOKEN();               \
+#define DO_TOKEN_AND_GO_FORWARD(T) {  \
+  PREPARE_TOKEN();                    \
   FORWARD();                          \
   next_.token = T;                    \
   return;                             \
 }
 
-#define PUSH_EOS() {                  \
+#define DO_EOS() {                    \
   cursor_ -= 1;                       \
-  PUSH_TOKEN(Token::EOS);             \
+  DO_TOKEN(Token::EOS);               \
 }
 
-#define PUSH_LINE_TERMINATOR(s) {     \
-  start_ = cursor_;                   \
+#define DO_LINE_TERMINATOR(s) {            \
+  start_ = cursor_;                        \
   has_line_terminator_before_next_ = true; \
 }
 
 #define FORWARD() {                               \
   if (++cursor_ >= buffer_end_) primary_char = 0; \
   else primary_char = *(cursor_);                 \
 }
 
 #define BACKWARD(n) {                             \
   cursor_ -= n;                                   \
@@ skipping 31 matching lines @@
 {% endif -%}
     {{dispatch_action(default_action[0], default_action[1])}}
   FORWARD();
   goto code_start;
 
   fell_through:
   CHECK(false);
 }
 } }