session: add an implicit exit at the end of the command file.

And remove the 'exit' command.
main
Jean-François Nguyen 2 years ago
parent c743c932e7
commit 846d4f8a4c

@ -9,4 +9,3 @@ check microwatt:storage:insn --depth=20
check microwatt:storage:data --depth=20

build --build-dir=./build --src-dir=./src
exit

@ -2,7 +2,6 @@ import argparse
import os
import readline
import multiprocessing
import sys

from power_fv.build import sby
from power_fv.core import PowerFVCore
@ -47,7 +46,6 @@ class PowerFVSession:
self.add_check_subparser()
self.add_dump_subparser()
self.add_build_subparser()
self.add_exit_subparser()

def main(self):
parser = argparse.ArgumentParser(prog=self.parser.prog)
@ -60,19 +58,21 @@ class PowerFVSession:
help="run commands from CMDFILE")

args = parser.parse_args()
try:
self._loop(args)
except EOFError:
pass

def _loop(self, args):
while True:
if args.cmdfile is None:
_readline = lambda: input("powerfv> ")
try:
line = input("powerfv> ")
except EOFError:
break
else:
_readline = args.cmdfile.readline
line = args.cmdfile.readline()
if not line:
break

while True:
line = _readline().rstrip("\n")
line = line.strip()
if not line or line.startswith("#"):
continue
self._eval(line.split())
@ -121,10 +121,6 @@ class PowerFVSession:
PowerFVCheck .add_build_arguments(parser)
self.core_cls.add_build_arguments(parser)

def add_exit_subparser(self):
parser = self.subparsers.add_parser("exit", help="exit")
parser.set_defaults(_cmd=self.exit)

# Commands

def help(self, **kwargs):
@ -161,7 +157,3 @@ class PowerFVSession:

with multiprocessing.Pool(jobs) as pool:
pool.starmap(map_func, map_args)

def exit(self, **kwargs):
print("exiting")
sys.exit()

Loading…
Cancel
Save