Bug 16682 – array_object.cpp needs a bath

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Eric Seidel (no email)]

array_object.cpp needs a bath

Ok, so I was on a long flight, and figured I might poke my head around JSC a bit more. Sadly, it's hard to actually read any code in some of these old files.  So I cleaned it up a little.  Still not much more readable.

[Eric Seidel (no email)]

Created attachment 18201 [details]
Remove minInt, maxInt

Add a few planned renames for JavaScriptCore
---
 JavaScriptCore/kjs/array_object.cpp   |   15 ++++++++-------
 JavaScriptCore/kjs/operations.cpp     |   10 ----------
 JavaScriptCore/kjs/operations.h       |    3 ---
 WebKitTools/Scripts/do-webcore-rename |    4 ++++
 4 files changed, 12 insertions(+), 20 deletions(-)

[Eric Seidel (no email)]

Created attachment 18202 [details]
Apply wkstyle to array_object.cpp

 JavaScriptCore/kjs/array_object.cpp |  250 +++++++++++++++++------------------
 1 files changed, 119 insertions(+), 131 deletions(-)

[Eric Seidel (no email)]

Created attachment 18203 [details]
More small cleanup to array_object.cpp

 JavaScriptCore/kjs/array_object.cpp |  154 +++++++++++++++-------------------
 1 files changed, 68 insertions(+), 86 deletions(-)

[Sam Weinig]

Comment on attachment 18201 [details]
Remove minInt, maxInt

This looks good, though I am not used to seeing the std::max/min with a template parameter.  Are you sure that is kosher?  Also, I think the change to do-webcore-rename should go in a separate commit.  And you need CHANGELOGS.

[Darin Adler]

Comment on attachment 18202 [details]
Apply wkstyle to array_object.cpp

-namespace KJS {
+namespace KJS
+{

This may be the wkstyle, but it's not what the style guidelines say.

-  : ArrayInstance(objProto, 0)
+        : ArrayInstance(objProto, 0)

Same here. It should be four spaces, not eight.
         if (curArg->isObject() &&
-            curObj->inherits(&ArrayInstance::info)) {
+                curObj->inherits(&ArrayInstance::info)) {

Why is this indented 10 spaces?

[Darin Adler]

Comment on attachment 18203 [details]
More small cleanup to array_object.cpp

+            ((ArrayInstance* )thisObj)->sort(exec, sortFunction);

+            ((ArrayInstance* )thisObj)->sort(exec);

Should delete the spaces here. Or use static_cast.

[Sam Weinig]

Comment on attachment 18202 [details]
Apply wkstyle to array_object.cpp

nice.  r=me

[David Kilzer (:ddkilzer)]

(In reply to comment #4)
> Also, I think the change to do-webcore-rename should go in a separate commit.

r29043

The other changes landed in r29045, r29046, and r29047.