Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
blender-dev-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
blender-dev-tools
Commits
02ec35f2
Commit
02ec35f2
authored
8 years ago
by
Campbell Barton
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup: pep8
parent
ca7d4bdb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
check_source/check_style_c.py
+28
-29
28 additions, 29 deletions
check_source/check_style_c.py
with
28 additions
and
29 deletions
check_source/check_style_c.py
+
28
−
29
View file @
02ec35f2
...
@@ -349,8 +349,6 @@ def extract_cast(index):
...
@@ -349,8 +349,6 @@ def extract_cast(index):
return
(
i_start
,
i_end
)
return
(
i_start
,
i_end
)
A
=
print
def
tk_range_find_by_type
(
index_start
,
index_end
,
type_
,
filter_tk
=
None
):
def
tk_range_find_by_type
(
index_start
,
index_end
,
type_
,
filter_tk
=
None
):
if
index_start
<
index_end
:
if
index_start
<
index_end
:
...
@@ -403,9 +401,9 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end):
...
@@ -403,9 +401,9 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end):
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
index_next
].
line
)
and
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
index_next
].
line
)
and
(
tk_range_find_by_type
(
index_kw
+
1
,
index_next
-
1
,
Token
.
Comment
.
Preproc
,
(
tk_range_find_by_type
(
index_kw
+
1
,
index_next
-
1
,
Token
.
Comment
.
Preproc
,
filter_tk
=
lambda
tk
:
tk
.
text
in
{
filter_tk
=
lambda
tk
:
tk
.
text
in
{
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
else
"
,
"
elif
"
,
"
endif
"
})
!=
-
1
)
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
else
"
,
"
elif
"
,
"
endif
"
})
!=
-
1
)
):
):
# allow this to go unnoticed
# allow this to go unnoticed
pass
pass
else
:
else
:
...
@@ -584,22 +582,21 @@ def blender_check_kw_else(index_kw):
...
@@ -584,22 +582,21 @@ def blender_check_kw_else(index_kw):
# if
# if
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
i_next
].
line
)
and
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
i_next
].
line
)
and
any
(
True
for
i
in
range
(
index_kw
+
1
,
i_next
)
any
(
True
for
i
in
range
(
index_kw
+
1
,
i_next
)
if
(
tokens
[
i
].
type
==
Token
.
Comment
.
Preproc
and
if
(
tokens
[
i
].
type
==
Token
.
Comment
.
Preproc
and
tokens
[
i
].
text
.
lstrip
(
"
#
\t
"
).
startswith
((
tokens
[
i
].
text
.
lstrip
(
"
#
\t
"
).
startswith
((
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
else
"
,
"
elif
"
,
"
endif
"
,
"
else
"
,
"
elif
"
,
"
endif
"
,
))
))
)
)
)
)):
):
# allow this to go unnoticed
# allow this to go unnoticed
pass
pass
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
i_next
].
line
)
and
if
((
tokens
[
index_kw
].
line
+
1
!=
tokens
[
i_next
].
line
)
and
(
tk_range_find_by_type
(
index_kw
+
1
,
i_next
-
1
,
Token
.
Comment
.
Preproc
,
(
tk_range_find_by_type
(
index_kw
+
1
,
i_next
-
1
,
Token
.
Comment
.
Preproc
,
filter_tk
=
lambda
tk
:
tk
.
text
in
{
filter_tk
=
lambda
tk
:
tk
.
text
in
{
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
else
"
,
"
elif
"
,
"
endif
"
,
})
!=
-
1
)
"
if
"
,
"
ifdef
"
,
"
ifndef
"
,
"
else
"
,
"
elif
"
,
"
endif
"
,
})
!=
-
1
)):
):
# allow this to go unnoticed
# allow this to go unnoticed
pass
pass
else
:
else
:
...
@@ -704,7 +701,7 @@ def blender_check_kw_switch(index_kw_start, index_kw, index_kw_end):
...
@@ -704,7 +701,7 @@ def blender_check_kw_switch(index_kw_start, index_kw, index_kw_end):
ok
=
True
ok
=
True
break
break
else
:
else
:
#~ print("Commment '%s'" % tokens[i].text)
#
~ print("Commment '%s'" % tokens[i].text)
pass
pass
elif
tokens
[
i
].
type
==
Token
.
Keyword
:
elif
tokens
[
i
].
type
==
Token
.
Keyword
:
...
@@ -725,12 +722,12 @@ def blender_check_kw_switch(index_kw_start, index_kw, index_kw_end):
...
@@ -725,12 +722,12 @@ def blender_check_kw_switch(index_kw_start, index_kw, index_kw_end):
break
break
else
:
else
:
pass
pass
#~ print("indent mismatch...")
#
~ print("indent mismatch...")
#~ print("'%s'" % ws_other_indent)
#
~ print("'%s'" % ws_other_indent)
#~ print("'%s'" % ws_test_other)
#
~ print("'%s'" % ws_test_other)
if
not
ok
:
if
not
ok
:
warning
(
"
E118
"
,
"
case/default statement has no break
"
,
i_case
,
i_end
)
warning
(
"
E118
"
,
"
case/default statement has no break
"
,
i_case
,
i_end
)
#~ print(tk_range_to_str(i_case - 1, i_end - 1, expand_tabs=True))
#
~ print(tk_range_to_str(i_case - 1, i_end - 1, expand_tabs=True))
else
:
else
:
warning
(
"
E119
"
,
"
switch isn
'
t the first token in the line
"
,
index_kw_start
,
index_kw_end
)
warning
(
"
E119
"
,
"
switch isn
'
t the first token in the line
"
,
index_kw_start
,
index_kw_end
)
else
:
else
:
...
@@ -1124,8 +1121,8 @@ def quick_check_indentation(lines):
...
@@ -1124,8 +1121,8 @@ def quick_check_indentation(lines):
elif
(
'
:
'
in
ls
and
l
[
0
]
!=
'
\t
'
):
elif
(
'
:
'
in
ls
and
l
[
0
]
!=
'
\t
'
):
skip
=
True
skip
=
True
# /* comment */
# /* comment */
#~ elif ls.startswith("/*") and ls.endswith("*/"):
#
~ elif ls.startswith("/*") and ls.endswith("*/"):
#~ skip = True
#
~ skip = True
# /* some comment...
# /* some comment...
elif
ls
.
startswith
(
"
/*
"
):
elif
ls
.
startswith
(
"
/*
"
):
skip
=
True
skip
=
True
...
@@ -1295,7 +1292,8 @@ def scan_source(fp, code, args):
...
@@ -1295,7 +1292,8 @@ def scan_source(fp, code, args):
blender_check_brace_indent
(
i
)
blender_check_brace_indent
(
i
)
# check previous character is either a '{' or whitespace.
# 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
==
"
{
"
):
if
((
tokens
[
i
-
1
].
line
==
tok
.
line
)
and
not
(
tokens
[
i
-
1
].
text
.
isspace
()
or
tokens
[
i
-
1
].
text
==
"
{
"
)):
warning
(
"
E150
"
,
"
no space before
'
{
'"
,
i
,
i
)
warning
(
"
E150
"
,
"
no space before
'
{
'"
,
i
,
i
)
blender_check_function_definition
(
i
)
blender_check_function_definition
(
i
)
...
@@ -1338,8 +1336,8 @@ def scan_source(fp, code, args):
...
@@ -1338,8 +1336,8 @@ def scan_source(fp, code, args):
# elif tok.type == Token.Name:
# elif tok.type == Token.Name:
# print(tok.text)
# print(tok.text)
#print(ttype, type(ttype))
#
print(ttype, type(ttype))
#print((ttype, value))
#
print((ttype, value))
# for ttype, value in la:
# for ttype, value in la:
# #print(value, end="")
# #print(value, end="")
...
@@ -1347,8 +1345,8 @@ def scan_source(fp, code, args):
...
@@ -1347,8 +1345,8 @@ def scan_source(fp, code, args):
def
scan_source_filepath
(
filepath
,
args
):
def
scan_source_filepath
(
filepath
,
args
):
# for quick tests
# for quick tests
#~ if not filepath.endswith("creator.c"):
#
~ if not filepath.endswith("creator.c"):
#~ return
#
~ return
code
=
open
(
filepath
,
'
r
'
,
encoding
=
"
utf-8
"
).
read
()
code
=
open
(
filepath
,
'
r
'
,
encoding
=
"
utf-8
"
).
read
()
...
@@ -1420,7 +1418,8 @@ def main(argv=None):
...
@@ -1420,7 +1418,8 @@ def main(argv=None):
print
(
"
Scanning:
"
,
SOURCE_DIR
)
print
(
"
Scanning:
"
,
SOURCE_DIR
)
if
0
:
if
0
:
# SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))))
# SOURCE_DIR = os.path.normpath(
# os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))))
# scan_source_recursive(os.path.join(SOURCE_DIR, "source", "blender", "bmesh"))
# scan_source_recursive(os.path.join(SOURCE_DIR, "source", "blender", "bmesh"))
scan_source_recursive
(
os
.
path
.
join
(
SOURCE_DIR
,
"
source/blender/makesrna/intern
"
),
args
)
scan_source_recursive
(
os
.
path
.
join
(
SOURCE_DIR
,
"
source/blender/makesrna/intern
"
),
args
)
sys
.
exit
(
0
)
sys
.
exit
(
0
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment