Skip to content

Commit fe7b775

Browse files
Fix default boolean options always going to False (runtimeverification/pyk#955)
The parsed command line args are always getting False when no `default` is specified. However I had written code assuming that args would default to either None or the empty list for list type arguments.. --------- Co-authored-by: devops <[email protected]>
1 parent 6a85f92 commit fe7b775

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

pyk/docs/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
project = 'pyk'
1010
author = 'Runtime Verification, Inc'
1111
copyright = '2024, Runtime Verification, Inc'
12-
version = '0.1.689'
13-
release = '0.1.689'
12+
version = '0.1.690'
13+
release = '0.1.690'
1414

1515
# -- General configuration ---------------------------------------------------
1616
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

pyk/package/version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.689
1+
0.1.690

pyk/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "pyk"
7-
version = "0.1.689"
7+
version = "0.1.690"
88
description = ""
99
authors = [
1010
"Runtime Verification, Inc. <[email protected]>",

pyk/src/pyk/cli/args.py

+20-9
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def default() -> dict[str, Any]:
3232

3333
@staticmethod
3434
def update_args(parser: ArgumentParser) -> None:
35-
parser.add_argument('--verbose', '-v', action='store_true', help='Verbose output.')
36-
parser.add_argument('--debug', action='store_true', help='Debug output.')
35+
parser.add_argument('--verbose', '-v', default=None, action='store_true', help='Verbose output.')
36+
parser.add_argument('--debug', default=None, action='store_true', help='Debug output.')
3737

3838

3939
class OutputFileOptions(Options):
@@ -69,8 +69,10 @@ def default() -> dict[str, Any]:
6969

7070
@staticmethod
7171
def update_args(parser: ArgumentParser) -> None:
72-
parser.add_argument('--minimize', dest='minimize', action='store_true', help='Minimize output.')
73-
parser.add_argument('--no-minimize', dest='minimize', action='store_false', help='Do not minimize output.')
72+
parser.add_argument('--minimize', dest='minimize', default=None, action='store_true', help='Minimize output.')
73+
parser.add_argument(
74+
'--no-minimize', dest='minimize', default=None, action='store_false', help='Do not minimize output.'
75+
)
7476

7577

7678
class KDefinitionOptions(Options):
@@ -185,11 +187,16 @@ def update_args(parser: ArgumentParser) -> None:
185187
parser.add_argument(
186188
'--emit-json',
187189
dest='emit_json',
190+
default=None,
188191
action='store_true',
189192
help='Emit JSON definition after compilation.',
190193
)
191194
parser.add_argument(
192-
'--no-emit-json', dest='emit_json', action='store_false', help='Do not JSON definition after compilation.'
195+
'--no-emit-json',
196+
dest='emit_json',
197+
default=None,
198+
action='store_false',
199+
help='Do not JSON definition after compilation.',
193200
)
194201
parser.add_argument(
195202
'-ccopt',
@@ -200,31 +207,35 @@ def update_args(parser: ArgumentParser) -> None:
200207
parser.add_argument(
201208
'--no-llvm-kompile',
202209
dest='llvm_kompile',
210+
default=None,
203211
action='store_false',
204212
help='Do not run llvm-kompile process.',
205213
)
206214
parser.add_argument(
207215
'--with-llvm-library',
208216
dest='llvm_library',
217+
default=None,
209218
action='store_true',
210219
help='Make kompile generate a dynamic llvm library.',
211220
)
212221
parser.add_argument(
213222
'--enable-llvm-debug',
214223
dest='enable_llvm_debug',
224+
default=None,
215225
action='store_true',
216226
help='Make kompile generate debug symbols for llvm.',
217227
)
218228
parser.add_argument(
219229
'--read-only-kompiled-directory',
220230
dest='read_only',
231+
default=None,
221232
action='store_true',
222233
help='Generated a kompiled directory that K will not attempt to write to afterwards.',
223234
)
224-
parser.add_argument('-O0', dest='o0', action='store_true', help='Optimization level 0.')
225-
parser.add_argument('-O1', dest='o1', action='store_true', help='Optimization level 1.')
226-
parser.add_argument('-O2', dest='o2', action='store_true', help='Optimization level 2.')
227-
parser.add_argument('-O3', dest='o3', action='store_true', help='Optimization level 3.')
235+
parser.add_argument('-O0', dest='o0', default=None, action='store_true', help='Optimization level 0.')
236+
parser.add_argument('-O1', dest='o1', default=None, action='store_true', help='Optimization level 1.')
237+
parser.add_argument('-O2', dest='o2', default=None, action='store_true', help='Optimization level 2.')
238+
parser.add_argument('-O3', dest='o3', default=None, action='store_true', help='Optimization level 3.')
228239

229240

230241
class ParallelOptions(Options):

pyk/src/pyk/kdist/__main__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def update_args(parser: ArgumentParser) -> None:
8686
action='append',
8787
help='build with argument',
8888
)
89-
parser.add_argument('-f', '--force', action='store_true', help='force build')
89+
parser.add_argument('-f', '--force', default=None, action='store_true', help='force build')
9090
parser.add_argument('-j', '--jobs', metavar='N', type=int, help='maximal number of build jobs')
9191

9292
def exec(self) -> None:

0 commit comments

Comments
 (0)