From 8152b0d109a3ee01b7a357926aa01b1a8de3f366 Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Tue, 22 Sep 2020 00:27:56 -0700
Subject: 6832 - tile: right-justify numbers

Fails noisily for negative integers so far.
---
 apps/tile/environment.mu | 10 ++++++----
 apps/tile/int-stack.mu   | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'apps')

diff --git a/apps/tile/environment.mu b/apps/tile/environment.mu
index 14a8490b..8b7cfc1e 100644
--- a/apps/tile/environment.mu
+++ b/apps/tile/environment.mu
@@ -203,7 +203,7 @@ fn render-column screen: (addr screen), first-word: (addr word), final-word: (ad
     break-if-=
     # indent stack
     var indented-col/ebx: int <- copy left-col
-    indented-col <- add 1
+    indented-col <- add 1  # margin-right - 2 for padding spaces
     # compute stack
     var stack: int-stack
     var stack-addr/edi: (addr int-stack) <- address stack
@@ -211,6 +211,8 @@ fn render-column screen: (addr screen), first-word: (addr word), final-word: (ad
     evaluate first-word, final-word, stack-addr
     # render stack
     var curr-row/edx: int <- copy 6  # input-row 3 + stack-margin-top 3
+    var _max-val/eax: int <- max-stack-value stack-addr
+    var max-val/esi: int <- copy _max-val
     var i/eax: int <- int-stack-length stack-addr
     {
       compare i, 0
@@ -218,7 +220,7 @@ fn render-column screen: (addr screen), first-word: (addr word), final-word: (ad
       move-cursor screen, curr-row, indented-col
       {
         var val/eax: int <- pop-int-stack stack-addr
-        render-integer screen, val
+        render-integer screen, val, max-val
         var size/eax: int <- decimal-size val
         compare size, max-width
         break-if-<=
@@ -259,7 +261,7 @@ fn render-column screen: (addr screen), first-word: (addr word), final-word: (ad
 }
 
 # synaesthesia
-fn render-integer screen: (addr screen), val: int {
+fn render-integer screen: (addr screen), val: int, max-val: int {
   var bg/eax: int <- hash-color val
   var fg/ecx: int <- copy 7
   {
@@ -279,7 +281,7 @@ fn render-integer screen: (addr screen), val: int {
   }
   start-color screen, fg, bg
   print-grapheme screen, 0x20  # space
-  print-int32-decimal screen, val
+  print-int32-decimal-right-justified screen, val, max-val
   print-grapheme screen, 0x20  # space
 }
 
diff --git a/apps/tile/int-stack.mu b/apps/tile/int-stack.mu
index 3bb9336f..74aa16fd 100644
--- a/apps/tile/int-stack.mu
+++ b/apps/tile/int-stack.mu
@@ -67,3 +67,25 @@ fn int-stack-length _self: (addr int-stack) -> result/eax: int {
   var top-addr/eax: (addr int) <- get self, top
   result <- copy *top-addr
 }
+
+fn max-stack-value _self: (addr int-stack) -> result/eax: int {
+  var self/esi: (addr int-stack) <- copy _self
+  var data-ah/edi: (addr handle array int) <- get self, data
+  var _data/eax: (addr array int) <- lookup *data-ah
+  var data/edi: (addr array int) <- copy _data
+  var top-addr/ecx: (addr int) <- get self, top
+  var i/ebx: int <- copy 0
+  result <- copy 0
+  {
+    compare i, *top-addr
+    break-if->=
+    var g/edx: (addr int) <- index data, i
+    compare *g, result
+    {
+      break-if-<=
+      result <- copy *g
+    }
+    i <- increment
+    loop
+  }
+}
-- 
cgit 1.4.1-2-gfad0