From 517ef9f64f32ea6592c7b802fd94391254daf86c Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Sun, 25 Oct 2020 15:23:49 -0700
Subject: 7099

---
 apps/tile/data.mu        | 5 ++---
 apps/tile/table.mu       | 2 +-
 apps/tile/value-stack.mu | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/tile/data.mu b/apps/tile/data.mu
index 3cd2337d..18b7e7ce 100644
--- a/apps/tile/data.mu
+++ b/apps/tile/data.mu
@@ -34,9 +34,8 @@ type word {
 }
 
 type value {
-  scalar-data: int
-  text-data: (handle array byte)
-  box-data: (handle line)
+  type: int
+  int-data: int  # if type = 0
 }
 
 type table {
diff --git a/apps/tile/table.mu b/apps/tile/table.mu
index 73c8fef5..e7dfac40 100644
--- a/apps/tile/table.mu
+++ b/apps/tile/table.mu
@@ -43,7 +43,7 @@ fn make-binding _self: (addr bind), key: (addr handle array byte), _val: int {
   var dest2/eax: (addr handle value) <- get self, value
   allocate dest2
   var dest3/eax: (addr value) <- lookup *dest2
-  var dest4/eax: (addr int) <- get dest3, scalar-data
+  var dest4/eax: (addr int) <- get dest3, int-data
   var val/ecx: int <- copy _val
   copy-to *dest4, val
 }
diff --git a/apps/tile/value-stack.mu b/apps/tile/value-stack.mu
index 8e921eca..ba1a824d 100644
--- a/apps/tile/value-stack.mu
+++ b/apps/tile/value-stack.mu
@@ -27,7 +27,7 @@ fn push-int-to-value-stack _self: (addr value-stack), _val: int {
   var top/edx: int <- copy *top-addr
   var dest-offset/edx: (offset value) <- compute-offset data, top
   var dest-addr/edx: (addr value) <- index data, dest-offset
-  var dest-addr2/eax: (addr int) <- get dest-addr, scalar-data
+  var dest-addr2/eax: (addr int) <- get dest-addr, int-data
   var val/esi: int <- copy _val
 #?   print-int32-hex-to-real-screen val
   copy-to *dest-addr2, val
@@ -62,7 +62,7 @@ $pop-int-from-value-stack:body: {
   var top/edx: int <- copy *top-addr
   var dest-offset/edx: (offset value) <- compute-offset data, top
   var result-addr/eax: (addr value) <- index data, dest-offset
-  var result-addr2/eax: (addr int) <- get result-addr, scalar-data
+  var result-addr2/eax: (addr int) <- get result-addr, int-data
   val <- copy *result-addr2
 }
 }
@@ -100,7 +100,7 @@ fn value-stack-max-width _self: (addr value-stack) -> result/eax: int {
     break-if->=
     var o/edx: (offset value) <- compute-offset data, i
     var g/edx: (addr value) <- index data, o
-    var g2/edx: (addr int) <- get g, scalar-data
+    var g2/edx: (addr int) <- get g, int-data
     var w/eax: int <- decimal-size *g2
     compare w, out
     {
-- 
cgit 1.4.1-2-gfad0