Rearranging output in debug functions.

diff --git a/stdlib/debug.pvvs b/stdlib/debug.pvvs
index 8baef32..4362a53 100644 (file)
--- a/stdlib/debug.pvvs
+++ b/stdlib/debug.pvvs
@@ -34,8 +34,8 @@ SNT                      | SWAP
 
 @ Print output line for this memory location
 NSTTTTSTTN               | JSR > 111011 (debug:printmagnitude)
 
 @ Print output line for this memory location
 NSTTTTSTTN               | JSR > 111011 (debug:printmagnitude)

-SSSTTTSTSN               | PUSH ASCII ':'

 SSSTSSTN                 | PUSH ASCII '\t'
 SSSTSSTN                 | PUSH ASCII '\t'

+SSSTTTSTSN               | PUSH ASCII ':'

 TNSS                     | PUTC
 TNSS                     | PUTC
 SNS                      | DUP
 TNSS                     | PUTC
 TNSS                     | PUTC
 SNS                      | DUP


@@ -89,8 +89,8 @@ NSTTTTTSSN               | JSR > 111100 (debug:printstring)
 NSSVSSTTTSSTSSSSSSSTN    | Mark: 00111001 00000001
 SNS                      | DUP
 NSTTTTSTTN               | JSR > 111011 (debug:printmagnitude)
 NSSVSSTTTSSTSSSSSSSTN    | Mark: 00111001 00000001
 SNS                      | DUP
 NSTTTTSTTN               | JSR > 111011 (debug:printmagnitude)

-SSSTTTSTSN               | PUSH ASCII ':'

 SSSTSSTN                 | PUSH ASCII '\t'
 SSSTSSTN                 | PUSH ASCII '\t'

+SSSTTTSTSN               | PUSH ASCII ':'

 TNSS                     | PUTC
 TNSS                     | PUTC
 SNT                      | SWAP
 TNSS                     | PUTC
 TNSS                     | PUTC
 SNT                      | SWAP

diff --git a/stdlib_tests/vv_test.py b/stdlib_tests/vv_test.py
index cb42baf..4b51b01 100755 (executable)
--- a/stdlib_tests/vv_test.py
+++ b/stdlib_tests/vv_test.py
@@ -18,8 +18,8 @@ src_extension = '.pvvs'
 
 tests = [
         # Format: ['filename_without_extension', 'string for stdin', 'string for expected stdout']
 
 tests = [
         # Format: ['filename_without_extension', 'string for stdin', 'string for expected stdout']

-        ['0001_dumpstack', '', 'TOS:\n1\t:+42\n0\t:+255\n'],
-        ['0002_dumpheap', '', '32\t:+255\n33\t:+42\n'],
+        ['0001_dumpstack', '', 'TOS:\n1:\t+42\n0:\t+255\n'],
+        ['0002_dumpheap', '', '32:\t+255\n33:\t+42\n'],

         ] 
 
 for test in tests:
         ] 
 
 for test in tests: