[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54263] trunk/blender/source: code style checker now tests for: 'SomeText{' (no space before {).

[Campbell Barton]

Revision: 54263
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54263
Author:   campbellbarton
Date:     2013-02-02 13:55:47 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
code style checker now tests for: 'SomeText{' (no space before {).
also removed duplicate break;, probably error from merge.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/AnimationExporter.cpp
    trunk/blender/source/tools/check_style_c.py

Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp	2013-02-02 06:06:34 UTC (rev 54262)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp	2013-02-02 13:55:47 UTC (rev 54263)
@@ -730,7 +730,6 @@
 				values[1] = bezt->vec[2][1];
 			}
 			break;
-			break;
 		default:
 			*length = 0;
 			break;

Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py	2013-02-02 06:06:34 UTC (rev 54262)
+++ trunk/blender/source/tools/check_style_c.py	2013-02-02 13:55:47 UTC (rev 54263)
@@ -713,7 +713,7 @@
                         # c++ can do delete []
                         pass
                     else:
-                        warning("space before '[' %s" % filepath_base, i, i)
+                        warning("space before '['", i, i)
             elif tok.text == "(":
                 # check if this is a cast, eg:
                 #  (char), (char **), (float (*)[3])
@@ -721,6 +721,10 @@
                 if item_range is not None:
                     blender_check_cast(item_range[0], item_range[1])
             elif tok.text == "{":
+                # check previous character is either a '{' or whitespace.
+                if (tokens[i - 1].line == tok.line) and not (tokens[i - 1].text.isspace() or tokens[i - 1].text == "{"):
+                    warning("no space before '{'", i, i)
+
                 blender_check_function_definition(i)
 
         elif tok.type == Token.Operator: