@ -28,27 +28,14 @@
// -------------------------------------------------------------------
// -------------------------------------------------------------------
//
//
// Matches Script::Type from objects.h
var TYPE_NATIVE = 0 ;
var TYPE_EXTENSION = 1 ;
var TYPE_NORMAL = 2 ;
// Matches Script::CompilationType from objects.h
var COMPILATION_TYPE_HOST = 0 ;
var COMPILATION_TYPE_EVAL = 1 ;
var COMPILATION_TYPE_JSON = 2 ;
// Matches Messages::kNoLineNumberInfo from v8.h
var kNoLineNumberInfo = 0 ;
// If this object gets passed to an error constructor the error will
// If this object gets passed to an error constructor the error will
// get an accessor for .message that constructs a descriptive error
// get an accessor for .message that constructs a descriptive error
// message on access.
// message on access.
var kAddMessageAccessorsMarker = { } ; const kAddMessageAccessorsMarker = { } ;
var kMessages = 0 ; // This will be lazily initialized when first needed (and forcibly
// overwritten even though it's const).
var kReplacementMarkers = [ "%0" , "%1" , "%2" , "%3" ] ; const kMessages = 0 ;
function FormatString ( format , message ) { function FormatString ( format , message ) {
var args = % MessageGetArguments ( message ) ; var args = % MessageGetArguments ( message ) ;
@ -56,14 +43,16 @@ function FormatString(format, message) {
var arg_num = 0 ; var arg_num = 0 ;
for ( var i = 0 ; i < format . length ; i ++ ) { for ( var i = 0 ; i < format . length ; i ++ ) {
var str = format [ i ] ; var str = format [ i ] ;
for ( arg_num = 0 ; arg_num < kReplacementMarkers . length ; arg_num ++ ) { if ( str . length == 2 && % _ StringCharCodeAt ( str , 0 ) == 0x25 ) {
if ( str == kReplacementMarkers [ arg_num ] ) { // Two-char string starts with "%".
var arg_num = ( % _ StringCharCodeAt ( str , 1 ) - 0x30 ) >>> 0 ;
if ( arg_num < 4 ) {
// str is one of %0, %1, %2 or %3.
try { try {
str = ToDetailString ( args [ arg_num ] ) ; str = ToDetailString ( args [ arg_num ] ) ;
} catch ( e ) { } catch ( e ) {
str = "#<error>" ; str = "#<error>" ;
} }
break ;
} }
} }
result += str ; result += str ;
@ -102,18 +91,16 @@ function ToStringCheckErrorObject(obj) {
function ToDetailString ( obj ) { function ToDetailString ( obj ) {
if ( obj != null && IS_OBJECT ( obj ) && if ( obj != null && IS_OBJECT ( obj ) && obj . toString === ObjectToString ) {
obj . toString === $Object . prototype . toString ) {
var constructor = obj . constructor ; var constructor = obj . constructor ;
if ( ! constructor ) return ToStringCheckErrorObject ( obj ) ; if ( typeof constructor == "function" ) {
var constructorName = constructor . name ; var constructorName = constructor . name ;
if ( ! constructorName || ! IS_STRING ( constructorName ) ) { if ( IS_STRING ( constructorName ) && constructorName !== "" ) {
return ToStringCheckErrorObject ( obj ) ; return "#<" + constructorName + ">" ;
}
} }
return "#<" + constructorName + ">" ;
} else {
return ToStringCheckErrorObject ( obj ) ;
} }
return ToStringCheckErrorObject ( obj ) ;
} }
@ -129,10 +116,11 @@ function MakeGenericError(constructor, type, args) {
/ * * / * *
* Setup the Script function and constructor . * Set up the Script function and constructor .
* / * /
% FunctionSetInstanceClassName ( Script , 'Script' ) ; % FunctionSetInstanceClassName ( Script , 'Script' ) ;
% SetProperty ( Script . prototype , 'constructor' , Script , DONT_ENUM ) ; % SetProperty ( Script . prototype , 'constructor' , Script ,
DONT_ENUM | DONT_DELETE | READ_ONLY ) ;
% SetCode ( Script , function ( x ) { % SetCode ( Script , function ( x ) {
// Script objects can only be created by the VM.
// Script objects can only be created by the VM.
throw new $Error ( "Not supported" ) ; throw new $Error ( "Not supported" ) ;
@ -142,116 +130,132 @@ function MakeGenericError(constructor, type, args) {
// Helper functions; called from the runtime system.
// Helper functions; called from the runtime system.
function FormatMessage ( message ) { function FormatMessage ( message ) {
if ( kMessages === 0 ) { if ( kMessages === 0 ) {
kMessages = { var messagesDictionary = [
// Error
// Error
cyclic_proto : [ "Cyclic __proto__ value" ] , "cyclic_proto" , [ "Cyclic __proto__ value" ] ,
code_gen_from_strings : [ "Code generation from strings disallowed for this context" ] , "code_gen_from_strings" , [ "Code generation from strings disallowed for this context" ] ,
// TypeError
// TypeError
unexpected_token : [ "Unexpected token " , "%0" ] , "unexpected_token" , [ "Unexpected token " , "%0" ] ,
unexpected_token_number : [ "Unexpected number" ] , "unexpected_token_number" , [ "Unexpected number" ] ,
unexpected_token_string : [ "Unexpected string" ] , "unexpected_token_string" , [ "Unexpected string" ] ,
unexpected_token_identifier : [ "Unexpected identifier" ] , "unexpected_token_identifier" , [ "Unexpected identifier" ] ,
unexpected_reserved : [ "Unexpected reserved word" ] , "unexpected_reserved" , [ "Unexpected reserved word" ] ,
unexpected_strict_reserved : [ "Unexpected strict mode reserved word" ] , "unexpected_strict_reserved" , [ "Unexpected strict mode reserved word" ] ,
unexpected_eos : [ "Unexpected end of input" ] , "unexpected_eos" , [ "Unexpected end of input" ] ,
malformed_regexp : [ "Invalid regular expression: /" , "%0" , "/: " , "%1" ] , "malformed_regexp" , [ "Invalid regular expression: /" , "%0" , "/: " , "%1" ] ,
unterminated_regexp : [ "Invalid regular expression: missing /" ] , "unterminated_regexp" , [ "Invalid regular expression: missing /" ] ,
regexp_flags : [ "Cannot supply flags when constructing one RegExp from another" ] , "regexp_flags" , [ "Cannot supply flags when constructing one RegExp from another" ] ,
incompatible_method_receiver : [ "Method " , "%0" , " called on incompatible receiver " , "%1" ] , "incompatible_method_receiver" , [ "Method " , "%0" , " called on incompatible receiver " , "%1" ] ,
invalid_lhs_in_assignment : [ "Invalid left-hand side in assignment" ] , "invalid_lhs_in_assignment" , [ "Invalid left-hand side in assignment" ] ,
invalid_lhs_in_for_in : [ "Invalid left-hand side in for-in" ] , "invalid_lhs_in_for_in" , [ "Invalid left-hand side in for-in" ] ,
invalid_lhs_in_postfix_op : [ "Invalid left-hand side expression in postfix operation" ] , "invalid_lhs_in_postfix_op" , [ "Invalid left-hand side expression in postfix operation" ] ,
invalid_lhs_in_prefix_op : [ "Invalid left-hand side expression in prefix operation" ] , "invalid_lhs_in_prefix_op" , [ "Invalid left-hand side expression in prefix operation" ] ,
multiple_defaults_in_switch : [ "More than one default clause in switch statement" ] , "multiple_defaults_in_switch" , [ "More than one default clause in switch statement" ] ,
newline_after_throw : [ "Illegal newline after throw" ] , "newline_after_throw" , [ "Illegal newline after throw" ] ,
redeclaration : [ "%0" , " '" , "%1" , "' has already been declared" ] , "redeclaration" , [ "%0" , " '" , "%1" , "' has already been declared" ] ,
no_catch_or_finally : [ "Missing catch or finally after try" ] , "no_catch_or_finally" , [ "Missing catch or finally after try" ] ,
unknown_label : [ "Undefined label '" , "%0" , "'" ] , "unknown_label" , [ "Undefined label '" , "%0" , "'" ] ,
uncaught_exception : [ "Uncaught " , "%0" ] , "uncaught_exception" , [ "Uncaught " , "%0" ] ,
stack_trace : [ "Stack Trace:\n" , "%0" ] , "stack_trace" , [ "Stack Trace:\n" , "%0" ] ,
called_non_callable : [ "%0" , " is not a function" ] , "called_non_callable" , [ "%0" , " is not a function" ] ,
undefined_method : [ "Object " , "%1" , " has no method '" , "%0" , "'" ] , "undefined_method" , [ "Object " , "%1" , " has no method '" , "%0" , "'" ] ,
property_not_function : [ "Property '" , "%0" , "' of object " , "%1" , " is not a function" ] , "property_not_function" , [ "Property '" , "%0" , "' of object " , "%1" , " is not a function" ] ,
cannot_convert_to_primitive : [ "Cannot convert object to primitive value" ] , "cannot_convert_to_primitive" , [ "Cannot convert object to primitive value" ] ,
not_constructor : [ "%0" , " is not a constructor" ] , "not_constructor" , [ "%0" , " is not a constructor" ] ,
not_defined : [ "%0" , " is not defined" ] , "not_defined" , [ "%0" , " is not defined" ] ,
non_object_property_load : [ "Cannot read property '" , "%0" , "' of " , "%1" ] , "non_object_property_load" , [ "Cannot read property '" , "%0" , "' of " , "%1" ] ,
non_object_property_store : [ "Cannot set property '" , "%0" , "' of " , "%1" ] , "non_object_property_store" , [ "Cannot set property '" , "%0" , "' of " , "%1" ] ,
non_object_property_call : [ "Cannot call method '" , "%0" , "' of " , "%1" ] , "non_object_property_call" , [ "Cannot call method '" , "%0" , "' of " , "%1" ] ,
with_expression : [ "%0" , " has no properties" ] , "with_expression" , [ "%0" , " has no properties" ] ,
illegal_invocation : [ "Illegal invocation" ] , "illegal_invocation" , [ "Illegal invocation" ] ,
no_setter_in_callback : [ "Cannot set property " , "%0" , " of " , "%1" , " which has only a getter" ] , "no_setter_in_callback" , [ "Cannot set property " , "%0" , " of " , "%1" , " which has only a getter" ] ,
apply_non_function : [ "Function.prototype.apply was called on " , "%0" , ", which is a " , "%1" , " and not a function" ] , "apply_non_function" , [ "Function.prototype.apply was called on " , "%0" , ", which is a " , "%1" , " and not a function" ] ,
apply_wrong_args : [ "Function.prototype.apply: Arguments list has wrong type" ] , "apply_wrong_args" , [ "Function.prototype.apply: Arguments list has wrong type" ] ,
invalid_in_operator_use : [ "Cannot use 'in' operator to search for '" , "%0" , "' in " , "%1" ] , "invalid_in_operator_use" , [ "Cannot use 'in' operator to search for '" , "%0" , "' in " , "%1" ] ,
instanceof_function_expected : [ "Expecting a function in instanceof check, but got " , "%0" ] , "instanceof_function_expected" , [ "Expecting a function in instanceof check, but got " , "%0" ] ,
instanceof_nonobject_proto : [ "Function has non-object prototype '" , "%0" , "' in instanceof check" ] , "instanceof_nonobject_proto" , [ "Function has non-object prototype '" , "%0" , "' in instanceof check" ] ,
null_to_object : [ "Cannot convert null to object" ] , "null_to_object" , [ "Cannot convert null to object" ] ,
reduce_no_initial : [ "Reduce of empty array with no initial value" ] , "reduce_no_initial" , [ "Reduce of empty array with no initial value" ] ,
getter_must_be_callable : [ "Getter must be a function: " , "%0" ] , "getter_must_be_callable" , [ "Getter must be a function: " , "%0" ] ,
setter_must_be_callable : [ "Setter must be a function: " , "%0" ] , "setter_must_be_callable" , [ "Setter must be a function: " , "%0" ] ,
value_and_accessor : [ "Invalid property. A property cannot both have accessors and be writable or have a value: " , "%0" ] , "value_and_accessor" , [ "Invalid property. A property cannot both have accessors and be writable or have a value, " , "%0" ] ,
proto_object_or_null : [ "Object prototype may only be an Object or null" ] , "proto_object_or_null" , [ "Object prototype may only be an Object or null" ] ,
property_desc_object : [ "Property description must be an object: " , "%0" ] , "property_desc_object" , [ "Property description must be an object: " , "%0" ] ,
redefine_disallowed : [ "Cannot redefine property: " , "%0" ] , "redefine_disallowed" , [ "Cannot redefine property: " , "%0" ] ,
define_disallowed : [ "Cannot define property:" , "%0" , ", object is not extensible." ] , "define_disallowed" , [ "Cannot define property:" , "%0" , ", object is not extensible." ] ,
non_extensible_proto : [ "%0" , " is not extensible" ] , "non_extensible_proto" , [ "%0" , " is not extensible" ] ,
handler_non_object : [ "Proxy." , "%0" , " called with non-object as handler" ] , "handler_non_object" , [ "Proxy." , "%0" , " called with non-object as handler" ] ,
handler_trap_missing : [ "Proxy handler " , "%0" , " has no '" , "%1" , "' trap" ] , "handler_trap_missing" , [ "Proxy handler " , "%0" , " has no '" , "%1" , "' trap" ] ,
handler_trap_must_be_callable : [ "Proxy handler " , "%0" , " has non-callable '" , "%1" , "' trap" ] , "handler_trap_must_be_callable" , [ "Proxy handler " , "%0" , " has non-callable '" , "%1" , "' trap" ] ,
handler_returned_false : [ "Proxy handler " , "%0" , " returned false for '" , "%1" , "' trap" ] , "handler_returned_false" , [ "Proxy handler " , "%0" , " returned false for '" , "%1" , "' trap" ] ,
handler_returned_undefined : [ "Proxy handler " , "%0" , " returned undefined for '" , "%1" , "' trap" ] , "handler_returned_undefined" , [ "Proxy handler " , "%0" , " returned undefined for '" , "%1" , "' trap" ] ,
proxy_prop_not_configurable : [ "Trap " , "%1" , " of proxy handler " , "%0" , " returned non-configurable descriptor for property " , "%2" ] , "proxy_prop_not_configurable" , [ "Trap " , "%1" , " of proxy handler " , "%0" , " returned non-configurable descriptor for property " , "%2" ] ,
proxy_non_object_prop_names : [ "Trap " , "%1" , " returned non-object " , "%0" ] , "proxy_non_object_prop_names" , [ "Trap " , "%1" , " returned non-object " , "%0" ] ,
proxy_repeated_prop_name : [ "Trap " , "%1" , " returned repeated property name " , "%2" ] , "proxy_repeated_prop_name" , [ "Trap " , "%1" , " returned repeated property name " , "%2" ] ,
invalid_weakmap_key : [ "Invalid value used as weak map key" ] , "invalid_weakmap_key" , [ "Invalid value used as weak map key" ] ,
// RangeError
// RangeError
invalid_array_length : [ "Invalid array length" ] , "invalid_array_length" , [ "Invalid array length" ] ,
stack_overflow : [ "Maximum call stack size exceeded" ] , "stack_overflow" , [ "Maximum call stack size exceeded" ] ,
// SyntaxError
// SyntaxError
unable_to_parse : [ "Parse error" ] , "unable_to_parse" , [ "Parse error" ] ,
invalid_regexp_flags : [ "Invalid flags supplied to RegExp constructor '" , "%0" , "'" ] , "invalid_regexp_flags" , [ "Invalid flags supplied to RegExp constructor '" , "%0" , "'" ] ,
invalid_regexp : [ "Invalid RegExp pattern /" , "%0" , "/" ] , "invalid_regexp" , [ "Invalid RegExp pattern /" , "%0" , "/" ] ,
illegal_break : [ "Illegal break statement" ] , "illegal_break" , [ "Illegal break statement" ] ,
illegal_continue : [ "Illegal continue statement" ] , "illegal_continue" , [ "Illegal continue statement" ] ,
illegal_return : [ "Illegal return statement" ] , "illegal_return" , [ "Illegal return statement" ] ,
error_loading_debugger : [ "Error loading debugger" ] , "error_loading_debugger" , [ "Error loading debugger" ] ,
no_input_to_regexp : [ "No input to " , "%0" ] , "no_input_to_regexp" , [ "No input to " , "%0" ] ,
invalid_json : [ "String '" , "%0" , "' is not valid JSON" ] , "invalid_json" , [ "String '" , "%0" , "' is not valid JSON" ] ,
circular_structure : [ "Converting circular structure to JSON" ] , "circular_structure" , [ "Converting circular structure to JSON" ] ,
obj_ctor_property_non_object : [ "Object." , "%0" , " called on non-object" ] , "obj_ctor_property_non_object" , [ "Object." , "%0" , " called on non-object" ] ,
called_on_null_or_undefined : [ "%0" , " called on null or undefined" ] , "called_on_null_or_undefined" , [ "%0" , " called on null or undefined" ] ,
array_indexof_not_defined : [ "Array.getIndexOf: Argument undefined" ] , "array_indexof_not_defined" , [ "Array.getIndexOf: Argument undefined" ] ,
object_not_extensible : [ "Can't add property " , "%0" , ", object is not extensible" ] , "object_not_extensible" , [ "Can't add property " , "%0" , ", object is not extensible" ] ,
illegal_access : [ "Illegal access" ] , "illegal_access" , [ "Illegal access" ] ,
invalid_preparser_data : [ "Invalid preparser data for function " , "%0" ] , "invalid_preparser_data" , [ "Invalid preparser data for function " , "%0" ] ,
strict_mode_with : [ "Strict mode code may not include a with statement" ] , "strict_mode_with" , [ "Strict mode code may not include a with statement" ] ,
strict_catch_variable : [ "Catch variable may not be eval or arguments in strict mode" ] , "strict_catch_variable" , [ "Catch variable may not be eval or arguments in strict mode" ] ,
too_many_arguments : [ "Too many arguments in function call (only 32766 allowed)" ] , "too_many_arguments" , [ "Too many arguments in function call (only 32766 allowed)" ] ,
too_many_parameters : [ "Too many parameters in function definition (only 32766 allowed)" ] , "too_many_parameters" , [ "Too many parameters in function definition (only 32766 allowed)" ] ,
too_many_variables : [ "Too many variables declared (only 32767 allowed)" ] , "too_many_variables" , [ "Too many variables declared (only 32767 allowed)" ] ,
strict_param_name : [ "Parameter name eval or arguments is not allowed in strict mode" ] , "strict_param_name" , [ "Parameter name eval or arguments is not allowed in strict mode" ] ,
strict_param_dupe : [ "Strict mode function may not have duplicate parameter names" ] , "strict_param_dupe" , [ "Strict mode function may not have duplicate parameter names" ] ,
strict_var_name : [ "Variable name may not be eval or arguments in strict mode" ] , "strict_var_name" , [ "Variable name may not be eval or arguments in strict mode" ] ,
strict_function_name : [ "Function name may not be eval or arguments in strict mode" ] , "strict_function_name" , [ "Function name may not be eval or arguments in strict mode" ] ,
strict_octal_literal : [ "Octal literals are not allowed in strict mode." ] , "strict_octal_literal" , [ "Octal literals are not allowed in strict mode." ] ,
strict_duplicate_property : [ "Duplicate data property in object literal not allowed in strict mode" ] , "strict_duplicate_property" , [ "Duplicate data property in object literal not allowed in strict mode" ] ,
accessor_data_property : [ "Object literal may not have data and accessor property with the same name" ] , "accessor_data_property" , [ "Object literal may not have data and accessor property with the same name" ] ,
accessor_get_set : [ "Object literal may not have multiple get/set accessors with the same name" ] , "accessor_get_set" , [ "Object literal may not have multiple get/set accessors with the same name" ] ,
strict_lhs_assignment : [ "Assignment to eval or arguments is not allowed in strict mode" ] , "strict_lhs_assignment" , [ "Assignment to eval or arguments is not allowed in strict mode" ] ,
strict_lhs_postfix : [ "Postfix increment/decrement may not have eval or arguments operand in strict mode" ] , "strict_lhs_postfix" , [ "Postfix increment/decrement may not have eval or arguments operand in strict mode" ] ,
strict_lhs_prefix : [ "Prefix increment/decrement may not have eval or arguments operand in strict mode" ] , "strict_lhs_prefix" , [ "Prefix increment/decrement may not have eval or arguments operand in strict mode" ] ,
strict_reserved_word : [ "Use of future reserved word in strict mode" ] , "strict_reserved_word" , [ "Use of future reserved word in strict mode" ] ,
strict_delete : [ "Delete of an unqualified identifier in strict mode." ] , "strict_delete" , [ "Delete of an unqualified identifier in strict mode." ] ,
strict_delete_property : [ "Cannot delete property '" , "%0" , "' of " , "%1" ] , "strict_delete_property" , [ "Cannot delete property '" , "%0" , "' of " , "%1" ] ,
strict_const : [ "Use of const in strict mode." ] , "strict_const" , [ "Use of const in strict mode." ] ,
strict_function : [ "In strict mode code, functions can only be declared at top level or immediately within another function." ] , "strict_function" , [ "In strict mode code, functions can only be declared at top level or immediately within another function." ] ,
strict_read_only_property : [ "Cannot assign to read only property '" , "%0" , "' of " , "%1" ] , "strict_read_only_property" , [ "Cannot assign to read only property '" , "%0" , "' of " , "%1" ] ,
strict_cannot_assign : [ "Cannot assign to read only '" , "%0" , "' in strict mode" ] , "strict_cannot_assign" , [ "Cannot assign to read only '" , "%0" , "' in strict mode" ] ,
strict_poison_pill : [ "'caller', 'callee', and 'arguments' properties may not be accessed on strict mode functions or the arguments objects for calls to them" ] , "strict_poison_pill" , [ "'caller', 'callee', and 'arguments' properties may not be accessed on strict mode functions or the arguments objects for calls to them" ] ,
strict_caller : [ "Illegal access to a strict mode caller function." ] , "strict_caller" , [ "Illegal access to a strict mode caller function." ] ,
unprotected_let : [ "Illegal let declaration in unprotected statement context." ] , "unprotected_let" , [ "Illegal let declaration in unprotected statement context." ] ,
} ; ] ;
var messages = { __ proto__ : null } ;
var desc = new PropertyDescriptor ( ) ;
desc . setConfigurable ( false ) ;
desc . setEnumerable ( false ) ;
desc . setWritable ( false ) ;
for ( var i = 0 ; i < messagesDictionary . length ; i += 2 ) {
var key = messagesDictionary [ i ] ;
var format = messagesDictionary [ i + 1 ] ;
ObjectFreeze ( format ) ;
desc . setValue ( format ) ;
DefineOwnProperty ( messages , key , desc ) ;
}
% PreventExtensions ( messages ) ;
% IgnoreAttributesAndSetProperty ( builtins , "kMessages" ,
messages ,
DONT_DELETE | DONT_ENUM | READ_ONLY ) ;
} }
var message_type = % MessageGetType ( message ) ; var message_type = % MessageGetType ( message ) ;
var format = kMessages [ message_type ] ; var format = kMessages [ message_type ] ;
@ -317,7 +321,7 @@ function MakeError(type, args) {
* @ return { number } 0 if input too small , - 1 if input too large , * @ return { number } 0 if input too small , - 1 if input too large ,
else the line number . else the line number .
* / * /
Script . prototype . lineFromPosition = func tion( position ) { function ScriptLineFromPosi tion( position ) {
var lower = 0 ; var lower = 0 ;
var upper = this . lineCount ( ) - 1 ; var upper = this . lineCount ( ) - 1 ;
var line_ends = this . line_ends ; var line_ends = this . line_ends ;
@ -356,8 +360,8 @@ Script.prototype.lineFromPosition = function(position) {
* @ return { SourceLocation } * @ return { SourceLocation }
* If line is negative or not in the source null is returned . * If line is negative or not in the source null is returned .
* / * /
Script . prototype . locationFromPosition = function ( position , function ScriptLocationFromPosition ( position ,
include_resource_offset ) { include_resource_offset ) {
var line = this . lineFromPosition ( position ) ; var line = this . lineFromPosition ( position ) ;
if ( line == - 1 ) return null ; if ( line == - 1 ) return null ;
@ -365,7 +369,9 @@ Script.prototype.locationFromPosition = function (position,
var line_ends = this . line_ends ; var line_ends = this . line_ends ;
var start = line == 0 ? 0 : line_ends [ line - 1 ] + 1 ; var start = line == 0 ? 0 : line_ends [ line - 1 ] + 1 ;
var end = line_ends [ line ] ; var end = line_ends [ line ] ;
if ( end > 0 && % _ CallFunction ( this . source , end - 1 , StringCharAt ) == '\r' ) end -- ; if ( end > 0 && % _ CallFunction ( this . source , end - 1 , StringCharAt ) == '\r' ) {
end -- ;
}
var column = position - start ; var column = position - start ;
// Adjust according to the offset within the resource.
// Adjust according to the offset within the resource.
@ -390,11 +396,12 @@ Script.prototype.locationFromPosition = function (position,
* @ param { number } opt_line The line within the source . Default value is 0 * @ param { number } opt_line The line within the source . Default value is 0
* @ param { number } opt_column The column in within the line . Default value is 0 * @ param { number } opt_column The column in within the line . Default value is 0
* @ param { number } opt_offset_position The offset from the begining of the * @ param { number } opt_offset_position The offset from the begining of the
* source from where the line and column calculation starts . Default value is 0 * source from where the line and column calculation starts .
* Default value is 0
* @ return { SourceLocation } * @ return { SourceLocation }
* If line is negative or not in the source null is returned . * If line is negative or not in the source null is returned .
* / * /
Script . prototype . locationFromLine = function ( opt_line , opt_column , opt_offset_position ) { function ScriptLocationFromLine ( opt_line , opt_column , opt_offset_position ) {
// Default is the first line in the script. Lines in the script is relative
// Default is the first line in the script. Lines in the script is relative
// to the offset within the resource.
// to the offset within the resource.
var line = 0 ; var line = 0 ;
@ -436,7 +443,7 @@ Script.prototype.locationFromLine = function (opt_line, opt_column, opt_offset_p
* @ return { SourceSlice } The source slice or null of the parameters where * @ return { SourceSlice } The source slice or null of the parameters where
* invalid * invalid
* / * /
Script . prototype . sourceSlice = function ( opt_from_line , opt_to_line ) { function ScriptSourceSlice ( opt_from_line , opt_to_line ) {
var from_line = IS_UNDEFINED ( opt_from_line ) ? this . line_offset : opt_from_line ; var from_line = IS_UNDEFINED ( opt_from_line ) ? this . line_offset : opt_from_line ;
var to_line = IS_UNDEFINED ( opt_to_line ) ? this . line_offset + this . lineCount ( ) : opt_to_line var to_line = IS_UNDEFINED ( opt_to_line ) ? this . line_offset + this . lineCount ( ) : opt_to_line
@ -463,7 +470,7 @@ Script.prototype.sourceSlice = function (opt_from_line, opt_to_line) {
} }
Script . prototype . sourceLine = function ( opt_line ) { function ScriptSourceLine ( opt_line ) {
// Default is the first line in the script. Lines in the script are relative
// Default is the first line in the script. Lines in the script are relative
// to the offset within the resource.
// to the offset within the resource.
var line = 0 ; var line = 0 ;
@ -489,7 +496,7 @@ Script.prototype.sourceLine = function (opt_line) {
* @ return { number } * @ return { number }
* Number of source lines . * Number of source lines .
* / * /
Script . prototype . lineCount = function ( ) { function ScriptLineCount ( ) {
// Return number of source lines.
// Return number of source lines.
return this . line_ends . length ; return this . line_ends . length ;
} ; } ;
@ -505,9 +512,10 @@ Script.prototype.lineCount = function() {
* @ return { ? string } script name if present , value for //@ sourceURL comment
* @ return { ? string } script name if present , value for //@ sourceURL comment
* otherwise . * otherwise .
* / * /
Script . prototype . nameOrSourceURL = function ( ) { function ScriptNameOrSourceURL ( ) {
if ( this . name ) if ( this . name ) {
return this . name ; return this . name ;
}
// TODO(608): the spaces in a regexp below had to be escaped as \040
// TODO(608): the spaces in a regexp below had to be escaped as \040
// because this file is being processed by js2c whose handling of spaces
// because this file is being processed by js2c whose handling of spaces
// in regexps is broken. Also, ['"] are excluded from allowed URLs to
// in regexps is broken. Also, ['"] are excluded from allowed URLs to
@ -533,6 +541,20 @@ Script.prototype.nameOrSourceURL = function() {
} }
SetUpLockedPrototype ( Script ,
$Array ( "source" , "name" , "line_ends" , "line_offset" , "column_offset" ) ,
$Array (
"lineFromPosition" , ScriptLineFromPosition ,
"locationFromPosition" , ScriptLocationFromPosition ,
"locationFromLine" , ScriptLocationFromLine ,
"sourceSlice" , ScriptSourceSlice ,
"sourceLine" , ScriptSourceLine ,
"lineCount" , ScriptLineCount ,
"nameOrSourceURL" , ScriptNameOrSourceURL
)
) ;
/ * * / * *
* Class for source location . A source location is a position within some * Class for source location . A source location is a position within some
* source with the following properties : * source with the following properties :
@ -563,8 +585,6 @@ function SourceLocation(script, position, line, column, start, end) {
this . end = end ; this . end = end ;
} }
SourceLocation . prototype . __ proto__ = null ;
const kLineLengthLimit = 78 ; const kLineLengthLimit = 78 ;
/ * * / * *
@ -575,7 +595,7 @@ const kLineLengthLimit = 78;
* @ param { number } opt_before The number of characters to prefer before the * @ param { number } opt_before The number of characters to prefer before the
* position with a default value of 10 less that the limit * position with a default value of 10 less that the limit
* / * /
SourceLocation . prototype . restrict = function ( opt_limit , opt_before ) { function SourceLocationRestrict ( opt_limit , opt_before ) {
// Find the actual limit to use.
// Find the actual limit to use.
var limit ; var limit ;
var before ; var before ;
@ -622,11 +642,20 @@ SourceLocation.prototype.restrict = function (opt_limit, opt_before) {
* @ return { String } * @ return { String }
* Source text for this location . * Source text for this location .
* / * /
SourceLocation . prototype . sourceText = function ( ) { function SourceLocationSourceText ( ) {
return % _ CallFunction ( this . script . source , this . start , this . end , StringSubstring ) ; return % _ CallFunction ( this . script . source , this . start , this . end , StringSubstring ) ;
} ; } ;
SetUpLockedPrototype ( SourceLocation ,
$Array ( "script" , "position" , "line" , "column" , "start" , "end" ) ,
$Array (
"restrict" , SourceLocationRestrict ,
"sourceText" , SourceLocationSourceText
)
) ;
/ * * / * *
* Class for a source slice . A source slice is a part of a script source with * Class for a source slice . A source slice is a part of a script source with
* the following properties : * the following properties :
@ -653,20 +682,23 @@ function SourceSlice(script, from_line, to_line, from_position, to_position) {
this . to_position = to_position ; this . to_position = to_position ;
} }
SourceSlice . prototype . __ proto__ = null ;
/ * * / * *
* Get the source text for a SourceSlice * Get the source text for a SourceSlice
* @ return { String } Source text for this slice . The last line will include * @ return { String } Source text for this slice . The last line will include
* the line terminating characters ( if any ) * the line terminating characters ( if any )
* / * /
SourceSlice . prototype . sourceText = function ( ) { function SourceSliceSourceText ( ) {
return % _ CallFunction ( this . script . source , return % _ CallFunction ( this . script . source ,
this . from_position , this . from_position ,
this . to_position , this . to_position ,
StringSubstring ) ; StringSubstring ) ;
} ; } ;
SetUpLockedPrototype ( SourceSlice ,
$Array ( "script" , "from_line" , "to_line" , "from_position" , "to_position" ) ,
$Array ( "sourceText" , SourceSliceSourceText )
) ;
// Returns the offset of the given position within the containing
// Returns the offset of the given position within the containing
// line.
// line.
@ -721,13 +753,11 @@ function CallSite(receiver, fun, pos) {
this . pos = pos ; this . pos = pos ;
} }
CallSite . prototype . __ proto__ = null ; function CallSiteGetThis ( ) {
CallSite . prototype . getThis = function ( ) {
return this . receiver ; return this . receiver ;
} ; } ;
CallSite . prototype . getTypeName = function ( ) { function CallSiteGetTypeName ( ) {
var constructor = this . receiver . constructor ; var constructor = this . receiver . constructor ;
if ( ! constructor ) { if ( ! constructor ) {
return % _ CallFunction ( this . receiver , ObjectToString ) ; return % _ CallFunction ( this . receiver , ObjectToString ) ;
@ -739,33 +769,33 @@ CallSite.prototype.getTypeName = function () {
return constructorName ; return constructorName ;
} ; } ;
CallSite . prototype . isToplevel = function ( ) { function CallSiteIsToplevel ( ) {
if ( this . receiver == null ) { if ( this . receiver == null ) {
return true ; return true ;
} }
return IS_GLOBAL ( this . receiver ) ; return IS_GLOBAL ( this . receiver ) ;
} ; } ;
CallSite . prototype . isEval = function ( ) { function CallSiteIsEval ( ) {
var script = % FunctionGetScript ( this . fun ) ; var script = % FunctionGetScript ( this . fun ) ;
return script && script . compilation_type == COMPILATION_TYPE_EVAL ; return script && script . compilation_type == COMPILATION_TYPE_EVAL ;
} ; } ;
CallSite . prototype . getEvalOrigin = function ( ) { function CallSiteGetEvalOrigin ( ) {
var script = % FunctionGetScript ( this . fun ) ; var script = % FunctionGetScript ( this . fun ) ;
return FormatEvalOrigin ( script ) ; return FormatEvalOrigin ( script ) ;
} ; } ;
CallSite . prototype . getScriptNameOrSourceURL = function ( ) { function CallSiteGetScriptNameOrSourceURL ( ) {
var script = % FunctionGetScript ( this . fun ) ; var script = % FunctionGetScript ( this . fun ) ;
return script ? script . nameOrSourceURL ( ) : null ; return script ? script . nameOrSourceURL ( ) : null ;
} ; } ;
CallSite . prototype . getFunction = function ( ) { function CallSiteGetFunction ( ) {
return this . fun ; return this . fun ;
} ; } ;
CallSite . prototype . getFunctionName = function ( ) { function CallSiteGetFunctionName ( ) {
// See if the function knows its own name
// See if the function knows its own name
var name = this . fun . name ; var name = this . fun . name ;
if ( name ) { if ( name ) {
@ -781,7 +811,7 @@ CallSite.prototype.getFunctionName = function () {
return null ; return null ;
} ; } ;
CallSite . prototype . getMethodName = function ( ) { function CallSiteGetMethodName ( ) {
// See if we can find a unique property on the receiver that holds
// See if we can find a unique property on the receiver that holds
// this function.
// this function.
var ownName = this . fun . name ; var ownName = this . fun . name ;
@ -811,12 +841,12 @@ CallSite.prototype.getMethodName = function () {
return null ; return null ;
} ; } ;
CallSite . prototype . getFileName = function ( ) { function CallSiteGetFileName ( ) {
var script = % FunctionGetScript ( this . fun ) ; var script = % FunctionGetScript ( this . fun ) ;
return script ? script . name : null ; return script ? script . name : null ;
} ; } ;
CallSite . prototype . getLineNumber = function ( ) { function CallSiteGetLineNumber ( ) {
if ( this . pos == - 1 ) { if ( this . pos == - 1 ) {
return null ; return null ;
} }
@ -828,7 +858,7 @@ CallSite.prototype.getLineNumber = function () {
return location ? location . line + 1 : null ; return location ? location . line + 1 : null ;
} ; } ;
CallSite . prototype . getColumnNumber = function ( ) { function CallSiteGetColumnNumber ( ) {
if ( this . pos == - 1 ) { if ( this . pos == - 1 ) {
return null ; return null ;
} }
@ -840,16 +870,16 @@ CallSite.prototype.getColumnNumber = function () {
return location ? location . column + 1 : null ; return location ? location . column + 1 : null ;
} ; } ;
CallSite . prototype . isNative = function ( ) { function CallSiteIsNative ( ) {
var script = % FunctionGetScript ( this . fun ) ; var script = % FunctionGetScript ( this . fun ) ;
return script ? ( script . type == TYPE_NATIVE ) : false ; return script ? ( script . type == TYPE_NATIVE ) : false ;
} ; } ;
CallSite . prototype . getPosition = function ( ) { function CallSiteGetPosition ( ) {
return this . pos ; return this . pos ;
} ; } ;
CallSite . prototype . isConstructor = function ( ) { function CallSiteIsConstructor ( ) {
var constructor = this . receiver ? this . receiver . constructor : null ; var constructor = this . receiver ? this . receiver . constructor : null ;
if ( ! constructor ) { if ( ! constructor ) {
return false ; return false ;
@ -857,6 +887,25 @@ CallSite.prototype.isConstructor = function () {
return this . fun === constructor ; return this . fun === constructor ;
} ; } ;
SetUpLockedPrototype ( CallSite , $Array ( "receiver" , "fun" , "pos" ) , $Array (
"getThis" , CallSiteGetThis ,
"getTypeName" , CallSiteGetTypeName ,
"isToplevel" , CallSiteIsToplevel ,
"isEval" , CallSiteIsEval ,
"getEvalOrigin" , CallSiteGetEvalOrigin ,
"getScriptNameOrSourceURL" , CallSiteGetScriptNameOrSourceURL ,
"getFunction" , CallSiteGetFunction ,
"getFunctionName" , CallSiteGetFunctionName ,
"getMethodName" , CallSiteGetMethodName ,
"getFileName" , CallSiteGetFileName ,
"getLineNumber" , CallSiteGetLineNumber ,
"getColumnNumber" , CallSiteGetColumnNumber ,
"isNative" , CallSiteIsNative ,
"getPosition" , CallSiteGetPosition ,
"isConstructor" , CallSiteIsConstructor
) ) ;
function FormatEvalOrigin ( script ) { function FormatEvalOrigin ( script ) {
var sourceURL = script . nameOrSourceURL ( ) ; var sourceURL = script . nameOrSourceURL ( ) ;
if ( sourceURL ) { if ( sourceURL ) {
@ -998,63 +1047,6 @@ function FormatRawStackTrace(error, raw_stack) {
} }
} }
function DefineError ( f ) {
// Store the error function in both the global object
// and the runtime object. The function is fetched
// from the runtime object when throwing errors from
// within the runtime system to avoid strange side
// effects when overwriting the error functions from
// user code.
var name = f . name ;
% SetProperty ( global , name , f , DONT_ENUM ) ;
this [ '$' + name ] = f ;
// Configure the error function.
if ( name == 'Error' ) {
// The prototype of the Error object must itself be an error.
// However, it can't be an instance of the Error object because
// it hasn't been properly configured yet. Instead we create a
// special not-a-true-error-but-close-enough object.
function ErrorPrototype ( ) { }
% FunctionSetPrototype ( ErrorPrototype , $Object . prototype ) ;
% FunctionSetInstanceClassName ( ErrorPrototype , 'Error' ) ;
% FunctionSetPrototype ( f , new ErrorPrototype ( ) ) ;
} else {
% FunctionSetPrototype ( f , new $Error ( ) ) ;
}
% FunctionSetInstanceClassName ( f , 'Error' ) ;
% SetProperty ( f . prototype , 'constructor' , f , DONT_ENUM ) ;
// The name property on the prototype of error objects is not
// specified as being read-one and dont-delete. However, allowing
// overwriting allows leaks of error objects between script blocks
// in the same context in a browser setting. Therefore we fix the
// name.
% SetProperty ( f . prototype , "name" , name , DONT_ENUM | DONT_DELETE | READ_ONLY ) ;
% SetCode ( f , function ( m ) {
if ( % _ IsConstructCall ( ) ) {
// Define all the expected properties directly on the error
// object. This avoids going through getters and setters defined
// on prototype objects.
% IgnoreAttributesAndSetProperty ( this , 'stack' , void 0 , DONT_ENUM ) ;
% IgnoreAttributesAndSetProperty ( this , 'arguments' , void 0 , DONT_ENUM ) ;
% IgnoreAttributesAndSetProperty ( this , 'type' , void 0 , DONT_ENUM ) ;
if ( m === kAddMessageAccessorsMarker ) {
// DefineOneShotAccessor always inserts a message property and
// ignores setters.
DefineOneShotAccessor ( this , 'message' , function ( obj ) {
return FormatMessage ( % NewMessageObject ( obj . type , obj . arguments ) ) ;
} ) ;
} else if ( ! IS_UNDEFINED ( m ) ) {
% IgnoreAttributesAndSetProperty ( this ,
'message' ,
ToString ( m ) ,
DONT_ENUM ) ;
}
captureStackTrace ( this , f ) ;
} else {
return new f ( m ) ;
}
} ) ;
}
function captureStackTrace ( obj , cons_opt ) { function captureStackTrace ( obj , cons_opt ) {
var stackTraceLimit = $Error . stackTraceLimit ; var stackTraceLimit = $Error . stackTraceLimit ;
@ -1070,52 +1062,100 @@ function captureStackTrace(obj, cons_opt) {
} ) ; } ) ;
} ; } ;
$Math . __ proto__ = global . Object . prototype ;
// DefineError is a native function. Use explicit receiver. Otherwise
function SetUpError ( ) {
// the receiver will be 'undefined'.
// Define special error type constructors.
this . DefineError ( function Error ( ) { } ) ;
this . DefineError ( function TypeError ( ) { } ) ; function DefineError ( f ) {
this . DefineError ( function RangeError ( ) { } ) ; // Store the error function in both the global object
this . DefineError ( function SyntaxError ( ) { } ) ; // and the runtime object. The function is fetched
this . DefineError ( function ReferenceError ( ) { } ) ; // from the runtime object when throwing errors from
this . DefineError ( function EvalError ( ) { } ) ; // within the runtime system to avoid strange side
this . DefineError ( function URIError ( ) { } ) ; // effects when overwriting the error functions from
// user code.
var name = f . name ;
% SetProperty ( global , name , f , DONT_ENUM ) ;
% SetProperty ( builtins , '$' + name , f , DONT_ENUM | DONT_DELETE | READ_ONLY ) ;
// Configure the error function.
if ( name == 'Error' ) {
// The prototype of the Error object must itself be an error.
// However, it can't be an instance of the Error object because
// it hasn't been properly configured yet. Instead we create a
// special not-a-true-error-but-close-enough object.
function ErrorPrototype ( ) { }
% FunctionSetPrototype ( ErrorPrototype , $Object . prototype ) ;
% FunctionSetInstanceClassName ( ErrorPrototype , 'Error' ) ;
% FunctionSetPrototype ( f , new ErrorPrototype ( ) ) ;
} else {
% FunctionSetPrototype ( f , new $Error ( ) ) ;
}
% FunctionSetInstanceClassName ( f , 'Error' ) ;
% SetProperty ( f . prototype , 'constructor' , f , DONT_ENUM ) ;
// The name property on the prototype of error objects is not
// specified as being read-one and dont-delete. However, allowing
// overwriting allows leaks of error objects between script blocks
// in the same context in a browser setting. Therefore we fix the
// name.
% SetProperty ( f . prototype , "name" , name ,
DONT_ENUM | DONT_DELETE | READ_ONLY ) ;
% SetCode ( f , function ( m ) {
if ( % _ IsConstructCall ( ) ) {
// Define all the expected properties directly on the error
// object. This avoids going through getters and setters defined
// on prototype objects.
% IgnoreAttributesAndSetProperty ( this , 'stack' , void 0 , DONT_ENUM ) ;
% IgnoreAttributesAndSetProperty ( this , 'arguments' , void 0 , DONT_ENUM ) ;
% IgnoreAttributesAndSetProperty ( this , 'type' , void 0 , DONT_ENUM ) ;
if ( m === kAddMessageAccessorsMarker ) {
// DefineOneShotAccessor always inserts a message property and
// ignores setters.
DefineOneShotAccessor ( this , 'message' , function ( obj ) {
return FormatMessage ( % NewMessageObject ( obj . type , obj . arguments ) ) ;
} ) ;
} else if ( ! IS_UNDEFINED ( m ) ) {
% IgnoreAttributesAndSetProperty ( this ,
'message' ,
ToString ( m ) ,
DONT_ENUM ) ;
}
captureStackTrace ( this , f ) ;
} else {
return new f ( m ) ;
}
} ) ;
}
$Error . captureStackTrace = captureStackTrace ; DefineError ( function Error ( ) { } ) ;
DefineError ( function TypeError ( ) { } ) ;
DefineError ( function RangeError ( ) { } ) ;
DefineError ( function SyntaxError ( ) { } ) ;
DefineError ( function ReferenceError ( ) { } ) ;
DefineError ( function EvalError ( ) { } ) ;
DefineError ( function URIError ( ) { } ) ;
}
// Setup extra properties of the Error.prototype object.
SetUpError ( ) ;
function setErrorMessage ( ) {
var desc = { value : '' ,
enumerable : false ,
configurable : true ,
writable : true } ;
DefineOwnProperty ( $Error . prototype ,
'message' ,
ToPropertyDescriptor ( desc ) ,
true ) ;
} $Error . captureStackTrace = captureStackTrace ;
setErrorMessage ( ) ; % SetProperty ( $Error . prototype , 'message' , '' , DONT_ENUM ) ;
// Global list of error objects visited during errorToString. This is
// Global list of error objects visited during errorToString. This is
// used to detect cycles in error toString formatting.
// used to detect cycles in error toString formatting.
var visited_errors = new $Array ( ) ; const visited_errors = new InternalArray ( ) ;
var cyclic_error_marker = new $Object ( ) ; const cyclic_error_marker = new $Object ( ) ;
function errorToStringDetectCycle ( ) { function errorToStringDetectCycle ( error ) {
if ( ! % PushIfAbsent ( visited_errors , this ) ) throw cyclic_error_marker ; if ( ! % PushIfAbsent ( visited_errors , error ) ) throw cyclic_error_marker ;
try { try {
var type = this . type ; var type = error . type ;
if ( type && ! % _ CallFunction ( this , "message" , ObjectHasOwnProperty ) ) { var hasMessage = % _ CallFunction ( error , "message" , ObjectHasOwnProperty ) ;
var formatted = FormatMessage ( % NewMessageObject ( type , this . arguments ) ) ; if ( type && ! hasMessage ) {
return this . name + ": " + formatted ; var formatted = FormatMessage ( % NewMessageObject ( type , error . arguments ) ) ;
return error . name + ": " + formatted ;
} }
var message = % _ CallFunction ( this , "message" , ObjectHasOwnProperty ) var message = hasMessage ? ( ": " + error . message ) : "" ;
? ( ": " + this . message ) return error . name + message ;
: "" ;
return this . name + message ;
} finally { } finally {
visited_errors . length = visited_errors . length - 1 ; visited_errors . length = visited_errors . length - 1 ;
} }
@ -1131,7 +1171,7 @@ function errorToString() {
function isCyclicErrorMarker ( o ) { return o === cyclic_error_marker ; } function isCyclicErrorMarker ( o ) { return o === cyclic_error_marker ; }
try { try {
return % _ CallFunction ( this , errorToStringDetectCycle ) ; return errorToStringDetectCycle ( this ) ;
} catch ( e ) { } catch ( e ) {
// If this error message was encountered already return the empty
// If this error message was encountered already return the empty
// string for it instead of recursively formatting it.
// string for it instead of recursively formatting it.
Ryan Dahl
13 years ago