From ac488f6225a481b7924b9814ede6cd755280fd92 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Fri, 18 Jul 2014 19:45:10 -0700 Subject: [PATCH] We are very close to the memory limit on :solid! --- arvo/ford.hoon | 10 ++- arvo/hoon.hoon | 26 +------ arvo/zuse.hoon | 191 ++----------------------------------------------- 3 files changed, 15 insertions(+), 212 deletions(-) diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 06ee62ed1..1a8238b68 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -1,4 +1,4 @@ -!::::: +:::::: :: :: %ford, new execution control !? 164 :::: @@ -371,7 +371,7 @@ |= gef=gift %_(+> mow :_(mow [hen %give gef])) :: - ++ fade :: compile %hood + ++ fade :: compile %hoo |= [cof=cafe bem=beam rem=spur] ^- (bolt hood) =+ rul=(fair bem rem) @@ -516,6 +516,12 @@ |= [cof=cafe arc=arch] ?^ q.arc (cope (liar cof bem) (lake for bek)) + ?: (~(has by r.arc) %hood) + %+ cope (fade cof bem rem) + |= [cof=cafe hyd=hood] + %+ cope (abut:(meow bem rem) cof hyd) + |= [cof=cafe vax=vase] + (fine cof ~ vax) ?: (~(has by r.arc) %hook) %+ cope (krab cof for %hook bem rem) |= [cof=cafe vax=vase] diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 4c791069f..a103898fc 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -1432,8 +1432,6 @@ ?: (zer b p n) [~ "0"] ~ -- - - :::::::::::: ++ add |= [b=@u p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- [s=? e=@s a=@u] @@ -3562,7 +3560,7 @@ (stag ~ zust) (stag %many (ifix [cab ;~(plug cab cab)] (more cab nusk))) == - ++ royl !: + ++ royl =+ ^= zer (cook lent (star (just '0'))) =+ ^= voy @@ -9457,7 +9455,6 @@ :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: :::::: volume 3, Arvo models and skeleton :::::: :::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: -!: |% ++ arch ,[p=@uvI q=(unit ,@uvI) r=(map ,@ta ,~)] :: fundamental node ++ arvo (mold ,[p=term q=mill] mill) :: arvo card @@ -9536,7 +9533,7 @@ == :: ++ wire path :: event pretext ::::: hacks -++ slod !: +++ slod |= sed=sled ^- slut |= raw=* @@ -9559,27 +9556,10 @@ ?~ bop ~ ?~ u.bop [~ ~] [~ ~ q.q.u.u.bop] -:: -++ slub !: - |= sul=slut - ^- sled - |= [fur=(unit (set monk)) ron=term bed=beam] - ^- (unit (unit cage)) - =+ ^= pax ^- path - :* ron - (scot %p p.bed) - q.bed - (scot r.bed) - (flop s.bed) - == - =+ bop=(sul pax) - ?~ bop ~ - ?~ u.bop [~ ~] - [~ ~ [%$ %noun u.u.bop]] :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 3bE, Arvo core :: :: -++ vent !: :: vane core +++ vent :: vane core |= [lal=@tas vil=vile bud=vase ves=vase] |% ++ ruck :: update vase diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index c6a0246fa..8be3386f4 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -232,7 +232,7 @@ ~|(%test-fail-seal !!) msg :: -++ crub !: :: cryptosuite B (Ed) +++ crub :: cryptosuite B (Ed) ^- acru =| [puc=pass sed=ring] => |% @@ -987,7 +987,7 @@ %- flop myz:(dist:(zu ank) %c bus) :: -++ ze !: +++ ze |_ [lim=@da dome] ++ aeon :: aeon:ze |= lok=case :: act count through @@ -1528,7 +1528,7 @@ +>(ank ank:(durn:(zu ank) nyp)) -- :: -++ zu !: :: filesystem +++ zu :: filesystem |= ank=ankh :: filesystem state =| myz=(list tako) :: changes in reverse =| ram=path :: reverse path into @@ -2067,190 +2067,7 @@ |= lag=lang ^- (unit tape) ?+ lag ~ - %aa [~ "Afar"] - %ab [~ "Abkhazian"] - %ae [~ "Avestan"] - %af [~ "Afrikaans"] - %ak [~ "Akan"] - %am [~ "Amharic"] - %an [~ "Aragonese"] - %ar [~ "Arabic"] - %as [~ "Assamese"] - %av [~ "Avaric"] - %ay [~ "Aymara"] - %az [~ "Azerbaijani"] - %ba [~ "Bashkir"] - %be [~ "Belarusian"] - %bg [~ "Bulgarian"] - %bh [~ "Bihari"] - %bi [~ "Bislama"] - %bm [~ "Bambara"] - %bn [~ "Bengali"] - %bo [~ "Tibetan"] - %br [~ "Breton"] - %bs [~ "Bosnian"] - %ca [~ "Catalan"] - %ce [~ "Chechen"] - %ch [~ "Chamorro"] - %co [~ "Corsican"] - %cr [~ "Cree"] - %cs [~ "Czech"] - %cu [~ "Slavonic"] - %cv [~ "Chuvash"] - %cy [~ "Welsh"] - %da [~ "Danish"] - %de [~ "German"] - %dv [~ "Maldivian"] - %dz [~ "Dzongkha"] - %ee [~ "Ewe"] - %el [~ "Greek"] - %en [~ "English"] - %eo [~ "Esperanto"] - %es [~ "Spanish"] - %et [~ "Estonian"] - %eu [~ "Basque"] - %fa [~ "Persian"] - %ff [~ "Fulah"] - %fi [~ "Finnish"] - %fj [~ "Fijian"] - %fo [~ "Faroese"] - %fr [~ "French"] - %fy [~ "Frisian"] - %ga [~ "Irish Gaelic"] - %gd [~ "Scottish Gaelic"] - %gl [~ "Galician"] - %gn [~ "Guarani"] - %gu [~ "Gujarati"] - %gv [~ "Manx"] - %ha [~ "Hausa"] - %he [~ "Hebrew"] - %hi [~ "Hindi"] - %ho [~ "Hiri Motu"] - %hr [~ "Croatian"] - %ht [~ "Haitian Creole"] - %hu [~ "Hungarian"] - %hy [~ "Armenian"] - %hz [~ "Herero"] - %ia [~ "Interlingua"] - %id [~ "Indonesian"] - %ie [~ "Occidental"] - %ig [~ "Igbo"] - %ii [~ "Nuosu"] - %ik [~ "Inupiaq"] - %io [~ "Ido"] - %is [~ "Icelandic"] - %it [~ "Italian"] - %iu [~ "Inuktitut"] - %ja [~ "Japanese"] - %jv [~ "Javanese"] - %ka [~ "Georgian"] - %kg [~ "Kongo"] - %ki [~ "Kikuyu"] - %kj [~ "Kwanyama"] - %kk [~ "Kazakh"] - %kl [~ "Kalaallisut"] - %km [~ "Central Khmer"] - %kn [~ "Kannada"] - %ko [~ "Korean"] - %kr [~ "Kanuri"] - %ks [~ "Kashmiri"] - %ku [~ "Kurdish"] - %kv [~ "Komi"] - %kw [~ "Cornish"] - %ky [~ "Kyrgyz"] - %la [~ "Latin"] - %lb [~ "Luxembourgish"] - %lg [~ "Ganda"] - %li [~ "Limburgish"] - %ln [~ "Lingala"] - %lo [~ "Lao"] - %lt [~ "Lithuanian"] - %lu [~ "Luba-Katanga"] - %lv [~ "Latvian"] - %mg [~ "Malagasy"] - %mh [~ "Marshallese"] - %mi [~ "Maori"] - %mk [~ "Macedonian"] - %ml [~ "Malayalam"] - %mn [~ "Mongolian"] - %mr [~ "Marathi"] - %ms [~ "Malay"] - %mt [~ "Maltese"] - %my [~ "Burmese"] - %na [~ "Nauru"] - %nb [~ "Norwegian Bokmål"] - %nd [~ "North Ndebele"] - %ne [~ "Nepali"] - %ng [~ "Ndonga"] - %nl [~ "Dutch"] - %nn [~ "Norwegian Nynorsk"] - %no [~ "Norwegian"] - %nr [~ "South Ndebele"] - %nv [~ "Navajo"] - %ny [~ "Chichewa"] - %oc [~ "Occitan"] - %oj [~ "Ojibwa"] - %om [~ "Oromo"] - %or [~ "Oriya"] - %os [~ "Ossetian"] - %pa [~ "Punjabi"] - %pi [~ "Pali"] - %pl [~ "Polish"] - %ps [~ "Pashto"] - %pt [~ "Portuguese"] - %qu [~ "Quechua"] - %rm [~ "Romansh"] - %rn [~ "Rundi"] - %ro [~ "Romanian"] - %ru [~ "Russian"] - %rw [~ "Kinyarwanda"] - %sa [~ "Sanskrit"] - %sc [~ "Sardinian"] - %sd [~ "Sindhi"] - %se [~ "Northern Sami"] - %sg [~ "Sango"] - %si [~ "Sinhala"] - %sk [~ "Slovak"] - %sl [~ "Slovenian"] - %sm [~ "Samoan"] - %sn [~ "Shona"] - %so [~ "Somali"] - %sq [~ "Albanian"] - %sr [~ "Serbian"] - %ss [~ "Swati"] - %st [~ "Sotho"] - %su [~ "Sundanese"] - %sv [~ "Swedish"] - %sw [~ "Swahili"] - %ta [~ "Tamil"] - %te [~ "Telugu"] - %tg [~ "Tajik"] - %th [~ "Thai"] - %ti [~ "Tigrinya"] - %tk [~ "Turkmen"] - %tl [~ "Tagalog"] - %tn [~ "Tswana"] - %to [~ "Tonga"] - %tr [~ "Turkish"] - %ts [~ "Tsonga"] - %tt [~ "Tatar"] - %tw [~ "Twi"] - %ty [~ "Tahitian"] - %ug [~ "Uighur"] - %uk [~ "Ukrainian"] - %ur [~ "Urdu"] - %uz [~ "Uzbek"] - %ve [~ "Venda"] - %vi [~ "Vietnamese"] - %vo [~ "Volapük"] - %wa [~ "Walloon"] - %wo [~ "Wolof"] - %xh [~ "Xhosa"] - %yi [~ "Yiddish"] - %yo [~ "Yoruba"] - %za [~ "Zhuang"] - %zh [~ "Chinese"] - %zu [~ "Zulu"] + %en [~ "English"] :: deleted others, memory crunch! == :: ++ gnow