Experimental parser: continue unifying the API with Scanner.

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 172 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() {        \
-  *beg_pos_to_return = start_ - buffer_; \
-  *end_pos_to_return = cursor_ - buffer_; \
+  next_.beg_pos = start_ - buffer_;   \
+  next_.end_pos = cursor_ - buffer_;  \
   start_ = cursor_;                   \
   just_seen_line_terminator_ = false; \
 }
 
 #define PUSH_TOKEN(T) {               \
   PREPARE_PUSH_TOKEN();               \
-  return T;                           \
+  next_.token = T;                    \
+  return;                             \
 }
 
 #define PUSH_TOKEN_AND_GO_FORWARD(T) {\
   PREPARE_PUSH_TOKEN();               \
   FORWARD();                          \
-  return T;                           \
+  next_.token = T;                    \
+  return;                             \
 }
 
 #define PUSH_EOS() {                  \
   cursor_ -= 1;                       \
   PUSH_TOKEN(Token::EOS);             \
 }
 
 #define PUSH_LINE_TERMINATOR(s) {     \
   start_ = cursor_;                   \
   just_seen_line_terminator_ = true;  \
@@ skipping 10 matching lines @@
   else primary_char = *(cursor_);                 \
 }
 
 #define SKIP() {                      \
   start_ = cursor_;                   \
 }
 
 namespace v8 {
 namespace internal {
 template<>
-Token::Value ExperimentalScanner<{{char_type}}>::Next(int* beg_pos_to_return,
-                                                      int* end_pos_to_return) {
+void ExperimentalScanner<{{char_type}}>::Scan() {
   // Setup environment.
   {{char_type}} primary_char;
   if (cursor_ >= buffer_end_) primary_char = 0;
   else primary_char = *(cursor_);
 
 {# first node is start node #}
 {% for dfa_state in dfa_states -%}
   {%- 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);
 }
 } }