From ad2e0bcf05b780a161e423ba2f993c079bd3e034 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Sun, 18 Jan 2015 15:19:06 -0800
Subject: [PATCH] Take out floppatronic.

---
 arvo/gall.hoon           |  4 ++--
 main/app/rodeo/core.hook | 12 +++++++-----
 main/sur/rodeo/core.hook | 10 ++++++----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 3697ee898..93abbf7ea 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -992,8 +992,8 @@
       ::
       ++  said                                          ::  sayz, done wrong
         |=  vud=vase
-        =-  [(flop p.fob) (weld (flop q.fob) mow)]
-        ^=  fob
+        ::  =-  [(flop p.fob) (weld (flop q.fob) mow)]
+        ::  ^=  fob
         |-  ^-  (pair (list toil) (list move))
         ?:  =(~ q.vud)  [~ ~]
         =+  sud=(sump (slot 2 vud))
diff --git a/main/app/rodeo/core.hook b/main/app/rodeo/core.hook
index 260e3da91..38bb996f7 100644
--- a/main/app/rodeo/core.hook
+++ b/main/app/rodeo/core.hook
@@ -32,7 +32,7 @@
                   [%exp p=@t q=tank]                    ::
                   [%say p=@t]                           ::
       ==  ==  ==                                        ::
-    ++  story                                           ::  a conversation
+    ++  story                                           ::  wire content
       $:  count=@ud                                     ::  (lent grams)
           grams=(list telegram)                         ::  all history
           locals=(map ship (pair ,@da status))          ::  local presence
@@ -91,7 +91,8 @@
   |_  [ost=bone moves=(list move)]
   ++  ra-abet                                           ::  resolve core
     ^-  [(list move) _+>]
-    [(flop moves) +>]
+    ::  [(flop moves) +>]     ::  XX  return when order is correct
+    [moves +>]
   ::
   ++  ra-emil                                           ::  ra-emit move list
     |=  mol=(list move)
@@ -549,14 +550,15 @@
     ++  pa-start                                        ::  start stream
       |=  riv=river
       ^+  +>
-      =-  =.  +>.$  (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~])
+      =-  ~&  [%pa-start riv lab]
+          =.  +>.$  (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~])
           ?:  p.lab
             (pa-sauce ost [[%mean ~] ~])
           +>.$(guests (~(put by guests) ost riv))
       ^=  lab
       =+  [end=count gaz=grams dun=| zeg=*(list telegram)]
       |-  ^-  (trel ,? ,@ud (list telegram))
-      ?~  gaz  [dun end (flop zeg)]
+      ?~  gaz  [dun end zeg]
       ?:  ?-  -.q.riv                                   ::  after the end
             %ud  (lte p.q.riv end)
             %da  (lte p.q.riv p.r.q.i.gaz)
@@ -566,7 +568,7 @@
             %ud  (lth end p.p.riv)
             %da  (lth p.r.q.i.gaz p.p.riv)
           ==
-        [dun end (flop zeg)]
+        [dun end zeg]
       $(end (dec end), gaz t.gaz, zeg [i.gaz zeg])
     ::
     ++  pa-listen                                       ::  subscribe
diff --git a/main/sur/rodeo/core.hook b/main/sur/rodeo/core.hook
index 41ee43373..4bf37e2c4 100644
--- a/main/sur/rodeo/core.hook
+++ b/main/sur/rodeo/core.hook
@@ -34,10 +34,11 @@
 ++  presence   ?(%gone %hear %talk)                     ::  status type
 ++  register  (pair atlas (map station atlas))          ::  ping me, ping srcs
 ++  report                                              ::  unified rush/rust
-  $%  [%house (set span)]                               ::  meta-changes
+  $%  [%config config]                                  ::  reconfigure
+  ::  [%folder (list report)]                           ::  multiple
       [%grams (pair ,@ud (list telegram))]              ::  beginning, thoughts
       [%group register]                                 ::  presence
-      [%config config]                                  ::  reconfigure
+      [%house (set span)]                               ::  station set
   ==                                                    ::
 ++  speech                                              ::  narrative action
   ::  XX  unify %own and %say to %lin
@@ -45,7 +46,7 @@
   $%  [%lan p=span q=@t]                                ::  local announce
       [%own p=@t]                                       ::  XX @ or /me
       [%exp p=@t]                                       ::  hoon line
-      [%non ~]                                          ::  no content
+      [%non ~]                                          ::  no content (yo)
       [%ext p=@tas q=*]                                 ::  extended action
       [%fat p=torso q=speech]                           ::  attachment
       ::  [%inv p=station]                              ::  invite to station
@@ -61,7 +62,8 @@
 ++  telegram   (pair ship thought)                      ::  who which whom what
 ++  thought    (trel serial audience statement)         ::  which whom what
 ++  torso                                               ::  attachment
-  $%  [%text (list ,@t)]                                ::  text lines
+  $%  [%name (pair ,@t torso)]                          ::  named attachment
+      [%text (list ,@t)]                                ::  text lines
       [%tank (list tank)]                               ::  tank list
   ==                                                    ::
   ::  markdown