5790

Standardize conventions for labels within objects in the data segment.

We're going to use this in a new tool.

1 files changed, 23 insertions, 23 deletions

diff --git a/apps/mu.subx b/apps/mu.subx
index 6e092331..50139ab9 100644
--- a/apps/mu.subx
+++ b/apps/mu.subx
@@ -382,9 +382,9 @@ test-convert-empty-input:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (convert-mu _test-input-buffered-file _test-output-buffered-file)
     (flush _test-output-buffered-file)
@@ -412,9 +412,9 @@ test-convert-function-skeleton:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo {\n")
     (write _test-input-stream "}\n")
@@ -469,9 +469,9 @@ test-convert-multiple-function-skeletons:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo {\n")
     (write _test-input-stream "}\n")
@@ -527,9 +527,9 @@ test-convert-function-with-arg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo n : int {\n")
     (write _test-input-stream "}\n")
@@ -578,9 +578,9 @@ test-convert-function-with-arg-and-body:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo n : int {\n")
     (write _test-input-stream "  increment n\n")
@@ -3148,7 +3148,7 @@ test-emit-subx-statement-primitive:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var
     68/push 0/imm32/no-register
     68/push -8/imm32/stack-offset
@@ -3221,7 +3221,7 @@ test-emit-subx-statement-primitive-register:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3308,7 +3308,7 @@ test-emit-subx-statement-select-primitive:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3405,7 +3405,7 @@ test-emit-subx-statement-select-primitive-2:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3496,7 +3496,7 @@ test-increment-register:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3556,7 +3556,7 @@ test-increment-var:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3606,7 +3606,7 @@ test-add-reg-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3662,7 +3662,7 @@ test-add-reg-to-mem:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var
     68/push 0/imm32/no-register
     68/push 8/imm32/stack-offset
@@ -3718,7 +3718,7 @@ test-add-mem-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3774,7 +3774,7 @@ test-add-literal-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3830,7 +3830,7 @@ test-add-literal-to-mem:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var
     68/push 0/imm32/no-register
     68/push 8/imm32/stack-offset
@@ -3901,7 +3901,7 @@ test-emit-subx-statement-function-call:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var
     68/push 0/imm32/no-register
     68/push -8/imm32/stack-offset
@@ -3960,7 +3960,7 @@ test-emit-subx-statement-function-call-with-literal-arg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : literal
     68/push 0/imm32/no-register
     68/push 0/imm32/no-stack-offset