Experimentar scanner: Unify the API to Scanner API some more.

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 175 matching lines @@
   {% else %}
     goto default_action;
   {%- endif %}
 
 {%- endmacro %}
 
 #define PREPARE_PUSH_TOKEN() {        \
   next_.beg_pos = start_ - buffer_;   \
   next_.end_pos = cursor_ - buffer_;  \
   start_ = cursor_;                   \
-  just_seen_line_terminator_ = false; \
 }
 
 #define PUSH_TOKEN(T) {               \
   PREPARE_PUSH_TOKEN();               \
   next_.token = T;                    \
   return;                             \
 }
 
 #define PUSH_TOKEN_AND_GO_FORWARD(T) {\
   PREPARE_PUSH_TOKEN();               \
   FORWARD();                          \
   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;  \
+  has_line_terminator_before_next_ = true; \
 }
 
 #define FORWARD() {                               \
   if (++cursor_ >= buffer_end_) primary_char = 0; \
   else primary_char = *(cursor_);                 \
 }
 
 #define BACKWARD(n) {                             \
   cursor_ -= n;                                   \
   if (cursor_ >= buffer_end_) primary_char = 0;   \
@@ skipping 30 matching lines @@
 {% endif -%}
     {{dispatch_action(default_action[0], default_action[1])}}
   FORWARD();
   goto code_start;
 
   fell_through:
   CHECK(false);
 }
 } }