From e839ec6c7c9636dbc8c7a2debd2fec642e46bf40 Mon Sep 17 00:00:00 2001 From: Elliot Glaysher Date: Tue, 11 Dec 2018 11:38:44 -0800 Subject: [PATCH] Start adding ^? and removing =, and ^ --- app/dojo.hoon | 4 ++-- app/hall.hoon | 2 +- lib/hall.hoon | 3 +-- lib/hood/drum.hoon | 3 +-- lib/pill.hoon | 1 + lib/sole.hoon | 4 +--- sur/asn1.hoon | 2 ++ sur/hall.hoon | 1 + sur/lens.hoon | 1 + sur/plan/diff.hoon | 1 + sur/sole.hoon | 5 ++--- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/dojo.hoon b/app/dojo.hoon index a557ef3f07..d8f7a3d9a2 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -1625,7 +1625,7 @@ (he-diff %tan u.p.cit) :: ++ he-lens - |= com/command:^^^^lens + |= com/command:^^lens ^+ +> =+ ^- source/dojo-source =| num/@ @@ -1815,7 +1815,7 @@ (wrap he-type):arm :: ++ poke-lens-command - |= com/command:^^^^lens ~| poke-lens+com %. com + |= com/command:^^lens ~| poke-lens+com %. com (wrap he-lens):arm :: ++ poke-json diff --git a/app/hall.hoon b/app/hall.hoon index c079b9ccd6..8cda69c67b 100644 --- a/app/hall.hoon +++ b/app/hall.hoon @@ -117,7 +117,7 @@ :: # :: functional cores and arms. :: -~% %hall-door ..^^^is ~ +~% %hall-door ..^is ~ |_ {bol/bowl:gall $1 state} :: :: # %transition diff --git a/lib/hall.hoon b/lib/hall.hoon index 230bbead1e..f7b6938c30 100644 --- a/lib/hall.hoon +++ b/lib/hall.hoon @@ -1,11 +1,10 @@ :: :::: /lib/hall/hoon :: -/- hall +/- *hall :: :::: :: -=, hall |_ bol/bowl:gall :: ::TODO add to zuse? diff --git a/lib/hood/drum.hoon b/lib/hood/drum.hoon index 5bdf133ab9..0fa4ec6575 100644 --- a/lib/hood/drum.hoon +++ b/lib/hood/drum.hoon @@ -2,9 +2,8 @@ :::: /hoon/drum/hood/lib :: :: :: :: :: /? 310 :: version -/- sole, hall +/- *sole, hall /+ sole -=, ^sole :: :: :: :::: :: :: :: :: :: diff --git a/lib/pill.hoon b/lib/pill.hoon index 174807f193..024513c1fe 100644 --- a/lib/pill.hoon +++ b/lib/pill.hoon @@ -1,5 +1,6 @@ :: |pill: helper functions for making pills :: +^| |% :: +module-ova: vane load operations. :: diff --git a/lib/sole.hoon b/lib/sole.hoon index d71f9a07d4..9626c267e4 100644 --- a/lib/sole.hoon +++ b/lib/sole.hoon @@ -2,9 +2,7 @@ :::: /hoon/sole/lib :: /? 310 -/- sole -=, sole -:: +/- *sole :::: :: |_ sole-share :: shared-state engine diff --git a/sur/asn1.hoon b/sur/asn1.hoon index 1aa0b658f0..980bf05948 100644 --- a/sur/asn1.hoon +++ b/sur/asn1.hoon @@ -3,6 +3,7 @@ :: A minimal representation of some basic ASN.1 types, :: created to support PKCS keys, digests, and cert requests. :: +^? |% :: +bespoke:asn1: context-specific, generic ASN.1 tag type :: @@ -65,6 +66,7 @@ :: |obj:asn1: constant object ids, pre-encoded :: ++ obj + ^? |% :: rfc4055 ++ sha-256 0x1.0204.0365.0148.8660 :: 2.16.840.1.101.3.4.2.1 ++ rsa 0x1.0101.0df7.8648.862a :: 1.2.840.113549.1.1.1 diff --git a/sur/hall.hoon b/sur/hall.hoon index 7935cca86f..595a5e28c0 100644 --- a/sur/hall.hoon +++ b/sur/hall.hoon @@ -1,6 +1,7 @@ :: :::: /sur/hall/hoon :: +^? |% :: ::TODO use different words for different kinds of burdens diff --git a/sur/lens.hoon b/sur/lens.hoon index 9fd0704afe..dbae3fd5de 100644 --- a/sur/lens.hoon +++ b/sur/lens.hoon @@ -1,3 +1,4 @@ +^? |% ++ command $: source/source diff --git a/sur/plan/diff.hoon b/sur/plan/diff.hoon index 0023a1a778..c55b338248 100644 --- a/sur/plan/diff.hoon +++ b/sur/plan/diff.hoon @@ -1,2 +1,3 @@ /- plan-acct +^? {inf/(unit {@txname @txloc}) del/(map knot ~) put/(map knot plan-acct)} diff --git a/sur/sole.hoon b/sur/sole.hoon index 32fa8dba10..d08313b3e5 100644 --- a/sur/sole.hoon +++ b/sur/sole.hoon @@ -1,7 +1,8 @@ :: :::: /hoon/sole/sur :: -=> |% +^? +|% ++ sole-action :: sole to app $% :: {$abo ~} :: reset interaction {$det sole-change} :: command line edit @@ -78,8 +79,6 @@ (unit knot) hiss:eyre $-(httr:eyre (sole-request out)) --- -|% :: :: ++ sole-gen :: XX virtual type $% {$say $-((sole-args) (cask))} :: direct noun