Bug 3945 – [PATCH] Safe merges of comments and other trivialities from KDE's kjs

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

[Martijn Klingens]

Hiya, 
 
I'll attach two patches to this bugzilla item that together reduce the diff 
between JSC's kjs and khtml's kjs with over a 1000 lines. 
 
The first part merges namespace fixes for more recent GCC versions (namespaces 
should end with just } and not }; and recent GCC is more picky about that). 
 
The second diff merges many comments in the code that apply to both trees. 
Think about the change of the FSF's postal address and changes and typo fixes 
in the API docs. I've been deliberately conservative with merging and aimed 
for big reductions first before going over the diff more closely to extract 
smaller hunks. Comments that I left out on purpose include copyright changes 
on either side (those should be merged with the code that the copyright refers 
to and not on theirselves) and some docs for classes that are no longer 
sharing the same API in both trees. 
 
Please commit to JSC as it makes the life of those comparing the trees a lot 
easier... 
 
Proposed changelog entries for the diffs: 
 
1. Merge GCC namespace termination (s/};/}/) from KHTML's kjs 
 
2. Merge API docs and the FSF postall address change from KHTML's kjs

[Martijn Klingens]

Created attachment 2902 [details]
GCC namespace fix

[Martijn Klingens]

Created attachment 2903 [details]
Comment merges

[Martijn Klingens]

I just noticed a small issue: 
 
http://bugzilla.opendarwin.org/attachment.cgi?id=2903&action=diff#property_map.h_sec4 
 
That one removed line is NOT correct, when applying the patch please readd 
this single line. 
 

[Maciej Stachowiak]

r=me on the namespace patch

[Maciej Stachowiak]

Comment on attachment 2903 [details]
Comment merges

please repost this patch without the accidental removal of index

[Maciej Stachowiak]

Note, only the namespace fix is approved, not the comment fix (unless committer fees like undoing the 
accidental line removal).

[Martijn Klingens]

Created attachment 2948 [details]
Comment patch without removing 'int index' :)

Hmm, if I should have known you'd be picky on the patch and have recreated the
patch right away... so much for being lazy :)

Anyway, new patch as replacement, once it's in I'll try to merge more trivial
stuff.

Thanks so far. Note though that you'll probably need to commit for me, I don't
think I have such rights myself.

[Geoffrey Garen]

Comment on attachment 2948 [details]
Comment patch without removing 'int index' :)

I'm marking comments.diff review+, since it fixes the int problem.