Refactor some source position info

test/mjsunit/debug-sourceinfo.js

 // Copyright 2008 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 157 matching lines @@
 assertEquals(2, script.locationFromLine(1, 11, start_b).line - comment_lines);
 assertEquals(11, script.locationFromLine(1, 11, start_b).column);
 
 // Test second line column 12 offset function b. Second line in b is 11 long
 // using column 12 wraps to next line.
 assertEquals(start_b + 6 + 12, script.locationFromLine(1, 12, start_b).position);
 assertEquals(3, script.locationFromLine(1, 12, start_b).line - comment_lines);
 assertEquals(0, script.locationFromLine(1, 12, start_b).column);
 
 // Test the Debug.findSourcePosition which wraps SourceManager.
-assertEquals(0 + start_a, Debug.findFunctionSourcePosition(a, 0, 0));
-assertEquals(0 + start_b, Debug.findFunctionSourcePosition(b, 0, 0));
-assertEquals(6 + start_b, Debug.findFunctionSourcePosition(b, 1, 0));
-assertEquals(8 + start_b, Debug.findFunctionSourcePosition(b, 1, 2));
-assertEquals(18 + start_b, Debug.findFunctionSourcePosition(b, 2, 0));
-assertEquals(0 + start_c, Debug.findFunctionSourcePosition(c, 0, 0));
-assertEquals(7 + start_c, Debug.findFunctionSourcePosition(c, 1, 0));
-assertEquals(21 + start_c, Debug.findFunctionSourcePosition(c, 2, 0));
-assertEquals(38 + start_c, Debug.findFunctionSourcePosition(c, 3, 0));
-assertEquals(52 + start_c, Debug.findFunctionSourcePosition(c, 4, 0));
-assertEquals(69 + start_c, Debug.findFunctionSourcePosition(c, 5, 0));
-assertEquals(76 + start_c, Debug.findFunctionSourcePosition(c, 6, 0));
+assertEquals(0 + start_a, Debug.findFunctionSourceLocation(a, 0, 0).position);
+assertEquals(0 + start_b, Debug.findFunctionSourceLocation(b, 0, 0).position);
+assertEquals(6 + start_b, Debug.findFunctionSourceLocation(b, 1, 0).position);
+assertEquals(8 + start_b, Debug.findFunctionSourceLocation(b, 1, 2).position);
+assertEquals(18 + start_b, Debug.findFunctionSourceLocation(b, 2, 0).position);
+assertEquals(0 + start_c, Debug.findFunctionSourceLocation(c, 0, 0).position);
+assertEquals(7 + start_c, Debug.findFunctionSourceLocation(c, 1, 0).position);
+assertEquals(21 + start_c, Debug.findFunctionSourceLocation(c, 2, 0).position);
+assertEquals(38 + start_c, Debug.findFunctionSourceLocation(c, 3, 0).position);
+assertEquals(52 + start_c, Debug.findFunctionSourceLocation(c, 4, 0).position);
+assertEquals(69 + start_c, Debug.findFunctionSourceLocation(c, 5, 0).position);
+assertEquals(76 + start_c, Debug.findFunctionSourceLocation(c, 6, 0).position);
 
 // Test source line and restriction. All the following tests start from line 1
 // column 2 in function b, which is the call to c.
 //   c(true);
 //   ^
 
 var location;
 
 location = script.locationFromLine(1, 0, start_b);
 assertEquals('  c(true);', location.sourceText());
@@ skipping 67 matching lines @@
 location.restrict(5, 4);
 assertEquals('  c(t', location.sourceText());
 
 location = script.locationFromLine(1, 0, start_b);
 location.restrict(7, 0);
 assertEquals('  c(tru', location.sourceText());
 
 location = script.locationFromLine(1, 0, start_b);
 location.restrict(7, 6);
 assertEquals('  c(tru', location.sourceText());