urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-08 06:00:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactors +der %oct parser

Browse Source
This commit is contained in:
Joe Bryan 2018-06-25 21:29:34 -04:00
parent 84452a6e00
commit b5f352f3bc
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/acme.hoon
View File

@ -253,10 +253,10 @@
:: ^- $-(nail (like spec:asn1)) :: ^- $-(nail (like spec:asn1))
;~ pose ;~ pose
(stag %int (bass 256 (sear int ;~(pfix (tag 2) till)))) (stag %int (bass 256 (sear int ;~(pfix (tag 2) till))))
(stag %bit (boss 256 (cook tail ;~(pfix (tag 3) till)))) :: XX test (stag %bit (^boss 256 (cook tail ;~(pfix (tag 3) till)))) :: XX test
(stag %oct (cook oct ;~(pfix (tag 4) till))) (stag %oct (boss 256 ;~(pfix (tag 4) till)))
(stag %nul (cold ~ ;~(plug (tag 5) (tag 0)))) (stag %nul (cold ~ ;~(plug (tag 5) (tag 0))))
(stag %obj (boss 256 ;~(pfix (tag 6) till))) (stag %obj (^boss 256 ;~(pfix (tag 6) till)))
(stag %seq (sear recur ;~(pfix (tag 48) till))) (stag %seq (sear recur ;~(pfix (tag 48) till)))
(stag %set (sear recur ;~(pfix (tag 49) till))) (stag %set (sear recur ;~(pfix (tag 49) till)))
(stag %con ;~(plug (sear context next) till)) (stag %con ;~(plug (sear context next) till))
@ -274,13 +274,6 @@
?: ?=([@ ~] a) `a ?: ?=([@ ~] a) `a
?. =(0 i.a) `a ?. =(0 i.a) `a
?.((gth i.t.a 127) ~ `t.a) ?.((gth i.t.a 127) ~ `t.a)
:: +oct:de:der: cook bytes to capture length
::
++ oct
|= a=(list @D)
^- [len=@ud oct=@ux]
:: XX do this in a parser combinator instead
[(lent a) (scan a (boss 256 (star next)))]
:: +recur:de:der: parse bytes for a list of +spec:asn1 :: +recur:de:der: parse bytes for a list of +spec:asn1
:: ::
++ recur ++ recur
@ -294,6 +287,17 @@
:+ ~ :+ ~
=(1 (cut 0 [5 1] a)) =(1 (cut 0 [5 1] a))
(dis 0x1f a) (dis 0x1f a)
:: +boss:de:der: shadowed to count as well
::
:: Use for parsing +octs more broadly?
::
++ boss
|* [wuc=@ tyd=rule]
%+ cook
|= waq=(list @)
:- (lent waq)
(reel waq |=([p=@ q=@] (add p (mul wuc q))))
tyd
:: +till:de:der: parser combinator for len-prefixed bytes :: +till:de:der: parser combinator for len-prefixed bytes
:: ::
:: advance until :: advance until