py/makeqstrdefs: Cleanup and extend source file classification.

- The classification of source files in makeqstrdefs.py has been moved into
  functions to consolidate the logic for that classification into a single
  place.
- Classification of source files (into C or C++ or "other" files) is based
  on the filename extension.
- For C++ there are many more common filename extensions than just ".cpp";
  see "Options Controlling the Kind of Output" in man gcc for example.  All
  common extensions for C++ source files which need preprocessing have been
  added.
This commit is contained in:
Daniel Jour 2022-03-29 13:42:19 +02:00 committed by Damien George
parent 1dbf393962
commit 8baf05af8c
1 changed files with 11 additions and 3 deletions

View File

@ -22,6 +22,14 @@ _MODE_QSTR = "qstr"
_MODE_COMPRESS = "compress" _MODE_COMPRESS = "compress"
def is_c_source(fname):
return os.path.splitext(fname)[1] in [".c"]
def is_cxx_source(fname):
return os.path.splitext(fname)[1] in [".cc", ".cp", ".cxx", ".cpp", ".CPP", ".c++", ".C"]
def preprocess(): def preprocess():
if any(src in args.dependencies for src in args.changed_sources): if any(src in args.dependencies for src in args.changed_sources):
sources = args.sources sources = args.sources
@ -32,9 +40,9 @@ def preprocess():
csources = [] csources = []
cxxsources = [] cxxsources = []
for source in sources: for source in sources:
if source.endswith(".cpp"): if is_cxx_source(source):
cxxsources.append(source) cxxsources.append(source)
elif source.endswith(".c"): elif is_c_source(source):
csources.append(source) csources.append(source)
try: try:
os.makedirs(os.path.dirname(args.output[0])) os.makedirs(os.path.dirname(args.output[0]))
@ -87,7 +95,7 @@ def process_file(f):
m = re_line.match(line) m = re_line.match(line)
assert m is not None assert m is not None
fname = m.group(1) fname = m.group(1)
if os.path.splitext(fname)[1] not in [".c", ".cpp"]: if not is_c_source(fname) and not is_cxx_source(fname):
continue continue
if fname != last_fname: if fname != last_fname:
write_out(last_fname, output) write_out(last_fname, output)