github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup python code style issues. No functional change intended.

Browse Source
This commit is contained in:
Wilson Snyder 2021-03-05 21:59:00 -05:00
parent 018d994781
commit 81ef8fb201
11 changed files with 99 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.in
View File

@ -474,9 +474,7 @@ clang-format:
|| echo "*** You are not using clang-format 10.0, indents may differ from master's ***" || echo "*** You are not using clang-format 10.0, indents may differ from master's ***"
$(CLANGFORMAT) $(CLANGFORMAT_FLAGS) $(CLANGFORMAT_FILES) $(CLANGFORMAT) $(CLANGFORMAT_FLAGS) $(CLANGFORMAT_FILES)
YAPF = yapf3 PY_PROGRAMS = \
YAPF_FLAGS = -i
YAPF_FILES = \
examples/xml_py/vl_file_copy \ examples/xml_py/vl_file_copy \
examples/xml_py/vl_hier_graph \ examples/xml_py/vl_hier_graph \
src/astgen \ src/astgen \
@ -486,14 +484,28 @@ YAPF_FILES = \
src/flexfix \ src/flexfix \
src/vlcovgen \ src/vlcovgen \
nodist/code_coverage \ nodist/code_coverage \
nodist/code_coverage.dat \
nodist/dot_importer \ nodist/dot_importer \
nodist/fuzzer/actual_fail \ nodist/fuzzer/actual_fail \
nodist/fuzzer/generate_dictionary \ nodist/fuzzer/generate_dictionary \
nodist/install_test \ nodist/install_test \
PY_FILES = \
$(PY_PROGRAMS) \
nodist/code_coverage.dat \
YAPF = yapf3
YAPF_FLAGS = -i
yapf: yapf:
$(YAPF) $(YAPF_FLAGS) $(YAPF_FILES) $(YAPF) $(YAPF_FLAGS) $(PY_FILES)
FLAKE8 = flake8
FLAKE8_FLAGS = \
--extend-exclude=fastcov.py \
--ignore=E123,E129,E251,E501,W503,W504,E701
lint-py:
$(FLAKE8) $(FLAKE8_FLAGS) $(PY_PROGRAMS)
format-pl-exec: format-pl-exec:
-chmod a+x test_regress/t/*.pl -chmod a+x test_regress/t/*.pl

10
examples/xml_py/vl_file_copy
View File

@ -6,11 +6,10 @@ import argparse
import os import os
import re import re
import subprocess import subprocess
import sys
import tempfile import tempfile
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from shutil import copy2 from shutil import copy2
from pprint import pprint, pformat # from pprint import pprint, pformat
####################################################################### #######################################################################
@ -22,6 +21,7 @@ class VlFileCopy:
# ideally this script would check against options mentioned in help # ideally this script would check against options mentioned in help
debug=0, debug=0,
output_dir='copied'): # directory name we output file uses output_dir='copied'): # directory name we output file uses
self.debug = debug self.debug = debug
xml_temp = tempfile.NamedTemporaryFile() xml_temp = tempfile.NamedTemporaryFile()
@ -119,6 +119,6 @@ SPDX-License-Identifier: CC0-1.0
fc = VlFileCopy(output_dir=args.odir, debug=args.debug, verilator_args=rem) fc = VlFileCopy(output_dir=args.odir, debug=args.debug, verilator_args=rem)
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "./vl_file_copy -h ; VERILATOR_ROOT=$V4 ./vl_file_copy +define+thru top.v" # compile-command: "./vl_file_copy -h ; VERILATOR_ROOT=$V4 ./vl_file_copy +define+thru top.v"
### End: # End:

13
examples/xml_py/vl_hier_graph
View File

@ -4,13 +4,10 @@
import argparse import argparse
import os import os
import re
import subprocess import subprocess
import sys
import tempfile import tempfile
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from shutil import copy2 # from pprint import pprint, pformat
from pprint import pprint, pformat
####################################################################### #######################################################################
@ -70,7 +67,7 @@ class VlHierGraph:
fh.write("}\n") fh.write("}\n")
def name_to_vertex_number(self, name): def name_to_vertex_number(self, name):
if not name in self.name_to_number: if name not in self.name_to_number:
self.next_vertex_number += 1 self.next_vertex_number += 1
self.name_to_number[name] = self.next_vertex_number self.name_to_number[name] = self.next_vertex_number
return self.name_to_number[name] return self.name_to_number[name]
@ -146,6 +143,6 @@ SPDX-License-Identifier: CC0-1.0
verilator_args=rem) verilator_args=rem)
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "./vl_hier_graph -h ; VERILATOR_ROOT=$V4 ./vl_hier_graph +define+thru top.v" # compile-command: "./vl_hier_graph -h ; VERILATOR_ROOT=$V4 ./vl_hier_graph +define+thru top.v"
### End: # End:

13
nodist/code_coverage
View File

@ -7,6 +7,7 @@ import multiprocessing
import os import os
import re import re
import subprocess import subprocess
import sys
RealPath = os.path.dirname(os.path.realpath(__file__)) RealPath = os.path.dirname(os.path.realpath(__file__))
Exclude_Branch_Regexps = [] Exclude_Branch_Regexps = []
@ -223,7 +224,7 @@ def clone_sources(cc_dir):
if done: if done:
break break
if re.search(regexp, line): if re.search(regexp, line):
#print("%s:%d: %s" % (infile, lineno, line) # print("%s:%d: %s" % (infile, lineno, line)
line += " //code_coverage: // LCOV_EXCL_LINE LCOV_EXCL_BR_LINE" line += " //code_coverage: // LCOV_EXCL_LINE LCOV_EXCL_BR_LINE"
excluded_lines += 1 excluded_lines += 1
excluded_br_lines += 1 excluded_br_lines += 1
@ -233,7 +234,7 @@ def clone_sources(cc_dir):
if done: if done:
break break
if re.search(regexp, line): if re.search(regexp, line):
#print("%s:%d: %s" % (infile, lineno, line) # print("%s:%d: %s" % (infile, lineno, line)
line += " //code_coverage: // LCOV_EXCL_BR_LINE" line += " //code_coverage: // LCOV_EXCL_BR_LINE"
excluded_br_lines += 1 excluded_br_lines += 1
done = True done = True
@ -256,7 +257,7 @@ def cleanup_abs_paths_info(cc_dir, infile, outfile):
count=1) count=1)
line = re.sub(cc_dir + '/', '', line, count=1) line = re.sub(cc_dir + '/', '', line, count=1)
line = re.sub(r'obj_dbg/verilog.y$', 'verilog.y', line) line = re.sub(r'obj_dbg/verilog.y$', 'verilog.y', line)
#print("Remaining SF: "+line) # print("Remaining SF: "+line)
lines.append(line) lines.append(line)
with open(outfile, "w") as ofh: with open(outfile, "w") as ofh:
@ -406,6 +407,6 @@ if True:
test() test()
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "cd .. ; nodist/code_coverage " # compile-command: "cd .. ; nodist/code_coverage "
### End: # End:

6
nodist/dot_importer
View File

@ -104,6 +104,6 @@ dotread(Args.filename)
cwrite("graph_export.cpp") cwrite("graph_export.cpp")
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "./dot_importer ../test_regress/obj_vlt/t_EXAMPLE/*orderg_o*.dot && cat graph_export.cpp" # compile-command: "./dot_importer ../test_regress/obj_vlt/t_EXAMPLE/*orderg_o*.dot && cat graph_export.cpp"
### End: # End:

7
nodist/install_test
View File

@ -6,6 +6,7 @@ import multiprocessing
import os import os
import shutil import shutil
import subprocess import subprocess
import sys
###################################################################### ######################################################################
@ -135,6 +136,6 @@ Args = parser.parse_args()
test() test()
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "cd .. ; nodist/install_test" # compile-command: "cd .. ; nodist/install_test"
### End: # End:

20
src/astgen
View File

@ -5,7 +5,7 @@ import argparse
import glob import glob
import re import re
import sys import sys
#from pprint import pprint, pformat # from pprint import pprint, pformat
Types = [] Types = []
Classes = {} Classes = {}
@ -98,7 +98,7 @@ class Cpt:
doflag = match.group(2) doflag = match.group(2)
fromn = match.group(3) fromn = match.group(3)
to = match.group(4) to = match.group(4)
#self.print("// $fromn $to\n") # self.print("// $fromn $to\n")
if not self.did_out_tree: if not self.did_out_tree:
self.did_out_tree = True self.did_out_tree = True
self.output_func(lambda self: self.tree_match_base()) self.output_func(lambda self: self.tree_match_base())
@ -206,8 +206,6 @@ class Cpt:
outl = re.sub(r'\$([a-zA-Z0-9]+)', r'nodep->\1()', func) outl = re.sub(r'\$([a-zA-Z0-9]+)', r'nodep->\1()', func)
out += outl + ";" out += outl + ";"
elif re.match(r'^\s*Ast([a-zA-Z0-9]+)\s*\{\s*(.*)\s*\}$', func): elif re.match(r'^\s*Ast([a-zA-Z0-9]+)\s*\{\s*(.*)\s*\}$', func):
nargs = 0
argnums = [] # Number for each argument name
aref = None aref = None
# Recursive array with structure to form # Recursive array with structure to form
astack = [] astack = []
@ -300,7 +298,7 @@ class Cpt:
bases = subclasses_of(typen) bases = subclasses_of(typen)
bases.append(typen) bases.append(typen)
for base in bases: for base in bases:
if not base in self.treeop: if base not in self.treeop:
continue continue
for typefunc in self.treeop[base]: for typefunc in self.treeop[base]:
lines = [ lines = [
@ -365,7 +363,7 @@ def read_types(filename):
match = re.search(r':\s*public\s+(\S+)', line) match = re.search(r':\s*public\s+(\S+)', line)
if match: if match:
inh = match.group(1) inh = match.group(1)
#print("class "+classn+" : "+inh) # print("class "+classn+" : "+inh)
if classn == "AstNode": if classn == "AstNode":
inh = "" inh = ""
if re.search(r'Ast', inh) or classn == "AstNode": if re.search(r'Ast', inh) or classn == "AstNode":
@ -425,7 +423,7 @@ def subclasses_of(typen):
cllist = [] cllist = []
subclass = Classes[typen] subclass = Classes[typen]
while True: while True:
if not subclass in Classes: if subclass not in Classes:
break break
cllist.append(subclass) cllist.append(subclass)
subclass = Classes[subclass] subclass = Classes[subclass]
@ -448,7 +446,7 @@ def children_of(typen):
return cllist return cllist
#--------------------------------------------------------------------- # ---------------------------------------------------------------------
def write_report(filename): def write_report(filename):
@ -715,6 +713,6 @@ for cpt in Args.infiles:
out_filename=cpt + "__gen.cpp") out_filename=cpt + "__gen.cpp")
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "cd obj_dbg && ../astgen -I.. V3Const.cpp" # compile-command: "cd obj_dbg && ../astgen -I.. V3Const.cpp"
### End: # End:

80
src/bisonpre
View File

@ -6,7 +6,7 @@ import os
import re import re
import subprocess import subprocess
import sys import sys
from pprint import pprint, pformat # from pprint import pprint, pformat
###################################################################### ######################################################################
@ -111,13 +111,13 @@ def clean_output(filename, outname, is_output, is_c):
if is_output: if is_output:
state_line = {} state_line = {}
l = 0 lineno = 0
for line in lines: for line in lines:
l += 1 lineno += 1
# We add a colon so it's easy to search for the definition # We add a colon so it's easy to search for the definition
match = re.match(r'^state (\d+)\s*', line) match = re.match(r'^state (\d+)\s*', line)
if match: if match:
state_line[match.group(1)] = l state_line[match.group(1)] = lineno
out = [] out = []
for line in lines: for line in lines:
match = re.match(r'^State (\d+) (conflicts)', line) match = re.match(r'^State (\d+) (conflicts)', line)
@ -200,12 +200,12 @@ def clean_input(filename, outname):
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
# ^/ to prevent comments from matching # ^/ to prevent comments from matching
if re.match(r'^[a-zA-Z0-9_<>]+:[^/]*[a-zA-Z]', line): if re.match(r'^[a-zA-Z0-9_<>]+:[^/]*[a-zA-Z]', line):
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Move text on rule line to next line: " + line + ": Move text on rule line to next line: " + line +
"\n") "\n")
@ -223,7 +223,7 @@ def clean_input(filename, outname):
dtype = matcha.group(2) dtype = matcha.group(2)
line = name + matcha.group(3) line = name + matcha.group(3)
if name in Rules: if name in Rules:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Redeclaring '" + name + "': " + line) ": Redeclaring '" + name + "': " + line)
if dtype not in types: if dtype not in types:
types[dtype] = {} types[dtype] = {}
@ -235,14 +235,14 @@ def clean_input(filename, outname):
'subrules': {} 'subrules': {}
} }
if last_rule: if last_rule:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Unterminated previous rule\n") ": Unterminated previous rule\n")
last_rule = name last_rule = name
elif matchb: elif matchb:
name = matchb.group(1) name = matchb.group(1)
if name != 'public' and name != 'private': if name != 'public' and name != 'private':
if name in Rules: if name in Rules:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Redeclaring '" + name + "': " + line) ": Redeclaring '" + name + "': " + line)
Rules[name] = { Rules[name] = {
'name': name, 'name': name,
@ -251,17 +251,16 @@ def clean_input(filename, outname):
'subrules': {} 'subrules': {}
} }
if last_rule: if last_rule:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Unterminated previous rule\n") ": Unterminated previous rule\n")
last_rule = name last_rule = name
lines.append(line) lines.append(line)
# Now clean the line and extract some more info # Now clean the line and extract some more info
cline = re.sub(r'//.*$', '\n', line) cline = re.sub(r'//.*$', '\n', line)
rline = re.sub(r'//.*$', '\n', line)
if re.match(r'^\s*;', cline): if re.match(r'^\s*;', cline):
if not last_rule: if not last_rule:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Stray semicolon\n") ": Stray semicolon\n")
last_rule = None last_rule = None
elif last_rule: elif last_rule:
@ -272,7 +271,7 @@ def clean_input(filename, outname):
dtype = match.group(1) dtype = match.group(1)
tok = match.group(2) tok = match.group(2)
if tok in tokens: if tok in tokens:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Redeclaring '" + tok + "': " + line) ": Redeclaring '" + tok + "': " + line)
tokens[tok] = dtype tokens[tok] = dtype
@ -281,22 +280,22 @@ def clean_input(filename, outname):
# print("TT "+last_rule+" "+tok+"\n") # print("TT "+last_rule+" "+tok+"\n")
Rules[last_rule]['subrules'][tok] = 1 Rules[last_rule]['subrules'][tok] = 1
#pprint(Rules) # pprint(Rules)
# Replace BISONPRE_VERSION(ver,,...) with expanded list # Replace BISONPRE_VERSION(ver,,...) with expanded list
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
if _enaline(line) and re.search(r'BISONPRE_VERSION', line): if _enaline(line) and re.search(r'BISONPRE_VERSION', line):
# 1 2 3 4 # 1 2 3 4
match = re.search( match = re.search(
r'BISONPRE_VERSION\((\S+)\s*,\s*((\S+)\s*,)?\s*([^\),]+)\)\s*$', r'BISONPRE_VERSION\((\S+)\s*,\s*((\S+)\s*,)?\s*([^\),]+)\)\s*$',
line) line)
if not match: if not match:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Bad form of BISONPRE_VERSION: " + line) ": Bad form of BISONPRE_VERSION: " + line)
ver = match.group(1) ver = match.group(1)
ver_max = match.group(3) ver_max = match.group(3)
@ -312,24 +311,24 @@ def clean_input(filename, outname):
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
if _enaline(line) and re.search(r'BISONPRE_NOT', line): if _enaline(line) and re.search(r'BISONPRE_NOT', line):
match = re.search( match = re.search(
r'(.*)BISONPRE_NOT\((\S+)\)\s*(\{[^}]+})\s*(.*)$', r'(.*)BISONPRE_NOT\((\S+)\)\s*(\{[^}]+})\s*(.*)$',
line, line,
flags=re.DOTALL) flags=re.DOTALL)
if not match: if not match:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Bad form of BISONPRE_NOT: " + line) ": Bad form of BISONPRE_NOT: " + line)
line = match.group(1) + match.group(4) line = match.group(1) + match.group(4)
endtok = match.group(2) endtok = match.group(2)
action = match.group(3) action = match.group(3)
endtoks = endtok.split(',') endtoks = endtok.split(',')
for etok in endtoks: for etok in endtoks:
if not etok in tokens: if etok not in tokens:
sys.exit("%Error: " + filename + ":" + str(l) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Can't find definition for token: " + etok + ": Can't find definition for token: " + etok +
"\n") "\n")
# Push it all onto one line to avoid error messages changing # Push it all onto one line to avoid error messages changing
@ -350,20 +349,20 @@ def clean_input(filename, outname):
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
if _enaline(line) and re.search(r'BISONPRE_COPY', line): if _enaline(line) and re.search(r'BISONPRE_COPY', line):
line = _bisonpre_copy(line, l, 0) line = _bisonpre_copy(line, lineno, 0)
lines.append(line) lines.append(line)
# Replace ~[x]~ - must be after BISONPRE_COPY expansion # Replace ~[x]~ - must be after BISONPRE_COPY expansion
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
line = re.sub(r'~[a-zA-Z0-9_]+~', '', line) line = re.sub(r'~[a-zA-Z0-9_]+~', '', line)
lines.append(line) lines.append(line)
@ -371,10 +370,10 @@ def clean_input(filename, outname):
if True: if True:
linesin = lines linesin = lines
lines = [] lines = []
l = 0 lineno = 0
needmore = 0 needmore = 0
for line in linesin: for line in linesin:
l += 1 lineno += 1
if _enaline(line) and re.search(r'//BISONPRE_TYPES', line): if _enaline(line) and re.search(r'//BISONPRE_TYPES', line):
lines.append(line) lines.append(line)
for type in sorted(types.keys()): for type in sorted(types.keys()):
@ -391,7 +390,7 @@ def clean_input(filename, outname):
line = re.sub(r'^\s*//.*$', '', line) line = re.sub(r'^\s*//.*$', '', line)
if not re.match(r'^\s*$', line): if not re.match(r'^\s*$', line):
sys.exit( sys.exit(
"%Error: " + filename + ":" + str(l) + ": Need " + "%Error: " + filename + ":" + str(lineno) + ": Need " +
needmore + needmore +
" more blank lines to keep line numbers are constant\n" " more blank lines to keep line numbers are constant\n"
) )
@ -404,7 +403,7 @@ def clean_input(filename, outname):
fh.write(line) fh.write(line)
def _bisonpre_copy(text, l, depth): def _bisonpre_copy(text, lineno, depth):
while re.search(r'BISONPRE_COPY', text): while re.search(r'BISONPRE_COPY', text):
match = re.match( match = re.match(
# 1 2 3 4 5 # 1 2 3 4 5
@ -412,14 +411,14 @@ def _bisonpre_copy(text, l, depth):
text, text,
flags=re.DOTALL) flags=re.DOTALL)
if not match: if not match:
sys.exit("%Error: " + Filename + ":" + str(l) + sys.exit("%Error: " + Filename + ":" + str(lineno) +
": Bad form of BISONPRE_NOT: " + text) ": Bad form of BISONPRE_NOT: " + text)
text = match.group(1) + '{HERE}' + match.group(5) text = match.group(1) + '{HERE}' + match.group(5)
once = match.group(2) once = match.group(2)
rule = match.group(3) rule = match.group(3)
code = match.group(4) code = match.group(4)
if not rule in Rules: if rule not in Rules:
sys.exit("%Error: " + Filename + ":" + str(l) + sys.exit("%Error: " + Filename + ":" + str(lineno) +
": Can't find definition for rule: " + rule) ": Can't find definition for rule: " + rule)
if depth > 0 and once: if depth > 0 and once:
# _ONCE means don't inherit # _ONCE means don't inherit
@ -430,20 +429,17 @@ def _bisonpre_copy(text, l, depth):
insert = Rules[rule]['rules_and_productions'] insert = Rules[rule]['rules_and_productions']
insert = re.sub(r'^\S+:', '', insert) # Strip rule name insert = re.sub(r'^\S+:', '', insert) # Strip rule name
# Recurse so BISONPRE under B # Recurse so BISONPRE under B
#print "COPY $l code $code\n"
#print "COPY $l in $insert\n"
for op in code.split(';'): for op in code.split(';'):
if re.match(r'^\s*$', op): if re.match(r'^\s*$', op):
continue continue
match = re.match(r'^\s*s/(.*?)/(.*?)/g\s*$', op) match = re.match(r'^\s*s/(.*?)/(.*?)/g\s*$', op)
if not match: if not match:
sys.exit("%Error: " + Filename + ":" + str(l) + sys.exit("%Error: " + Filename + ":" + str(lineno) +
": Didn't understand replacement: " + op) ": Didn't understand replacement: " + op)
left = match.group(1) left = match.group(1)
right = match.group(2) right = match.group(2)
insert = re.sub(left, right, insert) insert = re.sub(left, right, insert)
#print "COPY $l out $insert\n"
insert = re.sub(r'[ \t\n]+\n', "\n", insert) insert = re.sub(r'[ \t\n]+\n', "\n", insert)
insert = re.sub(r'\n', " ", insert = re.sub(r'\n', " ",
insert) # Optional - preserve line numbering insert) # Optional - preserve line numbering
@ -556,6 +552,6 @@ Args = parser.parse_args()
process() process()
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "./bisonpre " # compile-command: "./bisonpre "
### End: # End:

12
src/cppcheck_filtered
View File

@ -139,10 +139,10 @@ def _suppress(filename, linenum, id):
return False return False
with open(filename) as fh: with open(filename) as fh:
l = 0 lineno = 0
for line in fh: for line in fh:
l += 1 lineno += 1
if (l + 1 == linenum): if (lineno + 1 == linenum):
match = re.search(r'cppcheck-suppress((\s+\S+)+)', line) match = re.search(r'cppcheck-suppress((\s+\S+)+)', line)
if match: if match:
for supid in match.group(1).split(): for supid in match.group(1).split():
@ -178,6 +178,6 @@ Args, cppcheck_args = parser.parse_known_args()
process(cppcheck_args) process(cppcheck_args)
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "cd .. ; src/cppcheck_filtered cppcheck --xml --enable=all src/V3Width.cpp" # compile-command: "cd .. ; src/cppcheck_filtered cppcheck --xml --enable=all src/V3Width.cpp"
### End: # End:

3
src/flexfix
View File

@ -10,7 +10,6 @@
###################################################################### ######################################################################
# DESCRIPTION: Edits flex output to get around various broken flex issues. # DESCRIPTION: Edits flex output to get around various broken flex issues.
import argparse
import re import re
import sys import sys
@ -29,7 +28,7 @@ for line in sys.stdin:
r' (int)number_to_move == (int)YY_MORE_ADJ ', line) r' (int)number_to_move == (int)YY_MORE_ADJ ', line)
# Fix flex 2.5.4 namespace omission # Fix flex 2.5.4 namespace omission
line = re.sub(r'^class istream;', line = re.sub(r'^class istream;',
'\#include <iostream>\nusing namespace std;\n', line) '#include <iostream>\nusing namespace std;\n', line)
# Fix flex 2.5.31 redefinition # Fix flex 2.5.31 redefinition
line = re.sub(r'(\#define\s+yyFlexLexer\s+yyFlexLexer)', r'//flexfix: \1', line = re.sub(r'(\#define\s+yyFlexLexer\s+yyFlexLexer)', r'//flexfix: \1',
line) line)

9
src/vlcovgen
View File

@ -3,9 +3,8 @@
import argparse import argparse
import re import re
import os
import sys import sys
from pprint import pprint # from pprint import pprint
Items = [] Items = []
@ -105,6 +104,6 @@ lint()
write_keys(Args.srcdir + "/../include/verilated_cov_key.h") write_keys(Args.srcdir + "/../include/verilated_cov_key.h")
###################################################################### ######################################################################
### Local Variables: # Local Variables:
### compile-command: "./vlcovgen --srcdir ." # compile-command: "./vlcovgen --srcdir ."
### End: # End: