574 - printing string literals is a hack; hard-code it in for now

10 files changed, 60 insertions, 60 deletions

diff --git a/channel.mu b/channel.mu
index ea6c89a8..0dd71ccc 100644
--- a/channel.mu
+++ b/channel.mu
@@ -8,9 +8,9 @@
     (done?:boolean <- less-than n:integer 5:literal)
     (break-unless done?:boolean)
     ; other threads might get between these prints
-    (print-primitive nil:literal/terminal (("produce: " literal)))
+    (print-primitive-to-host (("produce: " literal)))
     (print-primitive nil:literal/terminal n:integer)
-    (print-primitive nil:literal/terminal (("\n" literal)))
+    (print-primitive-to-host (("\n" literal)))
     ; 'box' n into a dynamically typed 'tagged value' because that's what
     ; channels take
     (n2:integer <- copy n:integer)
@@ -31,9 +31,9 @@
     ; unbox the tagged value into an integer
     (n2:integer <- maybe-coerce x:tagged-value integer:literal)
     ; other threads might get between these prints
-    (print-primitive nil:literal/terminal (("consume: " literal)))
+    (print-primitive-to-host (("consume: " literal)))
     (print-primitive nil:literal/terminal n2:integer)
-    (print-primitive nil:literal/terminal (("\n" literal)))
+    (print-primitive-to-host (("\n" literal)))
     (loop)
   }
 ])
diff --git a/chessboard-cursor.mu b/chessboard-cursor.mu
index ddd874ec..53fa3268 100644
--- a/chessboard-cursor.mu
+++ b/chessboard-cursor.mu
@@ -58,7 +58,7 @@
     ; print rank number as a legend
     (rank:integer <- add row:integer 1:literal)
     (print-primitive screen:terminal-address rank:integer)
-    (print-primitive screen:terminal-address ((" | " literal)))
+    (print-primitive-to-host ((" | " literal)))
     ; print each square in the row
     (col:integer <- copy 0:literal)
     { begin
@@ -67,7 +67,7 @@
       (f:file-address <- index b:board-address/deref col:integer)
       (s:square <- index f:file-address/deref row:integer)
       (print-primitive screen:terminal-address s:square)
-      (print-primitive screen:terminal-address ((" " literal)))
+      (print-primitive-to-host ((" " literal)))
       (col:integer <- add col:integer 1:literal)
       (loop)
     }
@@ -76,9 +76,9 @@
     (loop)
   }
   ; print file letters as legend
-  (print-primitive screen:terminal-address (("  +----------------" literal)))
+  (print-primitive-to-host (("  +----------------" literal)))
   (cursor-to-next-line screen:terminal-address)
-  (print-primitive screen:terminal-address (("    a b c d e f g h" literal)))
+  (print-primitive-to-host (("    a b c d e f g h" literal)))
   (cursor-to-next-line screen:terminal-address)
 ])
 
@@ -227,16 +227,16 @@
     ; print any stray characters from keyboard *before* clearing screen
     (flush-stdout)
     (clear-screen nil:literal/terminal)
-    (print-primitive nil:literal/terminal (("Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves." literal)))
+    (print-primitive-to-host (("Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves." literal)))
     (cursor-to-next-line nil:literal/terminal)
     (cursor-to-next-line nil:literal/terminal)
     (print-board nil:literal/terminal b:board-address)
     (cursor-to-next-line nil:literal/terminal)
-    (print-primitive nil:literal/terminal (("Type in your move as <from square>-<to square>. For example: 'a2-a4'. Currently very unforgiving of typos; exactly five letters, no <Enter>, no uppercase." literal)))
+    (print-primitive-to-host (("Type in your move as <from square>-<to square>. For example: 'a2-a4'. Currently very unforgiving of typos; exactly five letters, no <Enter>, no uppercase." literal)))
     (cursor-to-next-line nil:literal/terminal)
-    (print-primitive nil:literal/terminal (("Hit 'q' to exit." literal)))
+    (print-primitive-to-host (("Hit 'q' to exit." literal)))
     (cursor-to-next-line nil:literal/terminal)
-    (print-primitive nil:literal/terminal (("move: " literal)))
+    (print-primitive-to-host (("move: " literal)))
     (m:move-address <- read-move)
     (break-unless m:move-address)
     (b:board-address <- make-move b:board-address m:move-address)
diff --git a/chessboard-retro.mu b/chessboard-retro.mu
index 9a04c1b8..9b3eab5c 100644
--- a/chessboard-retro.mu
+++ b/chessboard-retro.mu
@@ -18,7 +18,7 @@
                                               N:literal P:literal _:literal _:literal _:literal _:literal p:literal n:literal
                                               R:literal P:literal _:literal _:literal _:literal _:literal p:literal r:literal)
   ; assert(length(initial-position) == 64)
-;?   (print-primitive nil:literal/terminal (("list-length\n" literal)))
+;?   (print-primitive-to-host (("list-length\n" literal)))
   (len:integer <- list-length initial-position:list-address)
   (correct-length?:boolean <- equal len:integer 64:literal)
   (assert correct-length?:boolean "chessboard had incorrect size")
@@ -29,7 +29,7 @@
     (done?:boolean <- equal col:integer 8:literal)
     (break-if done?:boolean)
 ;?     (print-primitive nil:literal/terminal col:integer)
-;?     (print-primitive nil:literal/terminal (("\n" literal)))
+;?     (print-primitive-to-host (("\n" literal)))
     (file:file-address-address <- index-address b:board-address/deref col:integer)
     (file:file-address-address/deref curr:list-address <- read-file curr:list-address)
     (col:integer <- add col:integer 1:literal)
@@ -46,9 +46,9 @@
   { begin
     (done?:boolean <- equal row:integer 8:literal)
     (break-if done?:boolean)
-;?     (print-primitive (("  " literal)))
+;?     (print-primitive-to-host (("  " literal)))
 ;?     (print-primitive row:integer)
-;?     (print-primitive (("\n" literal)))
+;?     (print-primitive-to-host (("\n" literal)))
     (src:tagged-value-address <- list-value-address cursor:list-address)
     (dest:square-address <- index-address result:file-address/deref row:integer)
     (dest:square-address/deref <- get src:tagged-value-address/deref payload:offset)  ; unsafe typecast
@@ -75,18 +75,18 @@
       (f:file-address <- index b:board-address/deref col:integer)
       (s:square <- index f:file-address/deref row:integer)
       (print-primitive nil:literal/terminal s:square)
-      (print-primitive nil:literal/terminal ((" " literal)))
+      (print-primitive-to-host ((" " literal)))
       (col:integer <- add col:integer 1:literal)
       (loop)
     }
-    (print-primitive nil:literal/terminal (("\n" literal)))
+    (print-primitive-to-host (("\n" literal)))
     (row:integer <- subtract row:integer 1:literal)
     (loop)
   }
 ])
 
 (function main [
-;?   (print-primitive (("\u2654 \u265a" literal)))
+;?   (print-primitive-to-host (("\u2654 \u265a" literal)))
   (default-space:space-address <- new space:literal 30:literal)
   (b:board-address <- read-board)
   (print-board b:board-address)
diff --git a/counters.mu b/counters.mu
index 90805639..243d22d5 100644
--- a/counters.mu
+++ b/counters.mu
@@ -23,11 +23,11 @@
   (bres:integer <- increment-counter b:space-address 2:literal)
   (ares:integer <- increment-counter a:space-address 1:literal)
   ; check results
-  (print-primitive nil:literal/terminal (("Contents of counters a: " literal)))
+  (print-primitive-to-host (("Contents of counters a: " literal)))
   (print-primitive nil:literal/terminal ares:integer)
-  (print-primitive nil:literal/terminal ((" b: " literal)))
+  (print-primitive-to-host ((" b: " literal)))
   (print-primitive nil:literal/terminal bres:integer)
-  (print-primitive nil:literal/terminal (("\n" literal)))
+  (print-primitive-to-host (("\n" literal)))
  ])
 
 ; compare http://www.paulgraham.com/accgen.html
diff --git a/factorial.mu b/factorial.mu
index 3d7d0079..703ee6a9 100644
--- a/factorial.mu
+++ b/factorial.mu
@@ -16,7 +16,7 @@
 
 (function main [
   (1:integer <- factorial 5:literal)
-  (print-primitive nil:literal/terminal (("result: " literal)))
+  (print-primitive-to-host (("result: " literal)))
   (print-primitive nil:literal/terminal 1:integer)
-  (print-primitive nil:literal/terminal (("\n" literal)))
+  (print-primitive-to-host (("\n" literal)))
 ])
diff --git a/generic.mu b/generic.mu
index 6bcfd1e2..b11fa677 100644
--- a/generic.mu
+++ b/generic.mu
@@ -24,7 +24,7 @@
 
 (function main [
   (1:integer <- factorial 5:literal)
-  (print-primitive nil:literal/terminal (("result: " literal)))
+  (print-primitive-to-host (("result: " literal)))
   (print-primitive nil:literal/terminal 1:integer)
-  (print-primitive nil:literal/terminal (("\n" literal)))
+  (print-primitive-to-host (("\n" literal)))
 ])
diff --git a/graphics.mu b/graphics.mu
index 878df66c..22d3a5c5 100644
--- a/graphics.mu
+++ b/graphics.mu
@@ -8,9 +8,9 @@
     (x:integer <- get pos:integer-integer-pair 0:offset)
     (y:integer <- get pos:integer-integer-pair 1:offset)
     (print-primitive nil:literal/terminal x:integer)
-    (print-primitive nil:literal/terminal ((", " literal)))
+    (print-primitive-to-host ((", " literal)))
     (print-primitive nil:literal/terminal y:integer)
-    (print-primitive nil:literal/terminal (("\n" literal)))
+    (print-primitive-to-host (("\n" literal)))
     (loop)
   }
   (window-off)
diff --git a/mu.arc b/mu.arc
index 09d9ad9a..b3fcccc6 100644
--- a/mu.arc
+++ b/mu.arc
@@ -1524,7 +1524,7 @@
 ;?     (reply 0:literal)
 ;?   }
 ;?   ; else return 1+length(curr.cdr)
-;?   (print-primitive nil:literal/terminal (("recurse\n" literal)))
+;?   (print-primitive-to-host nil:literal/terminal (("recurse\n" literal)))
 ;?   (next:list-address <- list-next curr:list-address)
 ;?   (sub:integer <- list-length next:list-address)
 ;?   (result:integer <- add sub:integer 1:literal)
@@ -1539,7 +1539,7 @@
     ; ++result
     (result:integer <- add result:integer 1:literal)
 ;?     (print-primitive nil:literal/terminal result:integer)
-;?     (print-primitive nil:literal/terminal (("\n" literal)))
+;?     (print-primitive-to-host nil:literal/terminal (("\n" literal)))
     ; curr = curr.cdr
     (curr:list-address <- list-next curr:list-address)
     (loop)
@@ -1707,19 +1707,19 @@
     ; while arg received
     (a:string-address arg-received?:boolean <- next-input)
     (break-unless arg-received?:boolean)
-;?     (print-primitive nil:literal/terminal ("arg now: " literal))
+;?     (print-primitive-to-host nil:literal/terminal ("arg now: " literal))
 ;?     (print-primitive nil:literal/terminal a:string-address)
-;?     (print-primitive nil:literal/terminal "@":literal)
+;?     (print-primitive-to-host nil:literal/terminal "@":literal)
 ;?     (print-primitive nil:literal/terminal a:string-address/deref)  ; todo: test (m on scoped array)
-;?     (print-primitive nil:literal/terminal "\n":literal)
+;?     (print-primitive-to-host nil:literal/terminal "\n":literal)
 ;? ;?     (assert nil:literal)
     ; result-len = result-len + arg.length - 1 (for the 'underscore' being replaced)
     (a-len:integer <- length a:string-address/deref)
     (result-len:integer <- add result-len:integer a-len:integer)
     (result-len:integer <- subtract result-len:integer 1:literal)
-;?     (print-primitive nil:literal/terminal ("result-len now: " literal))
+;?     (print-primitive-to-host nil:literal/terminal ("result-len now: " literal))
 ;?     (print-primitive nil:literal/terminal result-len:integer)
-;?     (print-primitive nil:literal/terminal "\n":literal)
+;?     (print-primitive-to-host nil:literal/terminal "\n":literal)
     (loop)
   }
   ; rewind to start of non-template args
@@ -1751,9 +1751,9 @@
       (result-idx:integer <- add result-idx:integer 1:literal)
       (loop)
     }
-;?     (print-primitive nil:literal/terminal ("i now: " literal))
+;?     (print-primitive-to-host nil:literal/terminal ("i now: " literal))
 ;?     (print-primitive nil:literal/terminal i:integer)
-;?     (print-primitive nil:literal/terminal "\n":literal)
+;?     (print-primitive-to-host nil:literal/terminal "\n":literal)
     ; copy 'a' into result
     (j:integer <- copy 0:literal)
     { begin
@@ -1762,11 +1762,11 @@
       (break-unless arg-done?:boolean)
       ; result[result-idx] = a[j]
       (in:byte <- index a:string-address/deref j:integer)
-;?       (print-primitive nil:literal/terminal ("copying: " literal))
+;?       (print-primitive-to-host nil:literal/terminal ("copying: " literal))
 ;?       (print-primitive nil:literal/terminal in:byte)
-;?       (print-primitive nil:literal/terminal (" at: " literal))
+;?       (print-primitive-to-host nil:literal/terminal (" at: " literal))
 ;?       (print-primitive nil:literal/terminal result-idx:integer)
-;?       (print-primitive nil:literal/terminal "\n":literal)
+;?       (print-primitive-to-host nil:literal/terminal "\n":literal)
       (out:byte-address <- index-address result:string-address/deref result-idx:integer)
       (out:byte-address/deref <- copy in:byte)
       ; ++j
@@ -1777,9 +1777,9 @@
     }
     ; skip '_' in template
     (i:integer <- add i:integer 1:literal)
-;?     (print-primitive nil:literal/terminal ("i now: " literal))
+;?     (print-primitive-to-host nil:literal/terminal ("i now: " literal))
 ;?     (print-primitive nil:literal/terminal i:integer)
-;?     (print-primitive nil:literal/terminal "\n":literal)
+;?     (print-primitive-to-host nil:literal/terminal "\n":literal)
     (loop)  ; interpolate next arg
   }
   ; done with holes; copy rest of template directly into result
@@ -1789,11 +1789,11 @@
     (break-unless tem-done?:boolean)
     ; result[result-idx] = template[i]
     (in:byte <- index template:string-address/deref i:integer)
-;?     (print-primitive nil:literal/terminal ("copying: " literal))
+;?     (print-primitive-to-host nil:literal/terminal ("copying: " literal))
 ;?     (print-primitive nil:literal/terminal in:byte)
-;?     (print-primitive nil:literal/terminal (" at: " literal))
+;?     (print-primitive-to-host nil:literal/terminal (" at: " literal))
 ;?     (print-primitive nil:literal/terminal result-idx:integer)
-;?     (print-primitive nil:literal/terminal "\n":literal)
+;?     (print-primitive-to-host nil:literal/terminal "\n":literal)
     (out:byte-address <- index-address result:string-address/deref result-idx:integer)
     (out:byte-address/deref <- copy in:byte)
     ; ++i
@@ -1844,9 +1844,9 @@
     (loop)
   }
   ; allocate space
-;?   (print-primitive nil:literal/terminal (("alloc: " literal)))
+;?   (print-primitive-to-host nil:literal/terminal (("alloc: " literal)))
 ;?   (print-primitive nil:literal/terminal count:integer)
-;?   (print-primitive nil:literal/terminal (("\n" literal)))
+;?   (print-primitive-to-host nil:literal/terminal (("\n" literal)))
   (result:string-address-array-address <- new string-address-array:literal count:integer)
   ; repeatedly copy slices (start..end) until delimiter into result[curr-result]
   (curr-result:integer <- copy 0:literal)
@@ -1856,13 +1856,13 @@
     (done?:boolean <- greater-or-equal start:integer len:integer)
     (break-if done?:boolean)
     (end:integer <- find-next s:string-address delim:character start:integer)
-;?     (print-primitive nil:literal/terminal (("i: " literal)))
+;?     (print-primitive-to-host nil:literal/terminal (("i: " literal)))
 ;?     (print-primitive nil:literal/terminal start:integer)
-;?     (print-primitive nil:literal/terminal (("-" literal)))
+;?     (print-primitive-to-host nil:literal/terminal (("-" literal)))
 ;?     (print-primitive nil:literal/terminal end:integer)
-;?     (print-primitive nil:literal/terminal ((" => " literal)))
+;?     (print-primitive-to-host nil:literal/terminal ((" => " literal)))
 ;?     (print-primitive nil:literal/terminal curr-result:integer)
-;?     (print-primitive nil:literal/terminal (("\n" literal)))
+;?     (print-primitive-to-host nil:literal/terminal (("\n" literal)))
     ; compute length of slice
     (slice-len:integer <- subtract end:integer start:integer)
     ; allocate result[curr-result]
@@ -1938,11 +1938,11 @@
 (init-fn print-primitive
   (default-space:space-address <- new space:literal 30:literal)
   (x:terminal-address <- next-input)
+  (c:location <- next-input)
   { begin
     (break-unless x:terminal-address)
     (reply)
   }
-  (c:location <- next-input)
   (print-primitive-to-host c:location)
 )
 
diff --git a/stdin.mu b/stdin.mu
index d45f91ef..fc132092 100644
--- a/stdin.mu
+++ b/stdin.mu
@@ -4,19 +4,19 @@
   (clear-screen)
   ; hook up stdin
   (stdin:channel-address <- init-channel 1:literal)
-;?   (print-primitive nil:literal/terminal (("main: stdin is " literal)))
+;?   (print-primitive-to-host (("main: stdin is " literal)))
 ;?   (print-primitive nil:literal/terminal stdin:channel-address)
-;?   (print-primitive nil:literal/terminal (("\n" literal)))
+;?   (print-primitive-to-host (("\n" literal)))
   (fork-helper send-keys-to-stdin:fn nil:literal/globals nil:literal/limit stdin:channel-address)
   ; now read characters from stdin until a 'q' is typed
-  (print-primitive nil:literal/terminal (("? " literal)))
+  (print-primitive-to-host (("? " literal)))
   { begin
     (x:tagged-value stdin:channel-address/deref <- read stdin:channel-address)
     (c:character <- maybe-coerce x:tagged-value character:literal)
-;?     (print-primitive nil:literal/terminal (("main: stdin is " literal)))
+;?     (print-primitive-to-host (("main: stdin is " literal)))
 ;?     (print-primitive nil:literal/terminal stdin:channel-address)
-;?     (print-primitive nil:literal/terminal (("\n" literal)))
-;?     (print-primitive nil:literal/terminal (("check: " literal)))
+;?     (print-primitive-to-host (("\n" literal)))
+;?     (print-primitive-to-host (("check: " literal)))
 ;?     (print-primitive nil:literal/terminal c:character)
     (done?:boolean <- equal c:character ((#\q literal)))
     (break-if done?:boolean)
diff --git a/tangle.mu b/tangle.mu
index 1004ef15..24940986 100644
--- a/tangle.mu
+++ b/tangle.mu
@@ -29,7 +29,7 @@
 
 (function main [
   (1:integer <- factorial 5:literal)
-  (print-primitive nil:literal/terminal (("result: " literal)))
+  (print-primitive-to-host (("result: " literal)))
   (print-primitive nil:literal/terminal 1:integer)
-  (print-primitive nil:literal/terminal (("\n" literal)))
+  (print-primitive-to-host (("\n" literal)))
 ])