AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Updated handling of the script mirror.

Browse Source 
The script mirror is now created through MakeMirror like all other mirrors preserving handle identity. Added a couple of properties to the script mirror and added some more tests for the script mirror.
Review URL: http://codereview.chromium.org/21074

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1227 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
sgjesse@chromium.org 2009-02-05 08:23:10 +00:00
parent a5e55c4584
commit d7a9f15bda
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mirror-delay.js
View File

@ -87,6 +87,8 @@ function MakeMirror(value) {
mirror = new RegExpMirror(value);
} else if (IS_ERROR(value)) {
mirror = new ErrorMirror(value);
} else if (IS_SCRIPT(value)) {
mirror = new ScriptMirror(value);
} else {
mirror = new ObjectMirror(value);
}
@ -777,7 +779,7 @@ FunctionMirror.prototype.script = function() {
if (this.resolved()) {
var script = %FunctionGetScript(this.value_);
if (script) {
return new ScriptMirror(script);
return MakeMirror(script);
}
}
};
@ -1548,11 +1550,21 @@ function ScriptMirror(script) {
inherits(ScriptMirror, Mirror);
ScriptMirror.prototype.value = function() {
return this.script_;
};
ScriptMirror.prototype.name = function() {
return this.script_.name;
};
ScriptMirror.prototype.source = function() {
return this.script_.source;
};
ScriptMirror.prototype.lineOffset = function() {
return this.script_.line_offset;
};

30
test/mjsunit/mirror-script.js
View File

@ -28,7 +28,7 @@
// Flags: --expose-debug-as debug
// Test the mirror object for scripts.
function testScriptMirror(f, file_name, file_lines, script_type) {
function testScriptMirror(f, file_name, file_lines, script_type, script_source) {
// Create mirror and JSON representation.
var mirror = debug.MakeMirror(f).script();
var serializer = debug.MakeMirrorSerializer();
@ -43,19 +43,30 @@ function testScriptMirror(f, file_name, file_lines, script_type) {
assertTrue(mirror.isScript());
assertEquals('script', mirror.type());
var name = mirror.name();
assertEquals(file_name, name.substring(name.length - file_name.length));
if (name) {
assertEquals(file_name, name.substring(name.length - file_name.length));
} else {
assertTrue(file_name === null);
}
assertEquals(0, mirror.lineOffset());
assertEquals(0, mirror.columnOffset());
if (file_lines > 0) {
assertEquals(file_lines, mirror.lineCount());
}
assertEquals(script_type, mirror.scriptType());
if (script_source) {
assertEquals(script_source, mirror.source());
}
// Parse JSON representation and check.
var fromJSON = eval('(' + json + ')');
assertEquals('script', fromJSON.type);
name = fromJSON.name;
assertEquals(file_name, name.substring(name.length - file_name.length));
if (name) {
assertEquals(file_name, name.substring(name.length - file_name.length));
} else {
assertTrue(file_name === null);
}
assertEquals(0, fromJSON.lineOffset);
assertEquals(0, fromJSON.columnOffset);
if (file_lines > 0) {
@ -66,5 +77,16 @@ function testScriptMirror(f, file_name, file_lines, script_type) {
// Test the script mirror for different functions.
testScriptMirror(function(){}, 'mirror-script.js', 70, 2);
testScriptMirror(function(){}, 'mirror-script.js', 92, 2);
testScriptMirror(Math.sin, 'native math.js', -1, 0);
testScriptMirror(eval('function(){}'), null, 1, 2, 'function(){}');
testScriptMirror(eval('function(){\n }'), null, 2, 2, 'function(){\n }');
// Test taking slices of source.
var mirror = debug.MakeMirror(eval('function(){\n 1;\n}')).script();
assertEquals('function(){\n', mirror.sourceSlice(0, 1).sourceText());
assertEquals(' 1;\n', mirror.sourceSlice(1, 2).sourceText());
assertEquals('}', mirror.sourceSlice(2, 3).sourceText());
assertEquals('function(){\n 1;\n', mirror.sourceSlice(0, 2).sourceText());
assertEquals(' 1;\n}', mirror.sourceSlice(1, 3).sourceText());
assertEquals('function(){\n 1;\n}', mirror.sourceSlice(0, 3).sourceText());