From 886097ad8c8df08160f130be937b5493185f9c38 Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Fri, 24 May 2019 21:01:17 -0700
Subject: .

---
 subx/apps/assort.subx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'subx/apps/assort.subx')

diff --git a/subx/apps/assort.subx b/subx/apps/assort.subx
index 988f9c1a..8007a274 100644
--- a/subx/apps/assort.subx
+++ b/subx/apps/assort.subx
@@ -86,8 +86,7 @@ $main:end:
     cd/syscall  0x80/imm8
 
 # data structure:
-#   row: pair of (address array byte) and (address stream byte)
-#   table: (address stream row)
+#   table: (address stream {string, (address stream byte)})     (8 bytes per row)
 
 convert:  # in : (address buffered-file), out : (address buffered-file) -> <void>
     # pseudocode:
@@ -439,7 +438,7 @@ test-convert:
     5d/pop-to-EBP
     c3/return
 
-read-segments:  # in : (address buffered-file), table : (address stream row)
+read-segments:  # in : (address buffered-file), table : (address stream {string, (address stream byte)})
     # pseudocode:
     #   var curr-segment = null
     #   var line = new-stream(512, 1)
@@ -724,7 +723,7 @@ $read-segments:end:
     5d/pop-to-EBP
     c3/return
 
-write-segments:  # out : (address buffered-file), table : (address stream row)
+write-segments:  # out : (address buffered-file), table : (address stream {string, (address stream byte)})
     # pseudocode:
     #   var curr = table->data
     #   var max = table->data + table->write
@@ -788,7 +787,7 @@ $write-segments:end:
 ## helpers
 
 # TODO: pass in an allocation descriptor
-get-or-insert-segment:  # table : (address stream row), s : (address slice), n : int -> EAX : (address stream)
+get-or-insert-segment:  # table : (address stream {string, (address stream byte)}), s : (address slice), n : int -> EAX : (address stream)
     # pseudocode:
     #   curr = table->data
     #   max = &table->data[table->write]
@@ -950,7 +949,7 @@ $test-get-or-insert-segment:check1:
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
 $test-get-or-insert-segment:check2:
-    # check-ints-equal(table->write, rowsize = 8, msg)
+    # check-ints-equal(table->write, row-size = 8, msg)
     # . . push args
     68/push  "F - test-get-or-insert-segment/2"/imm32
     68/push  8/imm32/row-size
@@ -1011,7 +1010,7 @@ $test-get-or-insert-segment:second-call:
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
     # no change to table size
-    # . check-ints-equal(table->write, rowsize = 8, msg)
+    # . check-ints-equal(table->write, row-size = 8, msg)
     # . . push args
     68/push  "F - test-get-or-insert-segment/6"/imm32
     68/push  8/imm32/row-size
-- 
cgit 1.4.1-2-gfad0