Hi Andreas and everyone, I've been having some issues with the style scripts ever since Andreas updated them a while back. The scary part about these problems is that sometimes they end up with deleting all of the text from the offending file! I haven't lost any work, yet, but I've come close a couple of times, being saved only by my text editor's buffer.
Here are a few examples of the issues: 1) I applied http://reviews.gem5.org/r/3132/ to a clean version of gem5 and ran "hg qpush" which resulted in the following: chinook:gem5>hg qpush > applying systemc_stats.patch > invalid spacing after if/while/for in /afs/ > cs.wisc.edu/p/multifacet/users/powerjg/gem5/util/systemc/stats.cc:67 > invalid spacing after if/while/for in /afs/ > cs.wisc.edu/p/multifacet/users/powerjg/gem5/util/systemc/stats.cc:117 > invalid spacing after if/while/for in /afs/ > cs.wisc.edu/p/multifacet/users/powerjg/gem5/util/systemc/stats.cc:150 > (a)bort, (i)gnore, or (f)ix? f > Traceback (most recent call last): > File "/u/p/o/powerjg/multifacet/gem5/util/hgstyle.py", line 182, in > check_style > return do_check_style(ui, repo, **args) > File "/u/p/o/powerjg/multifacet/gem5/util/hgstyle.py", line 165, in > do_check_style > if verifier.apply(joinpath(repo.root, fname), mod_regions): > File "/u/p/o/powerjg/multifacet/gem5/util/style/verifiers.py", line 154, > in apply > self.fix(filename, regions) > File "/u/p/o/powerjg/multifacet/gem5/util/style/verifiers.py", line 219, > in fix > line = self.fix_line(line, language=lang) > File "/u/p/o/powerjg/multifacet/gem5/util/style/verifiers.py", line 352, > in fix_line > new_line = _any_control.sub(r'\1 (', line) > NameError: global name '_any_control' is not defined > transaction abort! > rollback completed > done > > > abort: pretxncommit.style hook failed I think this always happens when there is an if() without a space, but I haven't spent enough time looking into it to be sure. 2) The style fixer and the style checker don't agree on how to order header files. I think the style checker wants the header file for the .cc file to be the first header, but the style fixer does not do this. I could be wrong about this issue, though. I've just noticed that I can run the style checker, tell it to fix the problem, and then re-run it and it complains again. 3) When there is a failure in while trying to fix a style error the original text should be saved! At a minimum, before starting to modify the file we should make a backup, but it would be even better if we restored the original file on an error. Andreas, do you have a quick fix for these issues? I could probably spend a few hours trying to track the problems down, but would rather not spend my time on it if you're able to do it quickly. Thanks, Jason _______________________________________________ gem5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/gem5-dev
