Now only one descent mechanism.

This commit is contained in:
C. Guy Yarvin 2015-12-25 20:09:27 -05:00
parent feaaa13e06
commit 7dab136dc9

View File

@ -7491,30 +7491,6 @@
== ==
-- --
:: ::
++ cola
|= {pol/? hyp/wing ref/type}
^- type
=< q
(tuck %both hyp |=(a/type ?:(pol (fuse(sut a) ref) (crop(sut a) ref))))
::
++ colo
|= {pol/? hyp/wing ref/type}
^- type
=+ old=(cool pol hyp ref)
=+ new=(cola pol hyp ref)
?. ?| =(old new)
?& (nest(sut old) | new)
(nest(sut new) | old)
==
==
~& [%colo pol hyp]
~& [%colo-sut sut]
~& [%colo-ref ref]
~& [%colo-old old]
~& [%colo-new new]
!!
old
::
++ cool ++ cool
|= {pol/? hyp/wing ref/type} |= {pol/? hyp/wing ref/type}
^- type ^- type
@ -8357,12 +8333,12 @@
:: ::
++ chip ++ chip
~/ %chip ~/ %chip
|= {way/? gen/twig} ^- type |= {how/? gen/twig} ^- type
?: ?=({$wtts *} gen) ?: ?=({$wtts *} gen)
(cola way q.gen (play ~(bunt al [%herb p.gen]))) (cool how q.gen (play ~(bunt al [%herb p.gen])))
?: ?&(way ?=({$wtpm *} gen)) ?: ?&(how ?=({$wtpm *} gen))
|-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen)))) |-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
?: ?&(!way ?=({$wtbr *} gen)) ?: ?&(!how ?=({$wtbr *} gen))
|-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen)))) |-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
=+ neg=~(open ap gen) =+ neg=~(open ap gen)
?:(=(neg gen) sut $(gen neg)) ?:(=(neg gen) sut $(gen neg))
@ -9033,6 +9009,30 @@
^- axis ^- axis
?~(vit 1 (peg $(vit t.vit) ?~(i.vit 1 u.i.vit))) ?~(vit 1 (peg $(vit t.vit) ?~(i.vit 1 u.i.vit)))
:: ::
++ cola
|= {pol/? hyp/wing ref/type}
^- type
=< q
(tuck %both hyp |=(a/type ?:(pol (fuse(sut a) ref) (crop(sut a) ref))))
::
++ colo
|= {pol/? hyp/wing ref/type}
^- type
=+ old=(cool pol hyp ref)
=+ new=(cola pol hyp ref)
?. ?| =(old new)
?& (nest(sut old) | new)
(nest(sut new) | old)
==
==
~& [%colo pol hyp]
~& [%colo-sut sut]
~& [%colo-ref ref]
~& [%colo-old old]
~& [%colo-new new]
!!
old
::
++ tuck ++ tuck
|= {way/?($read $rite $both $free) hyp/wing duz/$+(type type)} |= {way/?($read $rite $both $free) hyp/wing duz/$+(type type)}
~| [%tuck hyp] ~| [%tuck hyp]
@ -9051,25 +9051,22 @@
{$fork *} (fork $(sut p.sut) $(sut q.sut)) {$fork *} (fork $(sut p.sut) $(sut q.sut))
{$hold *} $(sut repo) {$hold *} $(sut repo)
== ==
=| vil/(set type)
|- ^- type |- ^- type
?: =(1 u.i.vit) ?: =(1 u.i.vit)
^$(vit t.vit) ^$(vit t.vit)
=+ [now lat]=(cap u.i.vit)^(mas u.i.vit) =+ [now lat]=(cap u.i.vit)^(mas u.i.vit)
?- sut ?- sut
$noun $(sut [%cell %noun %noun]) $noun $(sut [%cell %noun %noun])
$void ^$(vit t.vit) $void %void
{$atom *} %void {$atom *} %void
{$bull *} (bull p.sut $(sut q.sut)) {$bull *} (bull p.sut $(sut q.sut))
{$cell *} ?: =(2 now) {$cell *} ?: =(2 now)
(cell $(sut p.sut, u.i.vit lat) q.sut) (cell $(sut p.sut, u.i.vit lat) q.sut)
(cell p.sut $(sut q.sut, u.i.vit lat)) (cell p.sut $(sut q.sut, u.i.vit lat))
{$core *} ?>(=(3 now) (core $(sut p.sut, u.i.vit lat) q.sut)) {$core *} ?>(=(3 now) (core $(sut p.sut, u.i.vit lat) q.sut))
{$cube *} ^$(vit t.vit, sut q.sut) {$cube *} $(sut q.sut)
{$face *} (face p.sut $(sut q.sut)) {$face *} (face p.sut $(sut q.sut))
{$fork *} :: ?: (~(has in vil) sut) %void {$fork *} (fork $(sut p.sut) $(sut q.sut))
=. vil (~(put in vil) sut)
(fork $(sut p.sut) $(sut q.sut))
{$hold *} $(sut repo) {$hold *} $(sut repo)
== ==
:: ::