6083

19 files changed, 65 insertions, 65 deletions

diff --git a/067parse-hex.subx b/067parse-hex.subx
index 5c8d4334..0524609a 100644
--- a/067parse-hex.subx
+++ b/067parse-hex.subx
@@ -351,7 +351,7 @@ test-is-hex-int-handles-negative-0x-prefix:
     5d/pop-to-ebp
     c3/return
 
-parse-hex-int:  # in: (addr slice) -> result/eax: int
+parse-hex-int-from-slice:  # in: (addr slice) -> result/eax: int
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -370,39 +370,39 @@ parse-hex-int:  # in: (addr slice) -> result/eax: int
     8b/copy                         0/mod/indirect  1/rm32/ecx    .           .             .           1/r32/ecx   .               .                 # copy *ecx to ecx
     # var negate?/esi: boolean = false
     31/xor                          3/mod/direct    6/rm32/esi    .           .             .           6/r32/esi   .               .                 # clear esi
-$parse-hex-int:negative:
+$parse-hex-int-from-slice:negative:
     # if (*curr == '-') ++curr, negate = true
     31/xor                          3/mod/direct    0/rm32/eax    .           .             .           0/r32/eax   .               .                 # clear eax
     8a/copy-byte                    0/mod/indirect  1/rm32/ecx    .           .             .           0/r32/AL    .               .                 # copy byte at *ecx to AL
     3d/compare-eax-and  0x2d/imm32/-
-    75/jump-if-!=  $parse-hex-int:initial-0/disp8
+    75/jump-if-!=  $parse-hex-int-from-slice:initial-0/disp8
     # . ++curr
     41/increment-ecx
     # . negate = true
     be/copy-to-esi  1/imm32/true
-$parse-hex-int:initial-0:
+$parse-hex-int-from-slice:initial-0:
     # skip past leading '0x'
     # . if (*curr != '0') jump to loop
     8a/copy-byte                    0/mod/indirect  1/rm32/ecx    .           .             .           0/r32/AL    .               .                 # copy byte at *ecx to AL
     3d/compare-eax-and  0x30/imm32/0
-    75/jump-if-!=  $parse-hex-int:loop/disp8
+    75/jump-if-!=  $parse-hex-int-from-slice:loop/disp8
     # . ++curr
     41/increment-ecx
-$parse-hex-int:initial-0x:
+$parse-hex-int-from-slice:initial-0x:
     # . if (curr >= in->end) return result
     39/compare                      3/mod/direct    1/rm32/ecx    .           .             .           2/r32/edx   .               .                 # compare ecx with edx
-    73/jump-if-addr>=  $parse-hex-int:end/disp8
+    73/jump-if-addr>=  $parse-hex-int-from-slice:end/disp8
     # . if (*curr != 'x') jump to loop  # the previous '0' is still valid so doesn't need to be checked again
     31/xor                          3/mod/direct    0/rm32/eax    .           .             .           0/r32/eax   .               .                 # clear eax
     8a/copy-byte                    0/mod/indirect  1/rm32/ecx    .           .             .           0/r32/AL    .               .                 # copy byte at *ecx to AL
     3d/compare-eax-and  0x78/imm32/x
-    75/jump-if-!=  $parse-hex-int:loop/disp8
+    75/jump-if-!=  $parse-hex-int-from-slice:loop/disp8
     # . ++curr
     41/increment-ecx
-$parse-hex-int:loop:
+$parse-hex-int-from-slice:loop:
     # if (curr >= in->end) break
     39/compare                      3/mod/direct    1/rm32/ecx    .           .             .           2/r32/edx   .               .                 # compare ecx with edx
-    73/jump-if-addr>=  $parse-hex-int:negate/disp8
+    73/jump-if-addr>=  $parse-hex-int-from-slice:negate/disp8
     # var eax: int = from-hex-char(*curr)
     # . . copy arg to eax
     8a/copy-byte                    0/mod/indirect  1/rm32/ecx    .           .             .           0/r32/AL    .               .                 # copy byte at *ecx to AL
@@ -414,13 +414,13 @@ $parse-hex-int:loop:
     # ++curr
     41/increment-ecx
     # loop
-    eb/jump  $parse-hex-int:loop/disp8
-$parse-hex-int:negate:
+    eb/jump  $parse-hex-int-from-slice:loop/disp8
+$parse-hex-int-from-slice:negate:
     # if (negate?) result = -result
     81          7/subop/compare     3/mod/direct    6/rm32/esi    .           .             .           .           .               0/imm32/false     # compare esi
-    74/jump-if-=  $parse-hex-int:end/disp8
+    74/jump-if-=  $parse-hex-int-from-slice:end/disp8
     f7          3/subop/negate      3/mod/direct    3/rm32/ebx    .           .             .           .           .               .                 # negate ebx
-$parse-hex-int:end:
+$parse-hex-int-from-slice:end:
     # return result
     89/copy                         3/mod/direct    0/rm32/eax    .           .             .           3/r32/ebx   .               .                 # copy ebx to eax
     # . restore registers
@@ -433,7 +433,7 @@ $parse-hex-int:end:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-single-digit:
+test-parse-hex-int-from-slice-single-digit:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -446,16 +446,16 @@ test-parse-hex-int-single-digit:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, 0xa, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-single-digit"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-single-digit"/imm32
     68/push  0xa/imm32
     50/push-eax
     # . . call
@@ -467,7 +467,7 @@ test-parse-hex-int-single-digit:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-multi-digit:
+test-parse-hex-int-from-slice-multi-digit:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -480,16 +480,16 @@ test-parse-hex-int-multi-digit:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, 0x34a, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-multi-digit"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-multi-digit"/imm32
     68/push  0x34a/imm32
     50/push-eax
     # . . call
@@ -501,7 +501,7 @@ test-parse-hex-int-multi-digit:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-0x-prefix:
+test-parse-hex-int-from-slice-0x-prefix:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -514,16 +514,16 @@ test-parse-hex-int-0x-prefix:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, 0x34a, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-0x-prefix"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-0x-prefix"/imm32
     68/push  0x34/imm32
     50/push-eax
     # . . call
@@ -535,7 +535,7 @@ test-parse-hex-int-0x-prefix:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-zero:
+test-parse-hex-int-from-slice-zero:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -548,16 +548,16 @@ test-parse-hex-int-zero:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, 0x34a, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-zero"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-zero"/imm32
     68/push  0/imm32
     50/push-eax
     # . . call
@@ -569,7 +569,7 @@ test-parse-hex-int-zero:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-0-prefix:
+test-parse-hex-int-from-slice-0-prefix:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -582,16 +582,16 @@ test-parse-hex-int-0-prefix:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, 0x3, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-0-prefix"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-0-prefix"/imm32
     68/push  0x3/imm32
     50/push-eax
     # . . call
@@ -603,7 +603,7 @@ test-parse-hex-int-0-prefix:
     5d/pop-to-ebp
     c3/return
 
-test-parse-hex-int-negative:
+test-parse-hex-int-from-slice-negative:
     # . prologue
     55/push-ebp
     89/copy                         3/mod/direct    5/rm32/ebp    .           .             .           4/r32/esp   .               .                 # copy esp to ebp
@@ -616,16 +616,16 @@ test-parse-hex-int-negative:
     51/push-ecx
     50/push-eax
     89/copy                         3/mod/direct    1/rm32/ecx    .           .             .           4/r32/esp   .               .                 # copy esp to ecx
-    # eax = parse-hex-int(slice)
+    # eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # check-ints-equal(eax, -3, msg)
     # . . push args
-    68/push  "F - test-parse-hex-int-negative"/imm32
+    68/push  "F - test-parse-hex-int-from-slice-negative"/imm32
     68/push  -3/imm32
     50/push-eax
     # . . call
diff --git a/079emit.subx b/079emit.subx
index cf80f347..154b1bea 100644
--- a/079emit.subx
+++ b/079emit.subx
@@ -61,18 +61,18 @@ $emit:name:
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
     # . return
     eb/jump  $emit:end/disp8
-    # otherwise emit-hex(out, parse-hex-int(datum), width)
+    # otherwise emit-hex(out, parse-hex-int-from-slice(datum), width)
     #   (Weird shit can happen here if the datum of 'word' isn't either a valid
     #   name or a hex number. `emit` is mostly used by translate_subx, which
     #   is currently designed to only receive legal SubX programs. We just
     #   want to make sure that valid names aren't treated as (valid) hex
     #   numbers.)
 $emit:hex-int:
-    # . var value/eax: int = parse-hex-int(datum)
+    # . var value/eax: int = parse-hex-int-from-slice(datum)
     # . . push args
     57/push-edi
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # . emit-hex(out, value, width)
diff --git a/100array-equal.subx b/100array-equal.subx
index 8658c392..3447d2f5 100644
--- a/100array-equal.subx
+++ b/100array-equal.subx
@@ -247,7 +247,7 @@ parse-array-of-ints:  # ad: (addr allocation-descriptor), s: (addr string) -> re
     #     slice->start = skip-chars-matching-in-slice(slice->start, end, ' ')
     #     if (slice->start >= end) break
     #     slice->end = skip-chars-not-matching-in-slice(slice->start, end, ' ')
-    #     *out = parse-hex-int(slice)
+    #     *out = parse-hex-int-from-slice(slice)
     #     out += 4
     #     slice->start = slice->end
     #   return result
@@ -361,12 +361,12 @@ $parse-array-of-ints:loop2:
     81 0/subop/add %esp 0xc/imm32
     # . slice->end = eax
     89/<- *(ecx+4) 0/r32/eax
-    # *out = parse-hex-int(slice)
-    # . eax = parse-hex-int(slice)
+    # *out = parse-hex-int-from-slice(slice)
+    # . eax = parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call parse-hex-int/disp32
+    e8/call parse-hex-int-from-slice/disp32
     # . . discard args
     81 0/subop/add %esp 4/imm32
     # . *out = eax
diff --git a/apps/assort b/apps/assort
index 413fd903..ad67e870 100755
--- a/apps/assort
+++ b/apps/assort
Binary files differdiff --git a/apps/braces b/apps/braces
index 541ea51f..75b5bb60 100755
--- a/apps/braces
+++ b/apps/braces
Binary files differdiff --git a/apps/calls b/apps/calls
index 7f81b966..f3a19461 100755
--- a/apps/calls
+++ b/apps/calls
Binary files differdiff --git a/apps/crenshaw2-1 b/apps/crenshaw2-1
index 38762989..42014298 100755
--- a/apps/crenshaw2-1
+++ b/apps/crenshaw2-1
Binary files differdiff --git a/apps/crenshaw2-1b b/apps/crenshaw2-1b
index edd330ff..545f40dc 100755
--- a/apps/crenshaw2-1b
+++ b/apps/crenshaw2-1b
Binary files differdiff --git a/apps/dquotes b/apps/dquotes
index 8edb4c6d..c80d9a68 100755
--- a/apps/dquotes
+++ b/apps/dquotes
Binary files differdiff --git a/apps/factorial b/apps/factorial
index 5fd210cd..a20ad54b 100755
--- a/apps/factorial
+++ b/apps/factorial
Binary files differdiff --git a/apps/handle b/apps/handle
index 8ec603e8..90c03d05 100755
--- a/apps/handle
+++ b/apps/handle
Binary files differdiff --git a/apps/hex b/apps/hex
index 7fe1537d..53408364 100755
--- a/apps/hex
+++ b/apps/hex
Binary files differdiff --git a/apps/mu b/apps/mu
index bdc8bc4f..2683e057 100755
--- a/apps/mu
+++ b/apps/mu
Binary files differdiff --git a/apps/pack b/apps/pack
index 44f51c28..3aa8caa3 100755
--- a/apps/pack
+++ b/apps/pack
Binary files differdiff --git a/apps/pack.subx b/apps/pack.subx
index f9f81127..076c880c 100644
--- a/apps/pack.subx
+++ b/apps/pack.subx
@@ -2259,13 +2259,13 @@ emit-modrm:  # line: (addr stream byte), out: (addr buffered-file)
     #     if (slice-empty?(word-slice)) break
     #     if (slice-starts-with?(word-slice, "#")) break
     #     if (has-metadata?(word-slice, "mod"))
-    #       mod = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       mod = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-modrm? = true
     #     else if (has-metadata?(word-slice, "rm32"))
-    #       rm32 = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       rm32 = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-modrm? = true
     #     else if (has-metadata?(word-slice, "r32") or has-metadata?(word-slice, "subop"))
-    #       r32 = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       r32 = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-modrm? = true
     #   if has-modrm?
     #     var modrm = mod & 0b11
@@ -2426,7 +2426,7 @@ $emit-modrm:check-for-mod:
     3d/compare-eax-and  0/imm32/false
     74/jump-if-=  $emit-modrm:check-for-rm32/disp8
 $emit-modrm:mod:
-    # mod = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # mod = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2454,7 +2454,7 @@ $emit-modrm:check-for-rm32:
     3d/compare-eax-and  0/imm32/false
     74/jump-if-=  $emit-modrm:check-for-r32/disp8
 $emit-modrm:rm32:
-    # rm32 = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # rm32 = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2482,7 +2482,7 @@ $emit-modrm:check-for-r32:
     3d/compare-eax-and  0/imm32/false
     74/jump-if-=  $emit-modrm:check-for-subop/disp8
 $emit-modrm:r32:
-    # r32 = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # r32 = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2510,7 +2510,7 @@ $emit-modrm:check-for-subop:
     3d/compare-eax-and  0/imm32/false
     0f 84/jump-if-=  $emit-modrm:loop/disp32
 $emit-modrm:subop:
-    # r32 = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # r32 = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2575,13 +2575,13 @@ emit-sib:  # line: (addr stream byte), out: (addr buffered-file)
     #     if (slice-empty?(word-slice)) break
     #     if (slice-starts-with?(word-slice, "#")) break
     #     if (has-metadata?(word-slice, "base")
-    #       base = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       base = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-sib? = true
     #     else if (has-metadata?(word-slice, "index")
-    #       index = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       index = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-sib? = true
     #     else if (has-metadata?(word-slice, "scale")
-    #       scale = parse-hex-int(next-token-from-slice(word-slice, "/"))
+    #       scale = parse-hex-int-from-slice(next-token-from-slice(word-slice, "/"))
     #       has-sib? = true
     #   if has-sib?
     #     var sib = scale & 0b11
@@ -2735,7 +2735,7 @@ $emit-sib:check-for-scale:
     3d/compare-eax-and  0/imm32/false
     74/jump-if-=  $emit-sib:check-for-base/disp8
 $emit-sib:scale:
-    # scale = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # scale = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2763,7 +2763,7 @@ $emit-sib:check-for-base:
     3d/compare-eax-and  0/imm32/false
     74/jump-if-=  $emit-sib:check-for-index/disp8
 $emit-sib:base:
-    # base = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # base = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -2791,7 +2791,7 @@ $emit-sib:check-for-index:
     3d/compare-eax-and  0/imm32/false
     0f 84/jump-if-=  $emit-sib:loop/disp32
 $emit-sib:index:
-    # index = parse-hex-int(next-token-from-slice(word-slice->start, word-slice->end, '/'))
+    # index = parse-hex-int-from-slice(next-token-from-slice(word-slice->start, word-slice->end, '/'))
     # . eax = parse-datum-of-word(word-slice)
     # . . push args
     51/push-ecx
@@ -5836,7 +5836,7 @@ test-convert-instruction-handles-imm8-operand:
     5d/pop-to-ebp
     c3/return
 
-# shortcut for parse-hex-int(next-token-from-slice(word->start, word->end, '/'))
+# shortcut for parse-hex-int-from-slice(next-token-from-slice(word->start, word->end, '/'))
 parse-datum-of-word:  # word: (addr slice) -> value/eax: int
     # . prologue
     55/push-ebp
@@ -5860,11 +5860,11 @@ parse-datum-of-word:  # word: (addr slice) -> value/eax: int
     e8/call  next-token-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               0x10/imm32        # add to esp
-    # return parse-hex-int(slice)
+    # return parse-hex-int-from-slice(slice)
     # . . push args
     51/push-ecx
     # . . call
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
 $parse-datum-of-word:end:
diff --git a/apps/sigils b/apps/sigils
index 8160e494..808ddcb5 100755
--- a/apps/sigils
+++ b/apps/sigils
Binary files differdiff --git a/apps/survey b/apps/survey
index 21706977..0e38c0f8 100755
--- a/apps/survey
+++ b/apps/survey
Binary files differdiff --git a/apps/survey.subx b/apps/survey.subx
index 488b066f..06f6625d 100644
--- a/apps/survey.subx
+++ b/apps/survey.subx
@@ -654,7 +654,7 @@ compute-offsets:  # in: (addr stream byte), segments: (addr stream {string, segm
     #         if slice-empty?(segment-tmp)
     #           abort
     #         seg = get-or-insert(segments, curr-segment-name)
-    #         seg->starting-address = parse-hex-int(segment-tmp)
+    #         seg->starting-address = parse-hex-int-from-slice(segment-tmp)
     #         seg->file-offset = *file-offset
     #         trace("segment '", curr-segment-name, "' is at file offset ", seg->file-offset)
     #         segment-offset = 0
@@ -987,10 +987,10 @@ $compute-offsets:update-curr-segment-name:
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               0xc/imm32         # add to esp
     # . ebx = eax
     89/copy                         3/mod/direct    3/rm32/ebx    .           .             .           0/r32/eax   .               .                 # copy eax to ebx
-    # seg->address = parse-hex-int(segment-tmp)
-    # . eax = parse-hex-int(segment-tmp)
+    # seg->address = parse-hex-int-from-slice(segment-tmp)
+    # . eax = parse-hex-int-from-slice(segment-tmp)
     68/push  compute-offsets:segment-tmp/imm32
-    e8/call  parse-hex-int/disp32
+    e8/call  parse-hex-int-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # . seg->address = eax
diff --git a/apps/tests b/apps/tests
index 24e6b812..504595d7 100755
--- a/apps/tests
+++ b/apps/tests
Binary files differ