6502/py65
1
0
Fork 0
mirror of https://github.com/mnaberez/py65.git synced 2024-09-29 22:56:17 +00:00
Code Issues Projects Releases Wiki Activity

Don't display registers again on 'quit' command

Browse Source
This commit is contained in:
Mike Naberezny 2012-11-21 18:04:01 -08:00
parent 1d384d2f19
commit 1c6494f55f
2 changed files with 35 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
py65/monitor.py
View File

@ -109,7 +109,9 @@ class Monitor(cmd.Cmd):
error = 'Error: %s, %s: file: %s line: %s' % (t, v, file, line)
self._output(error)
self._output_mpu_status()
if not line.startswith("quit"):
self._output_mpu_status()
return result
def _reset(self, mpu_type):
@ -126,26 +128,28 @@ class Monitor(cmd.Cmd):
self._assembler = Assembler(self._mpu, self._address_parser)
def _add_shortcuts(self):
self._shortcuts = {'~': 'tilde',
'a': 'assemble',
'al': 'add_label',
'd': 'disassemble',
'dl': 'delete_label',
'f': 'fill',
'>': 'fill',
'g': 'goto',
'h': 'help',
'?': 'help',
'l': 'load',
'm': 'mem',
'q': 'quit',
'r': 'registers',
'ret': 'return',
'rad': 'radix',
's': 'save',
'shl': 'show_labels',
'x': 'quit',
'z': 'step'}
self._shortcuts = {'EOF': 'quit',
'~': 'tilde',
'a': 'assemble',
'al': 'add_label',
'd': 'disassemble',
'dl': 'delete_label',
'exit': 'quit',
'f': 'fill',
'>': 'fill',
'g': 'goto',
'h': 'help',
'?': 'help',
'l': 'load',
'm': 'mem',
'q': 'quit',
'r': 'registers',
'ret': 'return',
'rad': 'radix',
's': 'save',
'shl': 'show_labels',
'x': 'quit',
'z': 'step'}
def _preprocess_line(self, line):
# line comments
@ -264,18 +268,12 @@ class Monitor(cmd.Cmd):
self._output("mpu\t\tPrint available microprocessors.")
self._output("mpu <type>\tSelect a new microprocessor.")
def do_EOF(self, args):
def do_quit(self, args):
self._output('')
return 1
def help_EOF(self):
self._output("To quit, type ^D or use the quit command.")
def do_quit(self, args):
return self.do_EOF(args)
def help_quit(self):
return self.help_EOF()
self._output("To quit, type ^D or use the quit command.")
def do_assemble(self, args):
splitted = args.split(None, 1)

36
py65/tests/test_monitor.py
View File

@ -582,34 +582,14 @@ class MonitorTests(unittest.TestCase):
# quit
def test_shortcut_x_for_quit(self):
stdout = StringIO()
mon = Monitor(stdout=stdout)
mon.do_help('x')
def test_shortcuts_for_quit(self):
for shortcut in ["exit", "x", "q", "EOF"]:
stdout = StringIO()
mon = Monitor(stdout=stdout)
mon.do_help(shortcut)
out = stdout.getvalue()
self.assertTrue(out.startswith('To quit'))
def test_shortcut_q_for_quit(self):
stdout = StringIO()
mon = Monitor(stdout=stdout)
mon.do_help('q')
out = stdout.getvalue()
self.assertTrue(out.startswith('To quit'))
def test_do_EOF(self):
stdout = StringIO()
mon = Monitor(stdout=stdout)
exitnow = mon.do_EOF('')
self.assertEqual(True, exitnow)
def test_help_EOF(self):
stdout = StringIO()
mon = Monitor(stdout=stdout)
mon.help_EOF()
out = stdout.getvalue()
self.assertTrue(out.startswith("To quit,"))
out = stdout.getvalue()
self.assertTrue(out.startswith('To quit'))
def test_do_quit(self):
stdout = StringIO()
@ -620,7 +600,7 @@ class MonitorTests(unittest.TestCase):
def test_help_quit(self):
stdout = StringIO()
mon = Monitor(stdout=stdout)
mon.help_EOF()
mon.help_quit()
out = stdout.getvalue()
self.assertTrue(out.startswith("To quit,"))