diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 66c4ee981c..d62cc5c329 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -78,9 +78,8 @@ ^= q :: ?@ +.b ~ :: :- ~ :: - u=[p=(a +>-.b) q=[p=(hair -.b) q=(tape +.b)]] :: -++ limb $| term - $%([%& p=axis] [%| p=@ud q=term]) + u=[p=(a +>-.b) q=[p=(hair -.b) q=(tape +.b)]] :: +++ limb $|(term $%([%& p=axis] [%| p=@ud q=term])) :: ++ line ,[p=[%leaf p=odor q=@] q=tile] :: ++ list |* a=_,* :: $|(~ [i=a t=(list a)]) :: @@ -90,6 +89,7 @@ ++ tree |* a=_,* :: binary tree $|(~ [n=a l=(tree a) r=(tree a)]) :: ++ nail ,[p=hair q=tape] :: +++ numb ,@ :: just a number ++ pass ,@ :: ++ path (list span) :: ++ pint ,[p=[p=@ q=@] q=[p=@ q=@]] :: @@ -159,7 +159,7 @@ [%brcb p=tile q=(map term foot)] :: [%brcn p=(map term foot)] :: [%brdt p=twig] :: - [%brfs p=tile q=(map term foot)] :: + [%brfs p=tile q=(map term foot)] :: XX delete me [%brkt p=twig q=(map term foot)] :: [%brhp p=twig] :: [%brls p=tile q=twig] :: @@ -310,7 +310,7 @@ [%fork p=type q=type] :: [%hold p=(list ,[p=type q=twig])] :: == :: -++ typo type :: +++ typo type :: old type ++ udal :: atomic change (%b) $: p=@ud :: blockwidth q=(list ,[p=@ud q=(unit ,[p=@ q=@])]) :: indels @@ -1062,7 +1062,7 @@ |% ++ abs |=(a=@s (add (end 0 1 a) (rsh 0 1 a))) ++ dif |=([a=@s b=@s] (sum a (new !(syn b) (abs b)))) - ++ dul |=([a=@s b=@s] =+(c=(old a) ?:(-.c (mod +.c b) (sub b +.c)))) + ++ dul |=([a=@s b=@] =+(c=(old a) ?:(-.c (mod +.c b) (sub b +.c)))) ++ fra |= [a=@s b=@s] (new =(0 (mix (syn a) (syn b))) (div (abs a) (abs b))) ++ new |=([a=? b=@] `@s`?:(a (mul 2 b) ?:(=(0 b) 0 +((mul 2 (dec b)))))) @@ -5642,7 +5642,7 @@ =+ hum=$(gen q.gen) [p.hum [%10 [%spot %1 p.gen] q.hum]] :: - [%zpcm *] [(nice (play p.gen)) [%1 q.gen]] + [%zpcm *] [(nice (play p.gen)) [%1 q.gen]] :: XX validate! [%zpcn ~] =+(pet=seed [(nice p.pet) [%1 q.pet]]) [%zpfs *] ?: vet @@ -6198,6 +6198,7 @@ :: ++ sift |= ref=type + ~+ ^- type ~|(%sift-lose ?>((nest(sut ref) & -:!>(*typo)) ref)) :: @@ -6626,7 +6627,6 @@ :~ ['_' (rune cab %brcb expu)] ['%' (rune cen %brcn expe)] ['.' (rune dot %brdt expa)] - ['/' (rune fas %brfs expu)] ['-' (rune hep %brhp expa)] ['^' (rune ket %brkt expr)] ['+' (rune lus %brls expo)] @@ -7112,6 +7112,7 @@ ++ ovum ,[p=wire q=curd] :: typeless ovum ++ pane (list ,[p=@tas q=vase]) :: kernel modules ++ pone (list ,[p=@tas q=vise]) :: kernel modules, old +++ shag ,@p :: minor identity ++ ship ,@p :: network identity ++ vane $_ :: kernel actor |+ [now=@da eny=@ sky=$+(* (unit))] :: activate diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index a1a3b922bc..3a789ce0f0 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1198,7 +1198,7 @@ %sg [~ "Sango"] %si [~ "Sinhala"] %sk [~ "Slovak"] - %sl [~ "Slcornian"] + %sl [~ "Slovenian"] %sm [~ "Samoan"] %sn [~ "Shona"] %so [~ "Somali"] @@ -1393,13 +1393,6 @@ r=boar :: state == :: ++ bell path :: label -++ bird :: packet in travel - $: gom=soap :: message identity - mup=@ud :: pktno in msg - nux=@ud :: xmission count - lys=@da :: last sent - pac=rock :: packet data - == :: ++ belt :: raw console input $% [%aro p=?(%d %l %r %u)] :: arrow key [%bac ~] :: true backspace @@ -1570,6 +1563,7 @@ == :: ++ chum ,@uvI :: hashed passcode ++ claw $: :: startup chain + joy=(unit coal) :: local context ran=(unit coal) :: arguments pux=(unit path) :: execution path @@ -1641,18 +1635,6 @@ [%king p=@t] :: 16-bit ship [%pawn p=(unit ,@t)] :: 128-bit ship == :: -++ goad :: common note - $% [%eg p=riot] :: simple result - [%hp p=httr] :: http response - [%ht p=@ud q=scab r=cred s=moth] :: http request - [%it p=~] :: interrupt event - [%lq p=ship q=path r=*] :: client request - [%ly p=newt q=tape] :: lifecycle event - [%ow p=cape] :: one-way reaction - [%rt p=(unit)] :: roundtrip response - [%up p=@t] :: prompt response - [%wa ~] :: alarm - == :: ++ goal :: app request $% [%$ p=type] :: open for input [%do p=vase q=vase] :: call gate sample @@ -1759,14 +1741,26 @@ ++ moth ,[p=meth q=math r=(unit octs)] :: http operation ++ name ,[p=@t q=(unit ,@t) r=(unit ,@t) s=@t] :: first mid/nick last ++ newt ?(%boot %kick %mess %slay %wake) :: lifecycle events +++ nook :: common note + $% [%eg p=riot] :: simple result + [%hp p=httr] :: http response + [%ht p=@ud q=scab r=cred s=moth] :: http request + [%it p=~] :: interrupt event + [%lq p=ship q=path r=*] :: client request + [%ly p=newt q=tape] :: lifecycle event + [%ow p=cape] :: one-way reaction + [%rt p=(unit)] :: roundtrip response + [%up p=@t] :: prompt response + [%wa ~] :: alarm + == :: ++ nose :: response, kernel $? [%$ p=(unit ,[p=tutu q=(list)])] :: standard input - goad :: + nook :: == :: ++ note :: response, user $? [%$ p=(unit ,[p=type q=(list)])] :: standard input [%do p=vase] :: execution result - goad :: + nook :: == :: ++ nori :: repository action $% [& p=(unit masu) q=soba] :: delta diff --git a/try/bin/fib.hoon b/try/bin/fib.hoon index a739f2589f..e57121a61d 100644 --- a/try/bin/fib.hoon +++ b/try/bin/fib.hoon @@ -6,3 +6,4 @@ :_ ~ :_ ~ :+ %la %leaf (scow %ud %.(num |=(x=@ ?:((lth x 2) 1 (add $(x (dec x)) $(x (sub x 2))))))) +