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}.

diff --git a/src/api/java/genkinds.py b/src/api/java/genkinds.py
index 955e47bae3780e7736e4c71ad2bcd717cce386b2..6b2e0a5af2b23e20ed62442043706374525f319f 100644 (file)
--- 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='<KINDS_HEADER>',
-                        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='<KIND_FILE_PREFIX>',
                         help='The prefix for the generated .java file',
                         default=DEFAULT_PREFIX)

diff --git a/src/api/parsekinds.py b/src/api/parsekinds.py
index 0b86d8cec8f9f89ed0fe8e021946e98ea479765d..89116ff0e15b0bccd846c81de720eb63e6bbfe6a 100644 (file)
--- 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 0c800d7877c4abb90dc691d0398c09c76767a620..7fb84b43c35aa30b36399d755b3cac5bc32a8de9 100644 (file)
--- 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='<KINDS_HEADER>',
-                        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='<KIND_FILE_PREFIX>',
                         help='The prefix for the .pxd and .pxi files to write '
                         'the Cython declarations to.',