Proper handling of future reserved words in strict and normal mode.

test/preparser/strict-identifiers.pyt

 # Copyright 2011 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 146 matching lines @@
   ++$id;
   --$id;
   $id += 10;
   $id -= 10;
   try {} catch ($id) { }
   function $id($id) { }
   x = {$id: 42};
   x = {get $id() {}, set $id(value) {}};
 """)
 
+identifier_name_source = """
+  var x = {$id: 42};
+  x = {get $id() {}, set $id(value) {}};
+  x.$id = 42;
+  function foo() { "use strict;" }
+  x = {$id: 42};
+  x = {get $id() {}, set $id(value) {}};
+  x.$id = 42;
+"""
+
+identifier_name = Template("identifier_name-$id", identifier_name_source)
+identifier_name_strict = StrictTemplate("identifier_name_strict-$id",
+                                        identifier_name_source)
+
 # ----------------------------------------------------------------------
 # Run tests
 
 # eval and arguments have specific exceptions for different uses.
 for id in ["eval", "arguments"]:
   arg_name_own({"id": id}, "strict_param_name")
   arg_name_nested({"id": id}, "strict_param_name")
   func_name_own({"id": id}, "strict_function_name")
   func_name_nested({"id": id}, "strict_function_name")
   setter_arg({"id": id}, "strict_param_name")
   for op in assign_ops.keys():
     assign_var({"id": id, "op":op, "opname": assign_ops[op]},
                "strict_lhs_assignment")
   catch_var({"id": id}, "strict_catch_variable")
   declare_var({"id": id}, "strict_var_name")
   prefix_var({"id": id, "op":"++", "opname":"inc"}, "strict_lhs_prefix")
   prefix_var({"id": id, "op":"--", "opname":"dec"}, "strict_lhs_prefix")
   postfix_var({"id": id, "op":"++", "opname":"inc"}, "strict_lhs_postfix")
   postfix_var({"id": id, "op":"--", "opname":"dec"}, "strict_lhs_postfix")
   non_strict_use({"id": id}, None)
 
 
 # Reserved words just throw the same exception in all cases
 # (with "const" being special, as usual).
 for reserved_word in reserved_words + strict_reserved_words:
-  message = "strict_reserved_word"
-  if (reserved_word == "const"): message = "unexpected_token"
+  if (reserved_word in strict_reserved_words):
+    message = "strict_reserved_word"
+  elif (reserved_word == "const"):
+    message = "unexpected_token"
+  else:
+    message = "reserved_word"
   arg_name_own({"id":reserved_word}, message)
   arg_name_nested({"id":reserved_word}, message)
   setter_arg({"id": reserved_word}, message)
   func_name_own({"id":reserved_word}, message)
   func_name_nested({"id":reserved_word}, message)
   for op in assign_ops.keys():
     assign_var({"id":reserved_word, "op":op, "opname": assign_ops[op]}, message)
   catch_var({"id":reserved_word}, message)
   declare_var({"id":reserved_word}, message)
   prefix_var({"id":reserved_word, "op":"++", "opname":"inc"}, message)
   prefix_var({"id":reserved_word, "op":"--", "opname":"dec"}, message)
   postfix_var({"id":reserved_word, "op":"++", "opname":"inc"}, message)
   postfix_var({"id":reserved_word, "op":"--", "opname":"dec"}, message)
   read_var({"id": reserved_word}, message)
+  identifier_name({"id": reserved_word}, None);
+  identifier_name_strict({"id": reserved_word}, None);
 
 
+# Future reserved words in strict mode behave like normal identifiers
+# in a non strict context.
+for reserved_word in strict_reserved_words:
+  non_strict_use({"id": id}, None)