From e7eeb47570abdc9c416a7dc4a88febfb380ef98a Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Fri, 24 Apr 2015 19:50:54 -0700
Subject: 1168

---
 cpp/.traces/brace_conversion_and_run               |  8 +++----
 cpp/.traces/buffer-append-works                    |  6 ++---
 cpp/.traces/integer-to-decimal-digit-negative      |  6 ++---
 cpp/.traces/integer-to-decimal-digit-positive      | 12 +++++-----
 cpp/.traces/interpolate-at-end                     | 24 ++++++++++----------
 cpp/.traces/interpolate-at-start                   | 26 +++++++++++-----------
 cpp/.traces/interpolate-works                      | 18 +++++++--------
 cpp/.traces/jump_backward                          |  6 ++---
 cpp/.traces/jump_can_skip_instructions             |  2 +-
 cpp/.traces/string-append-1                        | 26 +++++++++++-----------
 .../string-equal-common-lengths-but-distinct       |  4 ++--
 cpp/.traces/string-equal-identical                 |  6 ++---
 cpp/.traces/string-equal-reflexive                 |  6 ++---
 cpp/023jump                                        |  2 +-
 14 files changed, 76 insertions(+), 76 deletions(-)

(limited to 'cpp')

diff --git a/cpp/.traces/brace_conversion_and_run b/cpp/.traces/brace_conversion_and_run
index cce4677c..422c5344 100644
--- a/cpp/.traces/brace_conversion_and_run
+++ b/cpp/.traces/brace_conversion_and_run
@@ -69,7 +69,7 @@ run/0: product 0 is 4
 mem/0: storing 4 in location 1
 run/0: instruction test-factorial/7
 run/0: ingredient 0 is -5
-run/0: pc now 2
+run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 4
@@ -96,7 +96,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1
 run/0: instruction test-factorial/7
 run/0: ingredient 0 is -5
-run/0: pc now 2
+run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 3
@@ -123,7 +123,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1
 run/0: instruction test-factorial/7
 run/0: ingredient 0 is -5
-run/0: pc now 2
+run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
@@ -150,7 +150,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1
 run/0: instruction test-factorial/7
 run/0: ingredient 0 is -5
-run/0: pc now 2
+run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1
diff --git a/cpp/.traces/buffer-append-works b/cpp/.traces/buffer-append-works
index 06f665a2..14ec3ad7 100644
--- a/cpp/.traces/buffer-append-works
+++ b/cpp/.traces/buffer-append-works
@@ -585,7 +585,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1312
 run/0: instruction grow-buffer/15
 run/0: ingredient 0 is -7
-run/0: pc now 8
+run/0: jumping to instruction 9
 run/0: instruction grow-buffer/9
 run/0: ingredient 0 is i
 mem/0: location 1312 is 1
@@ -629,7 +629,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1312
 run/0: instruction grow-buffer/15
 run/0: ingredient 0 is -7
-run/0: pc now 8
+run/0: jumping to instruction 9
 run/0: instruction grow-buffer/9
 run/0: ingredient 0 is i
 mem/0: location 1312 is 2
@@ -673,7 +673,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1312
 run/0: instruction grow-buffer/15
 run/0: ingredient 0 is -7
-run/0: pc now 8
+run/0: jumping to instruction 9
 run/0: instruction grow-buffer/9
 run/0: ingredient 0 is i
 mem/0: location 1312 is 3
diff --git a/cpp/.traces/integer-to-decimal-digit-negative b/cpp/.traces/integer-to-decimal-digit-negative
index d629d10a..2922c22b 100644
--- a/cpp/.traces/integer-to-decimal-digit-negative
+++ b/cpp/.traces/integer-to-decimal-digit-negative
@@ -209,7 +209,7 @@ run/0: result 0 is 1060
 mem/0: storing 1060 in location 1006
 run/0: instruction integer-to-decimal-string/22
 run/0: ingredient 0 is -6
-run/0: pc now 16
+run/0: jumping to instruction 17
 run/0: instruction integer-to-decimal-string/17
 run/0: ingredient 0 is n
 mem/0: location 1002 is 0
@@ -402,7 +402,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1014
 run/0: instruction integer-to-decimal-string/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction integer-to-decimal-string/34
 run/0: ingredient 0 is i
 mem/0: location 1013 is 0
@@ -450,7 +450,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1014
 run/0: instruction integer-to-decimal-string/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction integer-to-decimal-string/34
 run/0: ingredient 0 is i
 mem/0: location 1013 is -1
diff --git a/cpp/.traces/integer-to-decimal-digit-positive b/cpp/.traces/integer-to-decimal-digit-positive
index 70cc577f..f5a8ebb7 100644
--- a/cpp/.traces/integer-to-decimal-digit-positive
+++ b/cpp/.traces/integer-to-decimal-digit-positive
@@ -200,7 +200,7 @@ run/0: result 0 is 1060
 mem/0: storing 1060 in location 1006
 run/0: instruction integer-to-decimal-string/22
 run/0: ingredient 0 is -6
-run/0: pc now 16
+run/0: jumping to instruction 17
 run/0: instruction integer-to-decimal-string/17
 run/0: ingredient 0 is n
 mem/0: location 1002 is 23
@@ -327,7 +327,7 @@ run/0: result 0 is 1060
 mem/0: storing 1060 in location 1006
 run/0: instruction integer-to-decimal-string/22
 run/0: ingredient 0 is -6
-run/0: pc now 16
+run/0: jumping to instruction 17
 run/0: instruction integer-to-decimal-string/17
 run/0: ingredient 0 is n
 mem/0: location 1002 is 2
@@ -454,7 +454,7 @@ run/0: result 0 is 1060
 mem/0: storing 1060 in location 1006
 run/0: instruction integer-to-decimal-string/22
 run/0: ingredient 0 is -6
-run/0: pc now 16
+run/0: jumping to instruction 17
 run/0: instruction integer-to-decimal-string/17
 run/0: ingredient 0 is n
 mem/0: location 1002 is 0
@@ -550,7 +550,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1014
 run/0: instruction integer-to-decimal-string/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction integer-to-decimal-string/34
 run/0: ingredient 0 is i
 mem/0: location 1013 is 1
@@ -598,7 +598,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1014
 run/0: instruction integer-to-decimal-string/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction integer-to-decimal-string/34
 run/0: ingredient 0 is i
 mem/0: location 1013 is 0
@@ -646,7 +646,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1014
 run/0: instruction integer-to-decimal-string/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction integer-to-decimal-string/34
 run/0: ingredient 0 is i
 mem/0: location 1013 is -1
diff --git a/cpp/.traces/interpolate-at-end b/cpp/.traces/interpolate-at-end
index 5a59322e..a972b50f 100644
--- a/cpp/.traces/interpolate-at-end
+++ b/cpp/.traces/interpolate-at-end
@@ -64,7 +64,7 @@ run/0: product 0 is 10
 mem/0: storing 10 in location 1017
 run/0: instruction interpolate/10
 run/0: ingredient 0 is -6
-run/0: pc now 4
+run/0: jumping to instruction 5
 run/0: instruction interpolate/5
 mem/0: storing 0 in location 1019
 run/0: instruction interpolate/6
@@ -152,7 +152,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 1
@@ -211,7 +211,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 2
@@ -270,7 +270,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 3
@@ -329,7 +329,7 @@ run/0: product 0 is 4
 mem/0: storing 4 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 4
@@ -388,7 +388,7 @@ run/0: product 0 is 5
 mem/0: storing 5 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 5
@@ -447,7 +447,7 @@ run/0: product 0 is 6
 mem/0: storing 6 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 6
@@ -506,7 +506,7 @@ run/0: product 0 is 7
 mem/0: storing 7 in location 1022
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1023 is 7
@@ -590,7 +590,7 @@ run/0: product 0 is 8
 mem/0: storing 8 in location 1022
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1028 is 1
@@ -639,7 +639,7 @@ run/0: product 0 is 9
 mem/0: storing 9 in location 1022
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1028 is 2
@@ -688,7 +688,7 @@ run/0: product 0 is 10
 mem/0: storing 10 in location 1022
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1028 is 3
@@ -709,7 +709,7 @@ run/0: product 0 is 8
 mem/0: storing 8 in location 1023
 run/0: instruction interpolate/44
 run/0: ingredient 0 is -27
-run/0: pc now 17
+run/0: jumping to instruction 18
 run/0: instruction interpolate/18
 mem/0: storing 0 in location 1019
 run/0: instruction interpolate/19
diff --git a/cpp/.traces/interpolate-at-start b/cpp/.traces/interpolate-at-start
index 23c1d877..e220bb4f 100644
--- a/cpp/.traces/interpolate-at-start
+++ b/cpp/.traces/interpolate-at-start
@@ -64,7 +64,7 @@ run/0: product 0 is 11
 mem/0: storing 11 in location 1018
 run/0: instruction interpolate/10
 run/0: ingredient 0 is -6
-run/0: pc now 4
+run/0: jumping to instruction 5
 run/0: instruction interpolate/5
 mem/0: storing 0 in location 1020
 run/0: instruction interpolate/6
@@ -177,7 +177,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1023
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1029 is 1
@@ -226,7 +226,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1023
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1029 is 2
@@ -275,7 +275,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1023
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1029 is 3
@@ -296,7 +296,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1024
 run/0: instruction interpolate/44
 run/0: ingredient 0 is -27
-run/0: pc now 17
+run/0: jumping to instruction 18
 run/0: instruction interpolate/18
 mem/0: storing 0 in location 1020
 run/0: instruction interpolate/19
@@ -352,7 +352,7 @@ run/0: product 0 is 4
 mem/0: storing 4 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 2
@@ -401,7 +401,7 @@ run/0: product 0 is 5
 mem/0: storing 5 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 3
@@ -450,7 +450,7 @@ run/0: product 0 is 6
 mem/0: storing 6 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 4
@@ -499,7 +499,7 @@ run/0: product 0 is 7
 mem/0: storing 7 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 5
@@ -548,7 +548,7 @@ run/0: product 0 is 8
 mem/0: storing 8 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 6
@@ -597,7 +597,7 @@ run/0: product 0 is 9
 mem/0: storing 9 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 7
@@ -646,7 +646,7 @@ run/0: product 0 is 10
 mem/0: storing 10 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 8
@@ -695,7 +695,7 @@ run/0: product 0 is 11
 mem/0: storing 11 in location 1023
 run/0: instruction interpolate/54
 run/0: ingredient 0 is -8
-run/0: pc now 46
+run/0: jumping to instruction 47
 run/0: instruction interpolate/47
 run/0: ingredient 0 is i
 mem/0: location 1024 is 9
diff --git a/cpp/.traces/interpolate-works b/cpp/.traces/interpolate-works
index c61cd12a..3858438e 100644
--- a/cpp/.traces/interpolate-works
+++ b/cpp/.traces/interpolate-works
@@ -64,7 +64,7 @@ run/0: product 0 is 7
 mem/0: storing 7 in location 1014
 run/0: instruction interpolate/10
 run/0: ingredient 0 is -6
-run/0: pc now 4
+run/0: jumping to instruction 5
 run/0: instruction interpolate/5
 mem/0: storing 0 in location 1016
 run/0: instruction interpolate/6
@@ -152,7 +152,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1019
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1020 is 1
@@ -211,7 +211,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1019
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1020 is 2
@@ -270,7 +270,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1019
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1020 is 3
@@ -329,7 +329,7 @@ run/0: product 0 is 4
 mem/0: storing 4 in location 1019
 run/0: instruction interpolate/30
 run/0: ingredient 0 is -10
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction interpolate/21
 run/0: ingredient 0 is i
 mem/0: location 1020 is 4
@@ -413,7 +413,7 @@ run/0: product 0 is 5
 mem/0: storing 5 in location 1019
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1025 is 1
@@ -462,7 +462,7 @@ run/0: product 0 is 6
 mem/0: storing 6 in location 1019
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1025 is 2
@@ -511,7 +511,7 @@ run/0: product 0 is 7
 mem/0: storing 7 in location 1019
 run/0: instruction interpolate/41
 run/0: ingredient 0 is -8
-run/0: pc now 33
+run/0: jumping to instruction 34
 run/0: instruction interpolate/34
 run/0: ingredient 0 is j
 mem/0: location 1025 is 3
@@ -532,7 +532,7 @@ run/0: product 0 is 5
 mem/0: storing 5 in location 1020
 run/0: instruction interpolate/44
 run/0: ingredient 0 is -27
-run/0: pc now 17
+run/0: jumping to instruction 18
 run/0: instruction interpolate/18
 mem/0: storing 0 in location 1016
 run/0: instruction interpolate/19
diff --git a/cpp/.traces/jump_backward b/cpp/.traces/jump_backward
index 09a861a9..02679f2e 100644
--- a/cpp/.traces/jump_backward
+++ b/cpp/.traces/jump_backward
@@ -10,10 +10,10 @@ after-brace/0: jump ...
 after-brace/0: jump ...
 run/0: instruction main/0
 run/0: ingredient 0 is 1
-run/0: pc now 1
+run/0: jumping to instruction 2
 run/0: instruction main/2
 run/0: ingredient 0 is -2
-run/0: pc now 0
+run/0: jumping to instruction 1
 run/0: instruction main/1
 run/0: ingredient 0 is 1
-run/0: pc now 2
+run/0: jumping to instruction 3
diff --git a/cpp/.traces/jump_can_skip_instructions b/cpp/.traces/jump_can_skip_instructions
index 3cffa226..6fa4d89f 100644
--- a/cpp/.traces/jump_can_skip_instructions
+++ b/cpp/.traces/jump_can_skip_instructions
@@ -8,4 +8,4 @@ after-brace/0: jump ...
 after-brace/0: copy ...
 run/0: instruction main/0
 run/0: ingredient 0 is 1
-run/0: pc now 1
+run/0: jumping to instruction 2
diff --git a/cpp/.traces/string-append-1 b/cpp/.traces/string-append-1
index cb775809..a9e62305 100644
--- a/cpp/.traces/string-append-1
+++ b/cpp/.traces/string-append-1
@@ -106,7 +106,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 1
@@ -155,7 +155,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 2
@@ -204,7 +204,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 3
@@ -253,7 +253,7 @@ run/0: product 0 is 4
 mem/0: storing 4 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 4
@@ -302,7 +302,7 @@ run/0: product 0 is 5
 mem/0: storing 5 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 5
@@ -351,7 +351,7 @@ run/0: product 0 is 6
 mem/0: storing 6 in location 1023
 run/0: instruction string-append/17
 run/0: ingredient 0 is -8
-run/0: pc now 9
+run/0: jumping to instruction 10
 run/0: instruction string-append/10
 run/0: ingredient 0 is i
 mem/0: location 1024 is 6
@@ -415,7 +415,7 @@ run/0: product 0 is 7
 mem/0: storing 7 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 1
@@ -464,7 +464,7 @@ run/0: product 0 is 8
 mem/0: storing 8 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 2
@@ -513,7 +513,7 @@ run/0: product 0 is 9
 mem/0: storing 9 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 3
@@ -562,7 +562,7 @@ run/0: product 0 is 10
 mem/0: storing 10 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 4
@@ -611,7 +611,7 @@ run/0: product 0 is 11
 mem/0: storing 11 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 5
@@ -660,7 +660,7 @@ run/0: product 0 is 12
 mem/0: storing 12 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 6
@@ -709,7 +709,7 @@ run/0: product 0 is 13
 mem/0: storing 13 in location 1023
 run/0: instruction string-append/28
 run/0: ingredient 0 is -8
-run/0: pc now 20
+run/0: jumping to instruction 21
 run/0: instruction string-append/21
 run/0: ingredient 0 is i
 mem/0: location 1024 is 7
diff --git a/cpp/.traces/string-equal-common-lengths-but-distinct b/cpp/.traces/string-equal-common-lengths-but-distinct
index 2a35f900..e6d5ecc9 100644
--- a/cpp/.traces/string-equal-common-lengths-but-distinct
+++ b/cpp/.traces/string-equal-common-lengths-but-distinct
@@ -117,7 +117,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1045
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1045 is 1
@@ -169,7 +169,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1045
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1045 is 2
diff --git a/cpp/.traces/string-equal-identical b/cpp/.traces/string-equal-identical
index c81ae818..1466e0d2 100644
--- a/cpp/.traces/string-equal-identical
+++ b/cpp/.traces/string-equal-identical
@@ -117,7 +117,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1045
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1045 is 1
@@ -169,7 +169,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1045
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1045 is 2
@@ -221,7 +221,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1045
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1045 is 3
diff --git a/cpp/.traces/string-equal-reflexive b/cpp/.traces/string-equal-reflexive
index 0a73b72f..b4334fef 100644
--- a/cpp/.traces/string-equal-reflexive
+++ b/cpp/.traces/string-equal-reflexive
@@ -109,7 +109,7 @@ run/0: product 0 is 1
 mem/0: storing 1 in location 1041
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1041 is 1
@@ -161,7 +161,7 @@ run/0: product 0 is 2
 mem/0: storing 2 in location 1041
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1041 is 2
@@ -213,7 +213,7 @@ run/0: product 0 is 3
 mem/0: storing 3 in location 1041
 run/0: instruction string-equal/24
 run/0: ingredient 0 is -11
-run/0: pc now 13
+run/0: jumping to instruction 14
 run/0: instruction string-equal/14
 run/0: ingredient 0 is i
 mem/0: location 1041 is 3
diff --git a/cpp/023jump b/cpp/023jump
index 3ed0901c..2835e040 100644
--- a/cpp/023jump
+++ b/cpp/023jump
@@ -8,7 +8,7 @@ Recipe_number["jump"] = JUMP;
 case JUMP: {
   trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].value;
   pc += instructions[pc].ingredients[0].value;
-  trace("run") << "pc now " << pc;
+  trace("run") << "jumping to instruction " << pc+1;
   break;
 }
 
-- 
cgit 1.4.1-2-gfad0