bin/kevm, kevm-pyk/__main__: rename show-cfg => show

Author: ehildenb

bin/kevm

@@ -294,8 +294,8 @@ run_foundry_prove() {
     run_kevm_pyk foundry-prove "$@"
 }
 
-run_foundry_show_cfg() {
-    run_kevm_pyk foundry-show-cfg "$@"
+run_foundry_show() {
+    run_kevm_pyk foundry-show "$@"
 }
 
 run_foundry_list() {
@@ -318,7 +318,7 @@ if [[ "$run_command" == 'help' ]] || [[ "$run_command" == '--help' ]] ; then
                ${KEVM} klab-view                                              [--profile|--debug]             <spec>
                ${KEVM} solc-to-k                                              [--profile|--debug]             <sol-file> <contract-name> <solc-arg>*
                ${KEVM} foundry-list         # see dedicated help menu
-               ${KEVM} foundry-cfg          # see dedicated help menu
+               ${KEVM} foundry-show         # see dedicated help menu
                ${KEVM} foundry-kompile      # see dedicated help menu
                ${KEVM} foundry-prove        # see dedicated help menu
 
@@ -399,7 +399,8 @@ kevm_host='127.0.0.1'
 [[ ! "${run_command}" == solc-to-k        ]] || backend=haskell
 [[ ! "${run_command}" == foundry-kompile  ]] || backend=foundry
 [[ ! "${run_command}" == foundry-prove    ]] || backend=foundry
-[[ ! "${run_command}" == foundry-show-cfg ]] || backend=foundry
+[[ ! "${run_command}" == foundry-list     ]] || backend=foundry
+[[ ! "${run_command}" == foundry-show     ]] || backend=foundry
 [[ ! "${run_command}" == interpret        ]] || unparse=false
 args=()
 while [[ $# -gt 0 ]]; do
@@ -444,7 +445,7 @@ if ${pyk}; then
 fi
 
 # get the run file
-if [[ "${run_command}" != 'foundry-kompile' ]] && [[ "${run_command}" != 'foundry-prove' ]] && [[ "${run_command}" != 'foundry-show-cfg' ]] && [[ "${run_command}" != 'foundry-list' ]]; then
+if [[ "${run_command}" != 'foundry-kompile' ]] && [[ "${run_command}" != 'foundry-prove' ]] && [[ "${run_command}" != 'foundry-show' ]] && [[ "${run_command}" != 'foundry-list' ]]; then
     run_file="$1" ; shift
     if [[ "${run_file}" == '-' ]]; then
         tmp_input="$(mktemp)"
@@ -476,7 +477,7 @@ case "$run_command-$backend" in
     solc-to-k-*                               ) run_solc             "$@" ;;
     foundry-kompile-*                         ) run_foundry_kompile  "$@" ;;
     foundry-prove-*                           ) run_foundry_prove    "$@" ;;
-    foundry-show-cfg-*                        ) run_foundry_show_cfg "$@" ;;
+    foundry-show-*                            ) run_foundry_show     "$@" ;;
     foundry-list-*                            ) run_foundry_list     "$@" ;;
     *) ${KEVM} help ; fatal "Unknown command on backend: $run_command $backend" ;;
 esac

kevm-pyk/src/kevm_pyk/__main__.py

@@ -460,7 +460,7 @@ def prove_it(id_and_cfg: Tuple[str, Tuple[KCFG, Path]]) -> bool:
     sys.exit(failed)
 
 
-def exec_foundry_show_cfg(
+def exec_foundry_show(
     profile: bool,
     foundry_out: Path,
     test: str,
@@ -784,33 +784,33 @@ def parse(s: str) -> List[T]:
         help='Do not simplify the initial and target states at startup.',
     )
 
-    foundry_show_cfg_args = command_parser.add_parser(
-        'foundry-show-cfg',
+    foundry_show_args = command_parser.add_parser(
+        'foundry-show',
         help='Display a given Foundry CFG.',
         parents=[shared_args, k_args],
     )
-    foundry_show_cfg_args.add_argument('foundry_out', type=dir_path, help='Path to Foundry output directory.')
-    foundry_show_cfg_args.add_argument('test', type=str, help='Display the CFG for this test.')
-    foundry_show_cfg_args.add_argument(
+    foundry_show_args.add_argument('foundry_out', type=dir_path, help='Path to Foundry output directory.')
+    foundry_show_args.add_argument('test', type=str, help='Display the CFG for this test.')
+    foundry_show_args.add_argument(
         '--node',
         type=str,
         dest='nodes',
         default=[],
         action='append',
         help='List of nodes to display as well.',
     )
-    foundry_show_cfg_args.add_argument(
+    foundry_show_args.add_argument(
         '--node-delta',
         type=KIT.arg_pair_of(str, str),
         dest='node_deltas',
         default=[],
         action='append',
         help='List of nodes to display delta for.',
     )
-    foundry_show_cfg_args.add_argument(
+    foundry_show_args.add_argument(
         '--minimize', dest='minimize', default=True, action='store_true', help='Minimize output.'
     )
-    foundry_show_cfg_args.add_argument(
+    foundry_show_args.add_argument(
         '--no-minimize', dest='minimize', action='store_false', help='Do not minimize output.'
     )