Experimental parser: simplify goto logic

tools/lexer_generator/code_generator.jinja

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 69 matching lines @@
   {% elif type == 'skip' %}
     SKIP();
   {% elif type == 'skip_and_terminate' %}
     SKIP();
     --start_;
     {{dispatch_action('terminate', None)}}
   {% elif type == 'line_terminator' %}
     DO_LINE_TERMINATOR();
   {% elif type == 'token' %}
     DO_TOKEN(Token::{{value}})
-  {% elif type == 'goto' %}
-    goto code_after_entry_{{value}};
+  {% elif type == 'goto_start' %}
+    goto code_{{value[0]}};
   {% elif type == 'store_token' %}
     stored_token = Token::{{value}};
+  {% elif type == 'store_token_and_goto' %}
+    stored_token = Token::{{value[0]}};
+    goto code_after_entry_{{value[1]}};
   {% elif type == 'do_stored_token' %}
     DO_TOKEN(stored_token)
   {% elif type == 'do_token_and_go_forward' %}
     DO_TOKEN_AND_GO_FORWARD(Token::{{value}})
   {% elif type == 'harmony_token' %}
     if (harmony_{{value[0]}}_) {
-      DO_TOKEN(Token::{{value[1][0]}});
+      DO_TOKEN(Token::{{value[1]}});
     } else {
-      DO_TOKEN(Token::{{value[1][1]}});
+      DO_TOKEN(Token::{{value[2]}});
     }
-  {% elif type == 'store_harmony_token' %}
+  {% elif type == 'store_harmony_token_and_goto' %}
     if (harmony_{{value[0]}}_) {
-      stored_token = Token::{{value[1][0]}};
+      stored_token = Token::{{value[1]}};
     } else {
-      stored_token = Token::{{value[1][1]}};
+      stored_token = Token::{{value[2]}};
     }
+    goto code_after_entry_{{value[3]}};
   {% elif type == 'set_marker' %}
     marker_ = cursor_ - {{value}};
   {% else %}
     uncompilable code for {{type}}
   {% endif -%}
 {%- endmacro -%}
 
 
 {%- macro long_char_check() -%}
   {%- if encoding == 'utf16'-%}
@@ skipping 187 matching lines @@
   FORWARD();
   goto code_start;
 
   fell_through:
   ((void(*)())0)(); // crash
   // force use of stored_token
   stored_token = Token::ILLEGAL;
 }
 } }