Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Side by Side Diff: src/messages.js

Issue 6246064: Issue 117 - strict mode and future reserved words (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Address code review comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/parser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 function FormatMessage(message) { 140 function FormatMessage(message) {
141 if (kMessages === 0) { 141 if (kMessages === 0) {
142 kMessages = { 142 kMessages = {
143 // Error 143 // Error
144 cyclic_proto: ["Cyclic __proto__ value"], 144 cyclic_proto: ["Cyclic __proto__ value"],
145 // TypeError 145 // TypeError
146 unexpected_token: ["Unexpected token ", "%0"], 146 unexpected_token: ["Unexpected token ", "%0"],
147 unexpected_token_number: ["Unexpected number"], 147 unexpected_token_number: ["Unexpected number"],
148 unexpected_token_string: ["Unexpected string"], 148 unexpected_token_string: ["Unexpected string"],
149 unexpected_token_identifier: ["Unexpected identifier"], 149 unexpected_token_identifier: ["Unexpected identifier"],
150 unexpected_strict_reserved: ["Unexpected strict mode reserved word"],
150 unexpected_eos: ["Unexpected end of input"], 151 unexpected_eos: ["Unexpected end of input"],
151 malformed_regexp: ["Invalid regular expression: /", "%0", "/: ", "%1"], 152 malformed_regexp: ["Invalid regular expression: /", "%0", "/: ", "%1"],
152 unterminated_regexp: ["Invalid regular expression: missing /"], 153 unterminated_regexp: ["Invalid regular expression: missing /"],
153 regexp_flags: ["Cannot supply flags when constructing one RegExp from another"], 154 regexp_flags: ["Cannot supply flags when constructing one RegExp from another"],
154 incompatible_method_receiver: ["Method ", "%0", " called on incompatible r eceiver ", "%1"], 155 incompatible_method_receiver: ["Method ", "%0", " called on incompatible r eceiver ", "%1"],
155 invalid_lhs_in_assignment: ["Invalid left-hand side in assignment"], 156 invalid_lhs_in_assignment: ["Invalid left-hand side in assignment"],
156 invalid_lhs_in_for_in: ["Invalid left-hand side in for-in"], 157 invalid_lhs_in_for_in: ["Invalid left-hand side in for-in"],
157 invalid_lhs_in_postfix_op: ["Invalid left-hand side expression in postf ix operation"], 158 invalid_lhs_in_postfix_op: ["Invalid left-hand side expression in postf ix operation"],
158 invalid_lhs_in_prefix_op: ["Invalid left-hand side expression in prefi x operation"], 159 invalid_lhs_in_prefix_op: ["Invalid left-hand side expression in prefi x operation"],
159 multiple_defaults_in_switch: ["More than one default clause in switch sta tement"], 160 multiple_defaults_in_switch: ["More than one default clause in switch sta tement"],
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 strict_param_dupe: ["Strict mode function may not have duplicat e parameter names"], 215 strict_param_dupe: ["Strict mode function may not have duplicat e parameter names"],
215 strict_var_name: ["Variable name may not be eval or arguments in strict mode"], 216 strict_var_name: ["Variable name may not be eval or arguments in strict mode"],
216 strict_function_name: ["Function name may not be eval or arguments in strict mode"], 217 strict_function_name: ["Function name may not be eval or arguments in strict mode"],
217 strict_octal_literal: ["Octal literals are not allowed in strict m ode."], 218 strict_octal_literal: ["Octal literals are not allowed in strict m ode."],
218 strict_duplicate_property: ["Duplicate data property in object literal not allowed in strict mode"], 219 strict_duplicate_property: ["Duplicate data property in object literal not allowed in strict mode"],
219 accessor_data_property: ["Object literal may not have data and acces sor property with the same name"], 220 accessor_data_property: ["Object literal may not have data and acces sor property with the same name"],
220 accessor_get_set: ["Object literal may not have multiple get/s et accessors with the same name"], 221 accessor_get_set: ["Object literal may not have multiple get/s et accessors with the same name"],
221 strict_lhs_assignment: ["Assignment to eval or arguments is not all owed in strict mode"], 222 strict_lhs_assignment: ["Assignment to eval or arguments is not all owed in strict mode"],
222 strict_lhs_postfix: ["Postfix increment/decrement may not have e val or arguments operand in strict mode"], 223 strict_lhs_postfix: ["Postfix increment/decrement may not have e val or arguments operand in strict mode"],
223 strict_lhs_prefix: ["Prefix increment/decrement may not have ev al or arguments operand in strict mode"], 224 strict_lhs_prefix: ["Prefix increment/decrement may not have ev al or arguments operand in strict mode"],
225 strict_reserved_word: ["Use of future reserved word in strict mode "],
224 }; 226 };
225 } 227 }
226 var message_type = %MessageGetType(message); 228 var message_type = %MessageGetType(message);
227 var format = kMessages[message_type]; 229 var format = kMessages[message_type];
228 if (!format) return "<unknown message " + message_type + ">"; 230 if (!format) return "<unknown message " + message_type + ">";
229 return FormatString(format, message); 231 return FormatString(format, message);
230 } 232 }
231 233
232 234
233 function GetLineNumber(message) { 235 function GetLineNumber(message) {
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 else throw e; 1054 else throw e;
1053 } 1055 }
1054 } 1056 }
1055 1057
1056 %FunctionSetName(errorToString, 'toString'); 1058 %FunctionSetName(errorToString, 'toString');
1057 %SetProperty($Error.prototype, 'toString', errorToString, DONT_ENUM); 1059 %SetProperty($Error.prototype, 'toString', errorToString, DONT_ENUM);
1058 1060
1059 // Boilerplate for exceptions for stack overflows. Used from 1061 // Boilerplate for exceptions for stack overflows. Used from
1060 // Top::StackOverflow(). 1062 // Top::StackOverflow().
1061 const kStackOverflowBoilerplate = MakeRangeError('stack_overflow', []); 1063 const kStackOverflowBoilerplate = MakeRangeError('stack_overflow', []);
OLDNEW
« no previous file with comments | « no previous file | src/parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698