From 15f7641339ad88b77b2c7f926ff9605e490dfca5 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Mon, 26 Jan 2015 15:38:34 -0800
Subject: [PATCH] Revert "Breach compatibility rc2", "Revert "Tile %smsm,
 replaced instance in ames with ++hard call""

This reverts commit 66e94bd04b9333fd7cdafaacc1714d69b3cab059.
This reverts commit d3ac409e27bafe7fc2074be71eaf86a6d97f887c.
---
 arvo/hoon.hoon              |  9 +++++----
 main/app/cat/core.hook      |  2 +-
 main/app/poke/core.hook     |  2 +-
 main/app/shell/core.hook    |  3 ++-
 main/app/terminal/core.hook | 30 ------------------------------
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 9bd336959..cfca2c6d6 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -272,7 +272,7 @@
             [%smdt p=twig q=tusk]                       ::
             [%smdq p=(list beer)]                       ::  assemble string
             [%smsg p=twig q=tusk]                       ::  gonads
-            [%smsm p=twig q=twig]                       ::  make sure q is a p
+            [%smsm p=tile q=twig]                       ::  make sure q is a p
           ::                                            ::::::  compositions
             [%tsbr p=tile q=twig]                       ::  push bunt: =+(_p q)
             [%tscl p=tram q=twig]                       ::  p changes, then q
@@ -6662,7 +6662,8 @@
     ::
         [%smsm *]                                       ::                  ;;
       :+  %tsgr  [%ktts %v ~ 1]                         ::  =>  v=.
-      :+  %tsls  [%ktts %a [%tsgr [%cnzy %v] p.gen]]    ::  =+  a==>(v {p.gen})
+      :+  %tsls  :+  %ktts  %a                          ::  =+  ^=  a
+                 [%tsgr [%cnzy %v] [%bccm p.gen]]       ::      =>(v ,{p.gen})
       :+  %tsls  [%ktts %b [%tsgr [%cnzy %v] q.gen]]    ::  =+  b==>(v {q.gen})
       :+  %tsls                                         ::  =+  c=(a b)
         [%ktts %c [%cnhp [%cnzy %a] [%cnzy %b] ~]]      ::
@@ -8946,7 +8947,7 @@
                   =+  rev=(plex b)
                   ?~  rev  ~
                   %-  some
-                  :+  %smsm  ~(clam al a)
+                  :+  %smsm  a
                   [%dtkt %dtzz %$ %cx u.rev]
                 ;~(plug hill rood)
               ==
@@ -9194,7 +9195,7 @@
                 :~  [':' (rune col %smcl expi)]
                     ['.' (rune dot %smdt expi)]
                     ['~' (rune sig %smsg expi)]
-                    [';' (rune sem %smsm expb)]
+                    [';' (rune sem %smsm expo)]
                 ==
               ==
             :-  '='
diff --git a/main/app/cat/core.hook b/main/app/cat/core.hook
index e014c7706..51cd5a617 100644
--- a/main/app/cat/core.hook
+++ b/main/app/cat/core.hook
@@ -19,7 +19,7 @@
   =+  ark=;;(arch .^(%cy pax))
   ?^  q.ark
     :-  leaf/(spud pax)
-    %+  turn  (lore ;;(,@t .^(%cx pax)))
+    %+  turn  (lore ;;(@t .^(%cx pax)))
     |=(a=cord leaf/(trip a))
   ?-     r.ark                                          ::  handle ambiguity
       ~
diff --git a/main/app/poke/core.hook b/main/app/poke/core.hook
index 97b45d88f..24aca97fa 100644
--- a/main/app/poke/core.hook
+++ b/main/app/poke/core.hook
@@ -12,6 +12,6 @@
 ::
 ++  pour
   |=  [ost=bone * sih=*]
-  ~&  poke-resp/(,[term term] [&1 &2]:sih)
+  ~&  poke-resp/;;([term term] [&1 &2]:sih)
   :_(+> [ost %pass / %g %cide %$]~)
 --
diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook
index 6aabc83c9..3b070c21a 100644
--- a/main/app/shell/core.hook
+++ b/main/app/shell/core.hook
@@ -10,7 +10,8 @@
   ::
 |%                                                      ::
 ++  axle                                                ::
-  $:  tiv=?                                             ::  typing?
+  $:  %0                                                ::  version
+      tiv=?                                             ::  typing?
       pid=@u                                            ::  next process id
       pax=_`path`/=try=                                 ::  working directory
       act=(unit span)                                   ::  active child
diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook
index c608659f5..6d1217e89 100644
--- a/main/app/terminal/core.hook
+++ b/main/app/terminal/core.hook
@@ -58,36 +58,6 @@
       [%vega p=path]                                    ::
   ==  ==  ==
 --
-::
-::::  from future import wick, pack, pick  XX remove on breach or kelvin bump
-  ::
-|%
-++  wick                                                ::  span format
-  |=  a=@
-  ^-  (unit ,@ta)
-  =+  b=(rip 3 a)
-  =-  ?^(b ~ (some (rap 3 (flop c))))
-  =|  c=tape
-  |-  ^-  [b=tape c=tape]
-  ?~  b  [~ c]
-  ?.  =('~' i.b)
-    $(b t.b, c [i.b c])
-  ?~  t.b  [b ~]
-  ?-  i.t.b
-    %'~'  $(b t.t.b, c ['~' c])
-    %'-'  $(b t.t.b, c ['_' c])
-    @     [b ~]
-  ==
-::
-++  pack                                                ::  light path encoding
-  |=  [a=term b=path]  ^-  span
-  %+  rap  3  :-  (wack a)
-  (turn b |=(c=span (cat 3 '_' (wack c))))
-::
-++  pick                                                ::  light path decoding
-  |=  a=span  ^-  (unit ,[p=term q=path])
-  (rush a (most cab (sear wick urt:ab)))
---
 !:
 ::::  helpers
   ::