From 59122b1c2b9128626181b67f5dcc47867892b897 Mon Sep 17 00:00:00 2001
From: Jared Tobin <jared@tlon.io>
Date: Tue, 19 Nov 2019 11:07:26 +0800
Subject: [PATCH] Revert "hoon: refactor royl float parsers to separate arms"

This reverts commit ff06e45875972b67c153b3b728fef2f9ab41f94f, which
should have been replaced with an updated commit.
---
 bin/solid.pill         |  4 +--
 pkg/arvo/sys/hoon.hoon | 73 ++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/bin/solid.pill b/bin/solid.pill
index c08e856185..df0ec5b1cb 100644
--- a/bin/solid.pill
+++ b/bin/solid.pill
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e25b645795e0a1b393c76e6ea4f27d1a431233c010182454e1fd025b602146b
-size 8951796
+oid sha256:8d5434f92c35d11e4a8cb9f63d02c26cf4ac20fd0b454997a90f396c45f8639c
+size 8957682
diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon
index b2904df438..d9e44e5049 100644
--- a/pkg/arvo/sys/hoon.hoon
+++ b/pkg/arvo/sys/hoon.hoon
@@ -6124,52 +6124,47 @@
     ==
   ++  royl
     ~+
-    ;~  pose
-      (stag %rh royl-rh)
-      (stag %rq royl-rq)
-      (stag %rd royl-rd)
-      (stag %rs royl-rs)
-    ==
-  ::
-  ++  royl-rh  (cook rylh ;~(pfix ;~(plug sig sig) (cook royl-cell royl-rn)))
-  ++  royl-rq  (cook rylq ;~(pfix ;~(plug sig sig sig) (cook royl-cell royl-rn)))
-  ++  royl-rd  (cook ryld ;~(pfix sig (cook royl-cell royl-rn)))
-  ++  royl-rs  (cook ryls (cook royl-cell royl-rn))
-  ::
-  ++  royl-rn
     =+  ^=  moo
       |=  a/tape
       :-  (lent a)
       (scan a (bass 10 (plus sid:ab)))
-    ;~  pose
-      ;~  plug
-        (easy %d)
-        ;~  pose  (cold | hep)  (easy &)  ==
-        ;~  plug  dim:ag
-          ;~  pose
-            ;~(pfix dot (cook moo (plus (shim '0' '9'))))
-            (easy [0 0])
-          ==
-          ;~  pose
-            ;~  pfix
-              (just 'e')
-              ;~(plug ;~(pose (cold | hep) (easy &)) dim:ag)
-            ==
-            (easy [& 0])
-          ==
-        ==
-      ==
-      ;~  plug
-        (easy %i)
-        ;~  sfix
+    =+  ^=  voy
+      %+  cook  royl-cell
+      ;~  pose
+        ;~  plug
+          (easy %d)
           ;~  pose  (cold | hep)  (easy &)  ==
-          (jest 'inf')
+          ;~  plug  dim:ag
+            ;~  pose
+              ;~(pfix dot (cook moo (plus (shim '0' '9'))))
+              (easy [0 0])
+            ==
+            ;~  pose
+              ;~  pfix
+                (just 'e')
+                ;~(plug ;~(pose (cold | hep) (easy &)) dim:ag)
+              ==
+              (easy [& 0])
+            ==
+          ==
+        ==
+        ;~  plug
+          (easy %i)
+          ;~  sfix
+            ;~  pose  (cold | hep)  (easy &)  ==
+            (jest 'inf')
+          ==
+        ==
+        ;~  plug
+          (easy %n)
+          (cold ~ (jest 'nan'))
         ==
       ==
-      ;~  plug
-        (easy %n)
-        (cold ~ (jest 'nan'))
-      ==
+    ;~  pose
+      (stag %rh (cook rylh ;~(pfix ;~(plug sig sig) voy)))
+      (stag %rq (cook rylq ;~(pfix ;~(plug sig sig sig) voy)))
+      (stag %rd (cook ryld ;~(pfix sig voy)))
+      (stag %rs (cook ryls voy))
     ==
   ::
   ++  royl-cell