[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53021] trunk/blender/source: add checks to style checker script for 'a .

[Campbell Barton]

Revision: 53021
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53021
Author:   campbellbarton
Date:     2012-12-15 04:44:10 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
add checks to style checker script for 'a . b' and 'a []'
also use BLI_findindex for modifiers_indexInObject

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/blenlib/BLI_listbase.h
    trunk/blender/source/blender/blenlib/intern/listbase.c
    trunk/blender/source/blender/editors/space_info/space_info.c
    trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c
    trunk/blender/source/tools/check_style_c.py

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2012-12-15 04:44:10 UTC (rev 53021)
@@ -623,12 +623,7 @@
 
 int modifiers_indexInObject(Object *ob, ModifierData *md_seek)
 {
-	int i = 0;
-	ModifierData *md;
-	
-	for (md = ob->modifiers.first; (md && md_seek != md); md = md->next, i++) ;
-	if (!md) return -1;  /* modifier isn't in the object */
-	return i;
+	return BLI_findindex(&ob->modifiers, md_seek);
 }
 
 void modifier_freeTemporaryData(ModifierData *md)

Modified: trunk/blender/source/blender/blenlib/BLI_listbase.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_listbase.h	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/blenlib/BLI_listbase.h	2012-12-15 04:44:10 UTC (rev 53021)
@@ -41,7 +41,7 @@
 #endif
 
 void BLI_insertlink(struct ListBase *listbase, void *vprevlink, void *vnewlink);
-int BLI_findindex(const struct ListBase *listbase, void *vlink);
+int BLI_findindex(const struct ListBase *listbase, const void *vlink);
 int BLI_findstringindex(const struct ListBase *listbase, const char *id, const int offset);
 
 /* find forwards */
@@ -79,4 +79,4 @@
 }
 #endif
 
-#endif
+#endif  /* __BLI_LISTBASE_H__ */

Modified: trunk/blender/source/blender/blenlib/intern/listbase.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/listbase.c	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/blenlib/intern/listbase.c	2012-12-15 04:44:10 UTC (rev 53021)
@@ -345,7 +345,7 @@
 	return link;
 }
 
-int BLI_findindex(const ListBase *listbase, void *vlink)
+int BLI_findindex(const ListBase *listbase, const void *vlink)
 {
 	Link *link = NULL;
 	int number = 0;

Modified: trunk/blender/source/blender/editors/space_info/space_info.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/space_info.c	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/editors/space_info/space_info.c	2012-12-15 04:44:10 UTC (rev 53021)
@@ -272,7 +272,7 @@
 static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
 {
 	struct RecentFile *recent;
-	char file [FILE_MAX];
+	char file[FILE_MAX];
 	uiLayout *layout = menu->layout;
 	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_REGION_WIN);
 	if (G.recent_files.first) {

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_intern.h
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_intern.h	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_intern.h	2012-12-15 04:44:10 UTC (rev 53021)
@@ -51,7 +51,7 @@
 
 /* geometric utilities */
 float uv_poly_area(float uv[][2], int len);
-void  uv_poly_copy_aspect(float uv_orig [][2], float uv[][2], float aspx, float aspy, int len);
+void  uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy, int len);
 void  uv_poly_center(struct BMEditMesh *em, struct BMFace *f, float r_cent[2]);
 
 /* find nearest */

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-12-15 04:44:10 UTC (rev 53021)
@@ -1430,7 +1430,7 @@
 	int i;
 	MenuType *mt = WM_menutype_find("USERPREF_MT_splash", TRUE);
 	char url[96];
-	char file [FILE_MAX];
+	char file[FILE_MAX];
 
 #ifndef WITH_HEADLESS
 	extern char datatoc_splash_png[];

Modified: trunk/blender/source/tools/check_style_c.py
===================================================================
--- trunk/blender/source/tools/check_style_c.py	2012-12-15 02:48:25 UTC (rev 53020)
+++ trunk/blender/source/tools/check_style_c.py	2012-12-15 04:44:10 UTC (rev 53021)
@@ -284,6 +284,17 @@
         warning("comma space before it 'sometext ,", index_kw, i_next)
 
 
+def blender_check_period(index_kw):
+    # check we're now apart of ...
+    if (tokens[index_kw - 1].text == ".") or (tokens[index_kw + 1].text == "."):
+        return
+
+    # 'a.b'
+    if tokens[index_kw - 1].type == Token.Text and tokens[index_kw - 1].text.isspace():
+        warning("period space before it 'sometext .", index_kw, index_kw)
+    if tokens[index_kw + 1].type == Token.Text and tokens[index_kw + 1].text.isspace():
+        warning("period space after it '. sometext", index_kw, index_kw)
+
 def _is_ws_pad(index_start, index_end):
     return (tokens[index_start - 1].text.isspace() and
             tokens[index_end + 1].text.isspace())
@@ -492,6 +503,18 @@
         elif tok.type == Token.Punctuation:
             if tok.text == ",":
                 blender_check_comma(i)
+            elif tok.text == ".":
+                blender_check_period(i)
+            elif tok.text == "[":
+                # note, we're quite relaxed about this but
+                # disallow 'foo ['
+                if tokens[i - 1].text.isspace():
+                    if is_cpp and tokens[i + 1].text == "]":
+                        # c++ can do delete []
+                        pass
+                    else:
+                        warning("space before '[' %s" % filepath_base, i, i)
+
         elif tok.type == Token.Operator:
             # we check these in pairs, only want first
             if tokens[i - 1].type != Token.Operator: