mirror of
https://github.com/ilyakooo0/urbit.git
synced 2025-01-04 13:19:48 +03:00
Matched to ++feel, with some temporary bull laming.
This commit is contained in:
C. Guy Yarvin
parent
8a18e8ede4
commit
151ceea50d
@ -273,14 +273,14 @@
|
||||
|- ^- ?((list {cage cage}) (each $~ tang))
|
||||
?~ p.gag ~
|
||||
=* hed i.p.gag
|
||||
?- -.p.hed
|
||||
?- -.p.i.p.gag
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
$| (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
$& ?- -.q.hed
|
||||
$| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
|
||||
$& ?- -.q.i.p.gag
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
$| (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
$| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
|
||||
$& =+ $(p.gag t.p.gag)
|
||||
?+(- [[p.p p.q]:hed -] {@ *} -)
|
||||
?+(- [[p.p p.q]:i.p.gag -] {@ *} -)
|
||||
== ==
|
||||
::
|
||||
++ cages-to-map
|
||||
@ -1197,8 +1197,8 @@
|
||||
::
|
||||
$next
|
||||
=* mun p.q.i.xiq
|
||||
=* dat q.q.i.xiq
|
||||
?~ dat
|
||||
:: =* dat q.q.i.xiq XX can't fuse right now
|
||||
?~ q.q.i.xiq
|
||||
=+ ver=(aver mun)
|
||||
?~ ver
|
||||
$(xiq t.xiq, xaq [i.xiq xaq])
|
||||
@ -1211,7 +1211,7 @@
|
||||
$(xiq t.xiq)
|
||||
?~ u.var
|
||||
$(xiq t.xiq, ..wake (blab p.i.xiq mun %& %null [%atom %n] ~))
|
||||
?: (equivalent-data:ze u.dat u.u.var)
|
||||
?: (equivalent-data:ze u.q.q.i.xiq u.u.var)
|
||||
$(xiq t.xiq, xaq [i.xiq xaq])
|
||||
$(xiq t.xiq, ..wake (blab p.i.xiq mun u.u.var))
|
||||
::
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
:: :: %eyre, http servant
|
||||
!: :: %eyre, http servant
|
||||
!? 164
|
||||
::::
|
||||
|= pit/vase
|
||||
@ -764,9 +764,8 @@
|
||||
{$hi ^}
|
||||
?: ?=($| -.q.sih)
|
||||
(give-sigh q.sih) :: XX crash?
|
||||
=* cay p.q.sih
|
||||
?> ?=($hiss p.cay)
|
||||
(pass-note tee [%e %meta :(slop !>(%them) !>(~) q.cay)])
|
||||
?> ?=($hiss p.p.q.sih)
|
||||
(pass-note tee [%e %meta :(slop !>(%them) !>(~) q.p.q.sih)])
|
||||
::
|
||||
{$he *} :: XX hack
|
||||
=. ..axon $(tee p.tee)
|
||||
@ -782,40 +781,37 @@
|
||||
?: ?=($| -.q.sih)
|
||||
((slog p.q.sih) +>.^$) :: XX get-even %mean
|
||||
%+ get-rush:(ire-ix p.tee) q.tee
|
||||
=* cay p.q.sih
|
||||
?> ?=($json p.cay) :: XX others
|
||||
((hard json) q.q.cay)
|
||||
?> ?=($json p.p.q.sih) :: XX others
|
||||
((hard json) q.q.p.q.sih)
|
||||
::
|
||||
{$at ^}
|
||||
?. ?=({$& $js ^} q.sih)
|
||||
~& e+at-lost+p.tee
|
||||
$(tee q.tee)
|
||||
=* cay p.q.sih
|
||||
?> ?=(@ q.q.cay)
|
||||
?> ?=(@ q.q.p.q.sih)
|
||||
=+ cyz=(~(got by wup) p.tee)
|
||||
=^ jon ..ya ~(stat-json ya p.tee cyz)
|
||||
$(tee q.tee, q.q.p.q.sih (add-json jon q.q.cay))
|
||||
$(tee q.tee, q.q.p.q.sih (add-json jon q.q.p.q.sih))
|
||||
::
|
||||
{$ha *}
|
||||
%- emule |. ^+ ..apex
|
||||
?. ?=($& -.q.sih)
|
||||
(fail 404 p.sih p.q.sih)
|
||||
=* cay p.q.sih
|
||||
?. ?=($mime p.cay)
|
||||
?. ?=($mime p.p.q.sih)
|
||||
=+ bek=-:(need (tome p.tee))
|
||||
=+ bik=?+(r.bek bek {$ud $0} bek(r da+now))
|
||||
=- (execute tee bik [%flag [p.sih `~] -])
|
||||
=- `silk`[%cast %mime `[p.cay -]]
|
||||
?. ?=({$ud $0} r.bek) q.cay
|
||||
?+ p.cay q.cay :: inject dependency long-poll
|
||||
$urb =< (slam !>(.) q.cay)
|
||||
=- `silk`[%cast %mime `[p.p.q.sih -]]
|
||||
?. ?=({$ud $0} r.bek) q.p.q.sih
|
||||
?+ p.p.q.sih q.p.q.sih :: inject dependency long-poll
|
||||
$urb =< (slam !>(.) q.p.q.sih)
|
||||
|= urb/manx
|
||||
~| [%malformed-urb urb]
|
||||
?> ?=({{$html $~} {{$head $~} *} {{$body $~} *} $~} urb)
|
||||
(inject p.sih urb)
|
||||
==
|
||||
~| q.q.cay
|
||||
=+ ((hard {mit/mite rez/octs}) q.q.cay)
|
||||
~| q.q.p.q.sih
|
||||
=+ ((hard {mit/mite rez/octs}) q.q.p.q.sih)
|
||||
=+ dep=(crip "W/{(pojo %s (scot %uv p.sih))}")
|
||||
(give-thou 200 ~[etag+dep content-type+(moon mit)] ~ rez)
|
||||
==
|
||||
|
||||
@ -7979,8 +7979,7 @@
|
||||
?- -.mor
|
||||
$|
|
||||
?- -.p.mor
|
||||
$& ~& [%feel-lose mor]
|
||||
mor
|
||||
$& mor
|
||||
$|
|
||||
=+ fex=(mint(sut p.p.p.mor) %noun [%cnts [i.hyp ~] ~])
|
||||
[%| %| p.fex (comb q.p.p.mor q.fex)]
|
||||
@ -7989,7 +7988,7 @@
|
||||
$&
|
||||
=> :_ +
|
||||
:* axe=`axis`1
|
||||
lon=(weld p.p.mor nol)
|
||||
lon=p.p.mor
|
||||
heg=?^(i.hyp i.hyp [%| p=0 q=(some i.hyp)])
|
||||
^- ref/type
|
||||
?- -.q.p.mor
|
||||
@ -8038,20 +8037,21 @@
|
||||
=+ zem=(look u.q.heg q.r.q.ref)
|
||||
?~ zem [~ p.heg]
|
||||
?:(=(0 p.heg) [zem 0] [~ (dec p.heg)])
|
||||
~? =(%nu u.q.heg) [%core-zem zem]
|
||||
?^ zem
|
||||
[%& [`axe lon] %| p.u.zem [[ref(p.q %gold) q.u.zem] ~ ~]]
|
||||
=+ ^- {sam/? con/?}
|
||||
?: ?=($gold p.q.ref) [& &]
|
||||
?- way
|
||||
$both [| |]
|
||||
$free [& &]
|
||||
$read [?=($zinc p.q.ref) |]
|
||||
$rite [?=($iron p.q.ref) |]
|
||||
==
|
||||
?. sam lose
|
||||
?: con $(ref p.ref, axe (peg axe 3))
|
||||
$(ref (peek(sut p.ref) way 2), axe (peg axe 6))
|
||||
:+ %& [`axe lon]
|
||||
[%| (peg 2 p.u.zem) [[ref(p.q %gold) q.u.zem] ~ ~]]
|
||||
$(ref p.ref, axe (peg axe 3))
|
||||
:: =+ ^- {sam/? con/?}
|
||||
:: ?: ?=($gold p.q.ref) [& &]
|
||||
:: ?- way
|
||||
:: $both [| |]
|
||||
:: $free [& &]
|
||||
:: $read [?=($zinc p.q.ref) |]
|
||||
:: $rite [?=($iron p.q.ref) |]
|
||||
:: ==
|
||||
:: ?. sam lose
|
||||
:: ?: con $(ref p.ref, axe (peg axe 3))
|
||||
:: $(ref (peek(sut p.ref) way 2), axe (peg axe 6))
|
||||
::
|
||||
{$cube *}
|
||||
::
|
||||
@ -8086,7 +8086,6 @@
|
||||
::
|
||||
{$hold *}
|
||||
?: (~(has in gil) ref)
|
||||
~& [%hold-stop ref]
|
||||
[%| %& p.heg]
|
||||
$(gil (~(put in gil) ref), ref repo(sut ref))
|
||||
==
|
||||
@ -9065,12 +9064,18 @@
|
||||
|= {way/?($read $rite $both $free) hyp/wing}
|
||||
^- port
|
||||
=+ ^- old/port (seel way hyp)
|
||||
=. old
|
||||
?- -.q.old
|
||||
$& old
|
||||
$|
|
||||
:^ p.old %| p.q.old
|
||||
(~(tap in (~(gas in *(set (pair type foot))) q.q.old)) ~)
|
||||
==
|
||||
=+ ^- new/port
|
||||
~| [%seek-miss [way hyp] ~]
|
||||
=+ fid=(feel way hyp)
|
||||
?. ?=($& -.fid)
|
||||
~& [%seek-hyp hyp]
|
||||
~& [%seek-old old]
|
||||
~& [%seek-fid fid]
|
||||
~& [%seek-fail fid]
|
||||
!!
|
||||
@ -9079,9 +9084,13 @@
|
||||
(peg $(p.p.fid t.p.p.fid) ?~(i.p.p.fid 1 u.i.p.p.fid))
|
||||
?- -.q.p.fid
|
||||
$& q.p.fid
|
||||
$| [%| p.q.p.fid (~(tap by q.q.p.fid) ~)]
|
||||
$| [%| p.q.p.fid (~(tap in q.q.p.fid) ~)]
|
||||
==
|
||||
~? !=(p.old p.new) [%axis-mismatch [way hyp] p.old p.new]
|
||||
~? !=(old new) [%full-mismatch [way hyp]]
|
||||
~? !=(old new) [%full-old old]
|
||||
~? !=(old new) [%full-new new]
|
||||
?> =(old new)
|
||||
old
|
||||
::
|
||||
++ seep
|
||||
|
||||
@ -363,16 +363,15 @@
|
||||
=< ?+(. [%& .] {@ *} .)
|
||||
|- ^- ?((list {cage cage}) (each $~ tang))
|
||||
?~ p.gag ~
|
||||
=* hed i.p.gag
|
||||
?- -.p.hed
|
||||
?- -.p.i.p.gag
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
$| (mule |.(`$~`(ford-fail p.p.hed)))
|
||||
$| (mule |.(`$~`(ford-fail p.p.i.p.gag)))
|
||||
$&
|
||||
?- -.q.hed
|
||||
?- -.q.i.p.gag
|
||||
$tabl (mule |.(`$~`(ford-fail >%strange-gage< ~)))
|
||||
$| (mule |.(`$~`(ford-fail p.q.hed)))
|
||||
$| (mule |.(`$~`(ford-fail p.q.i.p.gag)))
|
||||
$& =+ $(p.gag t.p.gag)
|
||||
?+(- [[p.p p.q]:hed -] {@ *} -)
|
||||
?+(- [[p.p p.q]:i.p.gag -] {@ *} -)
|
||||
==
|
||||
==
|
||||
::
|
||||
|
||||
Loading…
Reference in New Issue
Block a user