Changeset 31791 in webkit

Timestamp:

Apr 10, 2008 5:45:17 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-03-12 Michael Emmel <​mike.emmel@gmail.com>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=18397
Fix leaving spaces before parens in functions

• WebKitTools/Scripts/wkstyle:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/wkstyle (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-03-12  Michael Emmel  <mike.emmel@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=18397
+        Fix leaving spaces before parens in functions
+
+        * WebKitTools/Scripts/wkstyle:
+
 2008-04-07  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 

trunk/WebKitTools/Scripts/wkstyle

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-astyle \
+cmdcpp="astyle \
+--unpad=paren \
 --style=linux \
+--brackets=linux \
 --indent=spaces=4 \
---convert-tabs \
-$@
+--indent-switches \
+--convert-tabs" 
+
+cmdh="astyle \
+--unpad=paren \
+--style=linux \
+--brackets=break \
+--indent=spaces=4 \
+--convert-tabs" 
 
 #astyle does not support unpadding so we use sed
@@ -36 +45 @@
 do
 echo $i
+
+ext=`echo $i|awk -F . '{print $NF}'`
+
+cmd=$cmdcpp
+
+if [ $ext == "h" ] ; then
+    cmd=$cmdh
+fi
+
+$cmd $i
+
 #first print the changes we are making
 sed  -n -e '
@@ -60 +80 @@
 s/\n{/ {/
 }
+#fixup extra tab in constructor initalizer
+/^ \+,/{s/^    //}
+/^ \+:/{s/^    //}
 ' $i > $i.sed
 mv $i.sed $i