okay s" ." and ' do their things now

Force-Push: yes
Change-Id: I556334ea34157992d2b21306c941ad432cf41b4c

1 files changed, 73 insertions, 1 deletions

diff --git a/transform.e b/transform.e
index 7b82eae..d148e58 100644
--- a/transform.e
+++ b/transform.e
@@ -1947,7 +1947,7 @@ allocate-transform-state s" transform-state" variable
     ~ net out to zero; we aren't doing it just for kicks.
     -1 transform-apply-stack-delta
 
-    log-load-unroll-log-address ;
+    log-load-unroll-log-address
   } if
   ; make-immediate
 
@@ -1970,6 +1970,76 @@ allocate-transform-state s" transform-state" variable
   ; make-immediate
 
 
+~   No matter what mode we're in, we read a name at transform time. Then we
+~ look up the name at either log-load time or runtime, depending.
+: log-load-tick-alternate
+  ~ Read the name.
+  word value@
+
+  ~ Get the name onto the stack at log-load time.
+  swap-transform-variables
+  L@' litstring
+  swap-transform-variables
+
+  offset-to-target-address-space ,     ~ litstring
+  here @ swap packstring 8 packalign here !
+
+  ~ Apply a delta for the string pointer.
+  1 transform-apply-stack-delta
+
+  dropstring
+
+  ~ Now break out the remaining behavior based on mode.
+  interpreter-flags @ 0x01 & {
+    log-load-roll-log-address
+
+    swap-transform-variables
+    L@' log-load-comma
+    L@' log-load-find-execution-token
+    L@' litstring
+    L@' log-load-comma-string
+    L@' swap
+    L@' log-load-comma
+    L@' log-load-find-execution-token
+    L@' litstring
+    swap-transform-variables
+
+    ~ The overall stack delta of this sequence is 0.
+    offset-to-target-address-space ,     ~ litstring
+    here @ s" litstring" packstring 8 packalign here !
+    offset-to-target-address-space ,     ~ log-load-find-execution-token
+    offset-to-target-address-space ,     ~ log-load-comma
+    offset-to-target-address-space ,     ~ swap
+    offset-to-target-address-space ,     ~ log-load-comma-string
+
+    offset-to-target-address-space ,     ~ litstring
+    here @ s" find" packstring 8 packalign here !
+    offset-to-target-address-space ,     ~ log-load-find-execution-token
+    offset-to-target-address-space ,     ~ log-load-comma
+
+    ~   We consumed the string pointer at log-load time, so we apply a delta
+    ~ for it. As in log-load-string-alternate, this needs to be split into
+    ~ two parts like this.
+    -1 transform-apply-stack-delta
+
+    log-load-unroll-log-address
+  } {
+    log-load-roll-log-address
+
+    swap-transform-variables
+    L@' log-find
+    swap-transform-variables
+
+    offset-to-target-address-space ,     ~ log-load-comma
+
+    ~   We leave an execution token on the log-load-time stack, so no delta
+    ~ needed.
+
+    log-load-unroll-log-address
+  } if-else
+  ; make-immediate
+
+
 ~   Because docol requires it, we provide a special mini-version of the label
 ~ system. We only do L@' and L!', because that's all we need. Unlike the
 ~ version of this feature for the label transform, for the log-load transform,
@@ -2199,6 +2269,8 @@ allocate-transform-state s" transform-state" variable
     swap drop ' log-load-string-alternate swap } if
   dup ' ." entry-to-name stringcmp 0 = {
     swap drop ' log-load-dot-string-alternate swap } if
+  dup ' ' entry-to-name stringcmp 0 = {
+    swap drop ' log-load-tick-alternate swap } if
   dup s" L@'" stringcmp 0 = { swap drop ' log-load-L@'-alternate swap } if
   dup s" L!'" stringcmp 0 = { swap drop ' log-load-L!'-alternate swap } if
   dup s" {" stringcmp 0 = {