Experimental parser: merge to r19637

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 70 matching lines @@
     has_multiline_comment_before_next_ = true;
   {% elif type == 'store_token' %}
     stored_token = Token::{{args[0]}};
   {% elif type == 'store_harmony_token' %}
     if (harmony_{{args[0]}}_) {
       stored_token = Token::{{args[1]}};
     } else {
       stored_token = Token::{{args[2]}};
     }
   {% elif type == 'check_escaped_identifier_start' %}
-    if (!ValidIdentifierStart()) goto default_action;
+    if (!unicode_cache_->IsIdentifierStart(ScanHexNumber(4))) {
+      goto default_action;
+    }
     next_.has_escapes = true;
   {% elif type == 'check_escaped_identifier_part' %}
-    if (!ValidIdentifierPart()) goto default_action;
+    if (!unicode_cache_->IsIdentifierPart(ScanHexNumber(4))) {
+      goto default_action;
+    }
     next_.has_escapes = true;
   {% elif type == 'if_line_terminator_backtrack' %}
     if (!has_line_terminator_before_next_) {
       {{dispatch_match_action('manual_backtrack', args)}}
     }
   {% elif type == 'store_lexing_state' %}
     STORE_LEXING_STATE();
   {% elif type == 'chain' %}
     {%- for arg in args %}
       {{dispatch_entry_action(arg.name(), arg.args())}}
@@ skipping 187 matching lines @@
   {%- endif -%}
 
   {%- if state['omega_transition'] %}
     {{ do_transition(state['omega_transition'], False) }}
   {%- endif -%}
 
   goto default_action; {# this is wrong, should be CRASH(); #}
 
 {%- endmacro %}
 
-#include "lexer/experimental-scanner.h"
+#include "lexer/lexer.h"
 
 #define RESET_START() {               \
   start_ = cursor_;                   \
 }
 
 #define STORE_LEXING_STATE() {        \
   stored_marker = marker;             \
   stored_cursor = cursor_;            \
   stored_start = start_;              \
 }
@@ skipping 23 matching lines @@
   if (cursor_ >= buffer_end_) primary_char = 0;   \
   else primary_char = *(cursor_);                 \
 }
 
 #ifdef DEBUG
 #define CRASH() { ((void(*)())0)(); }
 #else
 #define CRASH() { }
 #endif
 
+
 namespace v8 {
 namespace internal {
 template<>
-void ExperimentalScanner<{{char_type}}>::Scan() {
+void Lexer<{{char_type}}>::Scan() {
 
   // Setup environment.
   next_.has_escapes = false;
   next_.is_onebyte = true;
   Token::Value stored_token;
   const {{char_type}} * marker;
   {{char_type}} primary_char;
   const {{char_type}} * stored_marker;  {# TODO(dcarney): complete this #}
   const {{char_type}} * stored_cursor;
   const {{char_type}} * stored_start;
@@ skipping 18 matching lines @@
     // force use of stored_token
     stored_token = Token::ILLEGAL;
     // force use of marker
     marker = NULL;
     // force use of state_entry_0
     goto state_entry_0;
   }
 }
 } }