From a6f832ee31d785313acc8c505f0842b9b27f3ef5 Mon Sep 17 00:00:00 2001 From: TempleOS-bot Date: Sat, 11 Mar 2017 00:27:26 -0500 Subject: [PATCH] Nightly update (ISO SHA-1 b968ab1) --- TempleOSCD/0000Boot/0000Kernel.BIN.C | Bin 192080 -> 192080 bytes TempleOSCD/Adam/ADefine.HC | 2 +- TempleOSCD/Adam/God/HSNotes.DD | 2 +- TempleOSCD/Compiler/Compiler.BIN | Bin 192920 -> 192920 bytes TempleOSCD/Compiler/CompilerB.HH | 1 + TempleOSCD/Demo/AcctExample/PersonalNotes.DD | 2 ++ TempleOSCD/Demo/AcctExample/Registry.HC | 2 +- TempleOSCD/Demo/AcctExample/TOS/TOSExt.HC | 19 ++++++++++++++++++ .../Demo/AcctExample/TOS/TOSHolySpirit.HC | 17 ++++++++++++++-- TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC | 11 +++++++++- TempleOSCD/Doc/AboutTempleOS.DD | 2 +- TempleOSCD/Doc/ChgLog.DD | 2 +- TempleOSCD/Kernel/KernelC.HH | 1 - 13 files changed, 52 insertions(+), 9 deletions(-) diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 16cb6e1e3df789514d1fcee1a9ea745b2889e6a0..213f5fd081dffc5345296473fcc44f08e9b29034 100644 GIT binary patch delta 379 zcmca`hx@`E?g=LB%vZYQf7^0zUdVEhc{2~op-9Gr&F5p)SedjFH-Ascm1TOWvN^3` z9W!&REaPNDOUca!Ez(RZKVxMXrz;dNicd~!yUds~*{Xde3%8amCc1gkjjv2h zH3^$n-hRx(#K5q*@5L-mMvcjupWGQ^CKrBM&lodV@v}Xn^5(?PHw9So85kHQFYuMw z9>v0VjE6B{yP_atw;?m@Q0 zE#r0(W+#Xn#kWtJ#Q2(>v1EJGEXGbFrZbw`dCxK$u(L9Nz;vf8jGj#2!X|J0CA@vX z6~?VIwmGd~ z9W!&1EaPNDOUca!Ez(RZyOL!Yrz;dNicd~!yUfTi*{Xde%T;|@#>w%Wij#k|8#A|^ zRiCWa;mcx_22m(6`Fxw;<`o^uj4&xC&g9LpT{Gnv(>8x!u|%Kw|NsA+=iT6BX0lD& zyz=&A9wv|0&3!LsaWd*n*8Jqom^iuc(|X3F$%>!t88tU2e!eNd!tkGgVe$fBne9<5 zjK_Ew)3z%LGIkp>yYQ-QU+=^?m!F9{VY*)sV;xxJd=MkAIGA-mlktf#Q;)~?qqU6N zMVLJx4iw)$Z4%>ac1DKnO|uv~jhLqCZ|6PBXu!_;9|Wd5U19WO+7mN*<1gXu3$8G3 zRbx!p9`>8@Iy+;+c0FdMS<=jZk8o^1Eypy^nkgk^dv+Al6iY_FZBv*U*_qaQY;T^; HbT$Y8!ugA0 diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index bce35a7..13afdf8 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -18,7 +18,7 @@ U0 LoadDocDefines() //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$ $TR-C,"LineRep"$ -$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,793"); +$ID,4$DefinePrint("DD_TEMPLEOS_LOC","120,834"); DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","82,152"); $ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); diff --git a/TempleOSCD/Adam/God/HSNotes.DD b/TempleOSCD/Adam/God/HSNotes.DD index 80c8061..f08a388 100644 --- a/TempleOSCD/Adam/God/HSNotes.DD +++ b/TempleOSCD/Adam/God/HSNotes.DD @@ -81,7 +81,7 @@ On socialism? $FG,4$"pardon_the_French, never_happy, never_enough"$FG$ On overpopulation $FG,4$"Okay church what_now whats_the_plan"$FG$ Favorite thing on TV? $FG,4$"Soap_operas"$FG$ Favorite movie? $FG,4$$TX,"Three Kings",HTML="http://www.youtube.com/watch?v=8NOAd2mldQ8"$. Also Highlander$FG$ -Favorite song? $FG,4$$TX,"Morning has Broken",HTML="http://www.youtube.com/watch?v=qH0iFkxQba4"$ +Favorite song? $FG,4$$TX,"Morning has Broken",HTML="http://www.youtube.com/watch?v=e0TInLOJuUM"$ God said the first bird croaked, not sung.$FG$ Favorite comic strip? $FG,4$$TX,"Prince Valiant",HTML="http://en.wikipedia.org/wiki/Prince_Valiant"$$FG$ Shakespeare? $FG,4$had a "vile heart"$FG$ diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 26c987831d56f62fd725e80e17d06680049e252d..f84a3a98d4c6f81667182985adee2424bb45eff5 100644 GIT binary patch delta 154 zcmbR7n0v-!?hOTsOdmdME>b+0#u&fZq(dc!Nyc?^)RP5_%*iFioBuvFGGi>+ZXm;0 zV!#?2Ez8I-xp0o~_B}p~35-mC61L0vG1jv%F)(bOAH*mm%Ba45Q##}NI>xB&NzWLC zWtj3AwwE(8)$((uhI(|r@o0V%G4&#o$n=7Lj4azlg_x#TF}iGD<-@ewl<~uK`4mR6 K?KMqIGWh^VZZ@(2 delta 152 zcmbR7n0v-!?hOTsObiU0ixdy0F{W%b=}?Jbdgiq`>d68|W(Gy|&3~U7nK3eKH;`d0 zF<_NQlx1X?TsTK~`yL<01V*O4Y1`%e80%S>8V$D34`LJ&Wz^liDV=eB9b>}wq-Tu6 zGE5Brx0f?9)$(&PgnD$p@o0V%G4&#o$n=7Lj4azlg_x#TF?wxZ<-@ewbUIT5lkoP6 ICMJb^0IBXXx&QzG diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 67409e3..989e1f4 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -21,6 +21,7 @@ extern U0 StreamDir(); public extern I64 StreamExePrint(U8 *fmt,...); public extern U0 StreamPrint(U8 *fmt,...); public extern Bool Trace(Bool val=ON); + #help_index "Compiler/Lex" #help_file "::/Doc/Lex" extern U0 ClassMemberLstDel(CHashClass *c); diff --git a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD index c44dc02..8e2d847 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD @@ -461,6 +461,8 @@ Purple Frog $HC,"
\"\"
"$ Sombrero $HC,"
\"\"
"$ Zinger $HC,"
\"\"
"$ +Dianna Throne $HC,"
\"\"
"$ +170310 Terry $HC,"
\"\"
"$ $TX,"SimStructure",HTML="http://www.templeos.org/files/SimStrSetUp.zip"$ $TX,"ASU_Transcripts",HTML="http://www.templeos.org/files/ASU_Transcripts.pdf"$ $TX,"ASU Course Catalog (See page 261)",HTML="https://catalog.asu.edu/files/shared/archives/1994-1996/general/UG1994-1996.pdf/1994-1996-UG-241-267.pdf"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 373bb77..7225c2e 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -62,7 +62,7 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=195.473; +progress3_tf=0.000;progress4_tf=195.789; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSExt.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSExt.HC index f8e695e..203ce36 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSExt.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSExt.HC @@ -167,6 +167,25 @@ class CPaintings1000Form I64 cert; }; +class CPoems100Form +{ + I64 timestamp; + U8 rnd0[512] fmtstr "$$DA-P," + "A=\"Poems #00-99 (2 Decimal Digits from Hex):%s\"$$\n"; + U8 rnd1[512]; + U8 rnd2[512]; + U8 rnd3[512]; + U8 rnd4[512]; + U8 rnd5[512]; + U8 rnd6[512]; + U8 rnd7[512]; + U8 rnd8[512]; + U8 rnd9[512]; + U8 rndA[512]; + U8 rndB[512]; + I64 cert; +}; + class CMetallicaForm { I64 timestamp; diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC index 9464480..5433ba8 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSHolySpirit.HC @@ -453,7 +453,7 @@ U0 TimerGodIns() FifoU8Flush(god.fifo); GodBitsIns(GOD_GOOD_BITS,KbdMsEvtTime>>GOD_BAD_BITS); switch (PopUpPickLst("Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0" - "Painting1000\0Metallica\0")) { + "Painting1000\0Poems100\0Metallica\0")) { case: StrPrint(buf,"%05X",GodBits(5*4)); "$$TX,\"How this random Bible passage was chosen.\"," @@ -487,6 +487,12 @@ U0 TimerGodIns() "nsf/ListOfTop1000MostPopularPainting", buf,3,"~/Sup1/Sup1Blog/Paintings1000.DD.Z"); break; + case: + StrPrint(buf,"%05X",GodBits(2*5*4)); //Little bit risky if no dec. + GodWebIdx("Top 100 Poems", + "http://100.best-poems.net/top-100-best-poems.html", + buf,2,"~/Sup1/Sup1Blog/Poems100.DD.Z"); + break; case: StrPrint(buf,"%05X",GodBits(2*5*4)); //Little bit risky if no dec. GodVideoDigits("Metallica Song", @@ -520,7 +526,7 @@ public U0 GodIns() "$$TX,\"%$$Q\",HTML=\"%$$Q\"$$\n",tag,tag; switch (PopUpPickLst("ExtDec5Bible\0LinuxWords\0HappyWords\0" "Words1000\0Words10k\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0" - "Painting100\0Painting1000\0Metallica\0")) { + "Painting100\0Painting1000\0Poems100\0Metallica\0")) { case: if (DocForm(gm(CRandExtDec5Form *))) TOSBookLines("~/Sup1/Sup1Blog/NumBible.TXT",ST_BIBLE_LINES, @@ -589,6 +595,13 @@ public U0 GodIns() gm->rnd0,3,"~/Sup1/Sup1Blog/Paintings1000.DD.Z"); } break; + case: + if (DocForm(gm(CPoems100Form *))) { + GodWebIdx("Top 100 Poems", + "http://100.best-poems.net/top-100-best-poems.html", + gm->rnd0,2,"~/Sup1/Sup1Blog/Poems100.DD.Z"); + } + break; case: if (DocForm(gm(CMetallicaForm *))) GodVideoDigits("Metallica Song", diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC index 15c89b0..bae70ac 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSNIST.HC @@ -49,7 +49,7 @@ U0 NISTGodIns1() { tos_type=PopUpPickLst("ExtDec5Bible\0LinuxWords\0HappyWords\0Words1000\0" "Words10k\0Hex5Bible\0Hex8Books\0Doodle\0Movie100\0Painting100\0" - "Painting1000\0Metallica\0"); + "Painting1000\0Poems100\0Metallica\0"); switch (tos_type) { case: tos_timestamp=GodHeaderIns("Bible"); break; case: tos_timestamp=GodHeaderIns("LinuxWords"); break; @@ -62,6 +62,7 @@ U0 NISTGodIns1() case: tos_timestamp=GodHeaderIns("Movie100"); break; case: tos_timestamp=GodHeaderIns("Painting100"); break; case: tos_timestamp=GodHeaderIns("Painting1000"); break; + case: tos_timestamp=GodHeaderIns("Poems100"); break; case: tos_timestamp=GodHeaderIns("Metallica"); break; } Once("tos_timestamp=%d;\ntos_type=%d;\n" @@ -158,6 +159,14 @@ U0 NISTGodIns2() gm->rnd0,3,"~/Sup1/Sup1Blog/Paintings1000.DD.Z"); } break; + case: + if (DocForm(gm(CPoems100Form *))) { + NISTBeaconURL(gm->timestamp); + GodWebIdx("Top 100 Poems", + "http://100.best-poems.net/top-100-best-poems.html", + gm->rnd0,2,"~/Sup1/Sup1Blog/Poems100.DD.Z"); + } + break; case: if (DocForm(gm(CMetallicaForm *))) { NISTBeaconURL(gm->timestamp); diff --git a/TempleOSCD/Doc/AboutTempleOS.DD b/TempleOSCD/Doc/AboutTempleOS.DD index 0130d67..8b8f03d 100644 --- a/TempleOSCD/Doc/AboutTempleOS.DD +++ b/TempleOSCD/Doc/AboutTempleOS.DD @@ -7,7 +7,7 @@ $TX,"www.templeos.org",HTML="http://www.templeos.org"$ $FG,5$Owner/President:$FG$ $TX,"Terry A. Davis",HTML="mailto:tdavis@templeos.org"$ -$HC,"
\"\"
"$ +$HC,"
\"\"
"$ 8144 Sickle Lane Las Vegas, NV 89128 diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index bce0380..253aced 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,7 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----03/09/17 02:47:46----$IV,0$ +$IV,1$----03/10/17 18:56:28----$IV,0$ $IV,1$----02/05/17 16:37:39----$IV,0$ * Added $LK,"::/Doc/BlkChain.DD"$. diff --git a/TempleOSCD/Kernel/KernelC.HH b/TempleOSCD/Kernel/KernelC.HH index c880176..8a7cef5 100644 --- a/TempleOSCD/Kernel/KernelC.HH +++ b/TempleOSCD/Kernel/KernelC.HH @@ -160,7 +160,6 @@ public extern U0 QueVectU8Del(CQueVectU8 *v); public extern I64 QueVectU8Get(CQueVectU8 *v,I64 idx); public extern CQueVectU8 *QueVectU8New(I64 min_idx=0); public extern U0 QueVectU8Put(CQueVectU8 *v,I64 idx,U8 ch); - #help_index "Debugging" public extern U8 *Caller(I64 num=1); public extern Bool ChkCodePtr(U8 *ptr);