From 00a20b53ce998f52b18303a7a680e6a00acc098c Mon Sep 17 00:00:00 2001 From: Mathias Preiner Date: Mon, 5 Apr 2021 18:04:11 -0700 Subject: [PATCH] parsekinds: Remove DEFAULT_HEADER. (#6294) DEFAULT_HEADER in src/api/parsekinds.py is essentially unused since both genkinds.py scripts pass the kinds header to the script. The current value of DEFAULT_HEADER does not work for the scripts since the working directory for genkinds.py is in src/api/{java,python}. --- src/api/java/genkinds.py | 3 +-- src/api/parsekinds.py | 3 --- src/api/python/genkinds.py.in | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/api/java/genkinds.py b/src/api/java/genkinds.py index 955e47bae..6b2e0a5af 100644 --- a/src/api/java/genkinds.py +++ b/src/api/java/genkinds.py @@ -97,8 +97,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser('Read a kinds header file and generate a ' 'corresponding java file') parser.add_argument('--kinds-header', metavar='', - help='The header file to read kinds from', - default=DEFAULT_HEADER) + help='The header file to read kinds from') parser.add_argument('--kinds-file-prefix', metavar='', help='The prefix for the generated .java file', default=DEFAULT_PREFIX) diff --git a/src/api/parsekinds.py b/src/api/parsekinds.py index 0b86d8cec..89116ff0e 100644 --- a/src/api/parsekinds.py +++ b/src/api/parsekinds.py @@ -21,9 +21,6 @@ handle nested '#if 0' pairs. from collections import OrderedDict -#################### Default Filenames ################ -DEFAULT_HEADER = 'cvc4cppkind.h' - ##################### Useful Constants ################ OCB = '{' CCB = '}' diff --git a/src/api/python/genkinds.py.in b/src/api/python/genkinds.py.in index 0c800d787..7fb84b43c 100644 --- a/src/api/python/genkinds.py.in +++ b/src/api/python/genkinds.py.in @@ -132,8 +132,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser('Read a kinds header file and generate a ' 'corresponding pxd file, with simplified kind names.') parser.add_argument('--kinds-header', metavar='', - help='The header file to read kinds from', - default=DEFAULT_HEADER) + help='The header file to read kinds from') parser.add_argument('--kinds-file-prefix', metavar='', help='The prefix for the .pxd and .pxi files to write ' 'the Cython declarations to.', -- 2.30.2