ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-19 12:51:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "hoon: change %brdt AST to support doccords label"

Browse Source 
This reverts commit 0dc3498a6f.
This commit is contained in:
drbeefsupreme 2022-03-16 12:12:39 -04:00
parent 643700546f
commit 1c72ff6103
No known key found for this signature in database
GPG Key ID: B70D5683DE7F9EFC
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/arvo/sys/hoon.hoon
View File

@ -6440,7 +6440,7 @@
[%brcb p=spec q=alas r=(map term tome)] :: |_ [%brcb p=spec q=alas r=(map term tome)] :: |_
[%brcl p=hoon q=hoon] :: |: [%brcl p=hoon q=hoon] :: |:
[%brcn p=(unit term) q=(map term tome)] :: |% [%brcn p=(unit term) q=(map term tome)] :: |%
[%brdt p=(unit term) q=hoon] :: |. [%brdt p=hoon] :: |.
[%brkt p=hoon q=(map term tome)] :: |^ [%brkt p=hoon q=(map term tome)] :: |^
[%brhp p=hoon] :: |- [%brhp p=hoon] :: |-
[%brsg p=spec q=hoon] :: |~ [%brsg p=spec q=hoon] :: |~
@ -8213,12 +8213,12 @@
:: ::
++ apply-whit ++ apply-whit
^- hoon ^- hoon
:: if wit is empty, just return the hoon
?: =([~ ~ ~ ~] wit) ?: =([~ ~ ~ ~] wit)
gen gen
?+ gen gen ?+ gen gen
:: ::
[%brcn *] [%brcn *]
<<<<<<< HEAD
[%brcn lab.wit q.gen] :: populate (unit term) with lab.wit [%brcn lab.wit q.gen] :: populate (unit term) with lab.wit
:: ::
[%brpt *] [%brpt *]
@ -8226,6 +8226,9 @@
:: ::
[%brdt *] [%brdt *]
[%brdt lab.wit q.gen] [%brdt lab.wit q.gen]
=======
[%brcn lab.wit q.gen]
>>>>>>> parent of 0dc3498a6f (hoon: change %brdt AST to support doccords label)
== ==
-- --
:: ::
@ -8446,10 +8449,10 @@
|= =hoon |= =hoon
?~ q.gen hoon ?~ q.gen hoon
[%tstr [p.i.q.gen ~] q.i.q.gen $(q.gen t.q.gen)] [%tstr [p.i.q.gen ~] q.i.q.gen $(q.gen t.q.gen)]
[%brcl *] [%tsls p.gen [%brdt ~ q.gen]] ::TODO ~ added when modifying %brdt, change to be appropriate docs [%brcl *] [%tsls p.gen [%brdt q.gen]]
[%brdt *] :+ %brcn p.gen :: (docs) ~ changed to p.gen. builds a |% with an arm named $ [%brdt *] :+ %brcn ~
=- [[%$ ~ -] ~ ~] =- [[%$ ~ -] ~ ~]
(~(put by *(map term hoon)) %$ q.gen) (~(put by *(map term hoon)) %$ p.gen)
[%brkt *] :+ %tsgl [%limb %$] [%brkt *] :+ %tsgl [%limb %$]
:+ %brcn ~ :+ %brcn ~
=+ zil=(~(get by q.gen) %$) =+ zil=(~(get by q.gen) %$)
@ -8458,7 +8461,7 @@
[*what [[%$ p.gen] ~ ~]] [*what [[%$ p.gen] ~ ~]]
%+ ~(put by q.gen) %$ %+ ~(put by q.gen) %$
[p.u.zil (~(put by q.u.zil) %$ p.gen)] [p.u.zil (~(put by q.u.zil) %$ p.gen)]
[%brhp *] [%tsgl [%limb %$] [%brdt ~ p.gen]] :: TODO ~ added when modifying %brdt. change to appropriate docs [%brhp *] [%tsgl [%limb %$] [%brdt p.gen]]
[%brsg *] [%ktbr [%brts p.gen q.gen]] [%brsg *] [%ktbr [%brts p.gen q.gen]]
[%brtr *] :+ %tsls [%kttr p.gen] [%brtr *] :+ %tsls [%kttr p.gen]
:+ %brpt ~ :+ %brpt ~
@ -8467,7 +8470,7 @@
[%brts *] :+ %brcb p.gen [%brts *] :+ %brcb p.gen
=- [~ [[%$ ~ -] ~ ~]] =- [~ [[%$ ~ -] ~ ~]]
(~(put by *(map term hoon)) %$ q.gen) (~(put by *(map term hoon)) %$ q.gen)
[%brwt *] [%ktwt %brdt ~ p.gen] :: TODO ~ added when modifying %brdt. change to appropriate docs [%brwt *] [%ktwt %brdt p.gen]
:: ::
[%clkt *] [p.gen q.gen r.gen s.gen] [%clkt *] [p.gen q.gen r.gen s.gen]
[%clls *] [p.gen q.gen r.gen] [%clls *] [p.gen q.gen r.gen]
@ -8528,10 +8531,10 @@
:- %mean :- %mean
=+ fek=~(feck ap p.gen) =+ fek=~(feck ap p.gen)
?^ fek [%rock %tas u.fek] ?^ fek [%rock %tas u.fek]
[%brdt ~ [%cncl [%limb %cain] [%zpgr [%tsgr [%$ 3] p.gen]] ~]] :: (doccords) added ~ for %brdt [%brdt [%cncl [%limb %cain] [%zpgr [%tsgr [%$ 3] p.gen]] ~]]
q.gen q.gen
:: ::
[%sgcb *] [%sggr [%mean [%brdt ~ p.gen]] q.gen] :: (doccords) added ~ for %brdt [%sgcb *] [%sggr [%mean [%brdt p.gen]] q.gen]
[%sgcn *] [%sgcn *]
:+ %sggl :+ %sggl
:- %fast :- %fast
@ -8629,7 +8632,7 @@
:+ %tsgl :: :+ %tsgl ::
[%wing [%| 0 ~] [%& 6] ~] :: [%wing [%| 0 ~] [%& 6] ~] ::
[%limb %b] :: [%limb %b] ::
:+ %brdt ~ :: |. (doccords) added ~ for %brdt :- %brdt :: |.
:^ %cnls :: %+ :^ %cnls :: %+
[%tsgr [%limb %v] p.gen] :: =>(v {p.gen}) [%tsgr [%limb %v] p.gen] :: =>(v {p.gen})
[%cncl [%limb %b] [%limb %c] ~] :: (b c) [%cncl [%limb %b] [%limb %c] ~] :: (b c)
@ -13087,7 +13090,7 @@
['%' (runo cen %brcn ~ expe)] ['%' (runo cen %brcn ~ expe)]
['@' (runo pat %brpt ~ expe)] ['@' (runo pat %brpt ~ expe)]
[':' (rune col %brcl expb)] [':' (rune col %brcl expb)]
['.' (runo dot %brdt ~ expa)] ['.' (rune dot %brdt expa)]
['-' (rune hep %brhp expa)] ['-' (rune hep %brhp expa)]
['^' (rune ket %brkt expx)] ['^' (rune ket %brkt expx)]
['~' (rune sig %brsg exqc)] ['~' (rune sig %brsg exqc)]