style.py (11409:72f80dd8b194) style.py (11717:27622f94fdcc)
1#! /usr/bin/env python
2#
3# Copyright (c) 2016 ARM Limited
4# All rights reserved
5#
6# The license below extends only to copyright in the software and shall
7# not be construed as granting a license to any other intellectual
8# property including but not limited to intellectual property relating

--- 27 unchanged lines hidden (view full) ---

36# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37#
38# Authors: Andreas Sandberg
39
40import os
41import sys
42
43from style.file_types import lang_type
1#! /usr/bin/env python
2#
3# Copyright (c) 2016 ARM Limited
4# All rights reserved
5#
6# The license below extends only to copyright in the software and shall
7# not be construed as granting a license to any other intellectual
8# property including but not limited to intellectual property relating

--- 27 unchanged lines hidden (view full) ---

36# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37#
38# Authors: Andreas Sandberg
39
40import os
41import sys
42
43from style.file_types import lang_type
44from style.verifiers import all_verifiers
44import style.verifiers
45from style.region import all_regions
46
47from style.style import StdioUI
48from style import repo
49
45from style.region import all_regions
46
47from style.style import StdioUI
48from style import repo
49
50def verify(filename, regions=all_regions, verbose=False):
50verifier_names = dict([
51 (c.__name__, c) for c in style.verifiers.all_verifiers ])
52
53def verify(filename, regions=all_regions, verbose=False, verifiers=None,
54 auto_fix=False):
51 ui = StdioUI()
55 ui = StdioUI()
52 opts = {}
56 opts = {
57 "fix_all" : auto_fix,
58 }
53 base = os.path.join(os.path.dirname(__file__), "..")
59 base = os.path.join(os.path.dirname(__file__), "..")
54 verifiers = [ v(ui, opts, base=base) for v in all_verifiers ]
60 if verifiers is None:
61 verifiers = style.verifiers.all_verifiers
55
56 if verbose:
57 print "Verifying %s[%s]..." % (filename, regions)
62
63 if verbose:
64 print "Verifying %s[%s]..." % (filename, regions)
58 for verifier in verifiers:
65 for verifier in [ v(ui, opts, base=base) for v in verifiers ]:
59 if verbose:
60 print "Applying %s (%s)" % (
61 verifier.test_name, verifier.__class__.__name__)
62 if verifier.apply(filename, regions=regions):
63 return False
64 return True
65
66def detect_repo():

--- 23 unchanged lines hidden (view full) ---

90 epilog="""If no files are specified, the style checker tries to
91 determine the list of modified and added files from the version
92 control system and checks those."""
93 )
94
95 parser.add_argument("--verbose", "-v", action="count",
96 help="Produce verbose output")
97
66 if verbose:
67 print "Applying %s (%s)" % (
68 verifier.test_name, verifier.__class__.__name__)
69 if verifier.apply(filename, regions=regions):
70 return False
71 return True
72
73def detect_repo():

--- 23 unchanged lines hidden (view full) ---

97 epilog="""If no files are specified, the style checker tries to
98 determine the list of modified and added files from the version
99 control system and checks those."""
100 )
101
102 parser.add_argument("--verbose", "-v", action="count",
103 help="Produce verbose output")
104
105 parser.add_argument("--fix", "-f", action="store_true",
106 help="Automatically fix style violations.")
107
98 parser.add_argument("--modifications", "-m", action="store_true",
99 help="""Apply the style checker to modified regions
100 instead of whole files""")
101
102 parser.add_argument("--repo-type", choices=repo_types, default="auto",
103 help="Repository type to use to detect changes")
104
108 parser.add_argument("--modifications", "-m", action="store_true",
109 help="""Apply the style checker to modified regions
110 instead of whole files""")
111
112 parser.add_argument("--repo-type", choices=repo_types, default="auto",
113 help="Repository type to use to detect changes")
114
115 parser.add_argument("--checker", "-c", choices=verifier_names, default=[],
116 action="append",
117 help="""Style checkers to run. Can be specified
118 multiple times.""")
119
105 parser.add_argument("files", metavar="FILE", nargs="*",
106 type=str,
107 help="Source file(s) to inspect")
108
109 args = parser.parse_args()
110
111 repo = repo_types[args.repo_type]()
112
120 parser.add_argument("files", metavar="FILE", nargs="*",
121 type=str,
122 help="Source file(s) to inspect")
123
124 args = parser.parse_args()
125
126 repo = repo_types[args.repo_type]()
127
128 verifiers = [ verifier_names[name] for name in args.checker ] \
129 if args.checker else None
130
113 files = args.files
114 if not files and repo:
115 added, modified = repo.staged_files()
116 files = [ repo.file_path(f) for f in added + modified ]
117
118 for filename in files:
119 if args.modifications and repo and repo.in_repo(filename):
120 regions = repo.modified_regions(filename)
121 else:
122 regions = all_regions
123
124 if not verify(filename, regions=regions,
131 files = args.files
132 if not files and repo:
133 added, modified = repo.staged_files()
134 files = [ repo.file_path(f) for f in added + modified ]
135
136 for filename in files:
137 if args.modifications and repo and repo.in_repo(filename):
138 regions = repo.modified_regions(filename)
139 else:
140 regions = all_regions
141
142 if not verify(filename, regions=regions,
125 verbose=args.verbose):
143 verbose=args.verbose,
144 verifiers=verifiers,
145 auto_fix=args.fix):
126 sys.exit(1)
146 sys.exit(1)