From c123d4e1156b93a3cefdb0ce8b8406145c5dbe64 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 29 May 2014 15:00:13 -0700 Subject: [PATCH] Some gall related fixes. --- arvo/eyre.hoon | 31 +++++++++++++++++++------------ arvo/gall.hoon | 3 --- arvo/zuse.hoon | 8 +++++++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index e90793f07..3fa975fca 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -441,6 +441,16 @@ [%want [sor.rot him] [%q %pr %e %hork mun ~] ~] == :: + ++ hoth :: simple app request + |= [our=ship num=@ud ses=hole app=term pax=path] + %_ +> + mow + :_ mow + :^ hen %toss %g + :- [%hoth (scot %p our) ses (scot %ud num) ~] + [%show [our app] ~ `(unit plan)``[%x [now `~0s] pax]] + == + :: ++ hork :: remote request |= [him=ship hyx=httx] ^+ +> @@ -839,16 +849,12 @@ ?> ?=(%way pez.u.pup) $(yov t.yov, q.rey (~(put by q.rey) i.yov u.pup(pez noz))) :: - ++ fake + ++ fapp :: dispatch app + |= [fur=(unit term) paw=path] ^- (unit seam) - :+ ~ %app - ;html - ;head ;title: not an application - == - ;body - ;p: Not an application, on {}, with {} - == - == + ?> ?=(^ fur) + ?> ?=(^ paw) + `[%aps u.fur i.paw t.paw] :: ++ flea :: permissive decimal |= txt=@t @@ -1080,7 +1086,7 @@ %v (foin p.q.pul paw r.pul) %c (flub paw ~) %l (fool r.pul) - %p fake + %p (fapp p.q.pul paw) == :: %p @@ -1443,8 +1449,9 @@ %way [[~ pip] +>.$] %new ?- -.som.pip - %app :: XX a mere stub - :_(+>.$ [~ pip(pez [%fin %ham p.som.pip])]) + %aps :: XX a mere stub + :- [~ pip(pez %way)] + +>.$(..ya (hoth our num ses p.som.pip r.som.pip)) :: %con :_ +>.$ diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 13cfa16fe..8f98df5aa 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -15,7 +15,6 @@ [%crud p=(list tank)] :: error [%meta p=vase] :: application gift == :: -++ hasp ,[p=ship q=term] :: app identity ++ kiss :: in request ->$ $% [%mess p=hasp q=(disk)] :: urbit message [%nuke p=hasp] :: reset this duct @@ -37,7 +36,6 @@ == :: ++ move ,[p=duct q=(mold note gift)] :: typed move ++ note curd :: out request $-> -++ plan (trel view (pair ,@da (unit ,@dr)) path) :: subscription ++ rapt |*(a=$+(* *) (qual path path ,@da a)) :: versioned result ++ scar :: opaque duct system $: p=@ud :: bone sequence @@ -72,7 +70,6 @@ [%rasp p=(disk)] :: response message == :: ++ toil (pair duct knob) :: work in progress -++ view ?(%u %v %w %x %y %z) :: view mode -- :::::::::::::::::::::::::::::::::::::::::::::::::::::: |% :::::::::::::::::::::::::::::::::::::::::::::::::::::: functions ++ byby :: double bind diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 1e6c70c0d..5a891ad9d 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -2012,6 +2012,7 @@ [%kill p=~] :: kill a task [%lane p=lane] :: set public route [%made p=(each beet (list tank))] :: computed result + [%nuke p=hasp] :: reset this duct [%line p=@t] :: source line [%limn ~] :: rotate ship [%ling ~] :: rotate interface @@ -2023,6 +2024,7 @@ [%mean p=ship q=term r=chop s=vase] :: application event [%meta p=vase] :: meta-card [%meat p=ship q=card] :: concrete app action + [%mess p=hasp q=(disk)] :: urbit message [%mine p=@ud q=@t] :: query matched line [%noop ~] :: no operation [%note p=@tD q=tank] :: debug message @@ -2038,6 +2040,7 @@ [%rest ~] :: reset to factory [%save p=path q=@] :: write atomic file [%send p=lane q=@] :: transmit packet + [%show p=hasp q=path r=(unit plan)] :: subscription [%sith p=@p q=@uw] :: imperial generator [%soft p=*] :: untyped card [%sync ~] :: reset soft state @@ -2212,6 +2215,7 @@ ++ gyro ,[p=@ud q=wire r=prod] :: live prompt ++ hand ,@uvH :: hash of code ++ hart ,[p=? q=(unit ,@ud) r=host] :: http sec/port/host +++ hasp ,[p=ship q=term] :: app identity ++ hate ,[p=purl q=@p r=moth] :: semi-cooked request ++ heir ,[p=@ud q=mess r=(unit love)] :: status/headers/data ++ hiss ,[p=purl q=moth] :: outbound request @@ -2338,6 +2342,7 @@ == :: ++ pact path :: routed path ++ pail ?(%none %warm %cold) :: connection status +++ plan (trel view (pair ,@da (unit ,@dr)) path) :: subscription ++ plea ,[p=@ud q=[p=? q=@t]] :: live prompt ++ pork ,[p=(unit ,@ta) q=(list ,@t)] :: fully parsed url ++ pred ,[p=@ta q=@tas r=@ta ~] :: proto-path @@ -2426,7 +2431,7 @@ pus=(unit ,@ta) :: password == :: ++ seam :: logical request - $% [%app p=manx] :: (fake) app + $% [%aps p=term q=term r=path] :: app; logo; path [%cog p=@ud q=@ud] :: console get [%con p=@ud] :: console face [%cop p=@ud q=@ud r=json] :: console put @@ -2550,6 +2555,7 @@ q=*vane :: consequence ++ vern [_@ud _@ud] :: hoon/vane version -- :: +++ view ?(%u %v %w %x %y %z) :: view mode ++ wund (list ,[p=life q=ring r=acru]) :: mace in action ++ what :: logical identity $% [%anon ~] :: anonymous