diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 94d49d4..ea4eb31 100644 Binary files a/TempleOSCD/0000Boot/0000Kernel.BIN.C and b/TempleOSCD/0000Boot/0000Kernel.BIN.C differ diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index 2ba267d..701d3e1 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/TempleOSCD/Adam/ADefine.HC @@ -10,16 +10,17 @@ U0 LoadDocDefines() //This is cut and replaced when I generate a distro. //See $LK,"DD_TEMPLEOS_LOC",A="FF:::/Demo/AcctExample/TOS/TOSDistro.HC,DD_TEMPLEOS_LOC"$. - $TR-C,"LineRep"$ - $ID,4$DefinePrint("DD_TEMPLEOS_LOC","119,763"); -DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,933"); -$ID,-4$ + DefinePrint("DD_KERNEL","%08X",bfh); bfh(I64)+=bfh->file_size-1; DefinePrint("DD_KERNEL_END","%08X",bfh); //$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","119,822"); +DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","81,987"); +$ID,-4$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); DefinePrint("DD_MP_VECT_END","%08X", MP_VECT_ADDR+COREAP_16BIT_INIT_END-COREAP_16BIT_INIT-1); diff --git a/TempleOSCD/Adam/ARegistry.HC b/TempleOSCD/Adam/ARegistry.HC index 06f5537..5fbc78d 100644 --- a/TempleOSCD/Adam/ARegistry.HC +++ b/TempleOSCD/Adam/ARegistry.HC @@ -43,26 +43,14 @@ public Bool RegDft(U8 *path,U8 *val,Bool is_adam_entry=FALSE) public I64 RegExe(U8 *path) {//Execute doc tree branch in registry. RegCache; - return DocTreeBranchExe(sys_registry_doc,path); + return DocTreeExe(sys_registry_doc,path); } public Bool RegWrite(U8 *path,U8 *fmt,...) {//Rewrite doc tree branch in registry. - Bool res,unlock_doc; - CDocEntry *tree_branch,*start_indent,*end_indent; - U8 *buf=StrPrintJoin(NULL,fmt,argc,argv); + Bool res; RegCache; - unlock_doc=DocLock(sys_registry_doc); - if (res=DocTreeFind(sys_registry_doc,path, - &tree_branch,&start_indent,&end_indent)) - DocCut(sys_registry_doc,tree_branch,end_indent); - DocTreeMake(sys_registry_doc,path); - DocPrint(sys_registry_doc,"%s",buf); - if (DrvIsWritable(*sys_registry_doc->filename.name)) - DocWrite(sys_registry_doc); - if (unlock_doc) - DocUnlock(sys_registry_doc); - Free(buf); + res=DocTreeWriteJoin(sys_registry_doc,path,TRUE,fmt,argc,argv); return res; } @@ -85,24 +73,10 @@ public I64 RegCnt(U8 *path) } public Bool RegAppend(U8 *path,U8 *fmt,...) -{//Rewrite doc tree branch in registry. - Bool res,unlock_doc; - CDocEntry *tree_branch,*start_indent,*end_indent; - U8 *buf=StrPrintJoin(NULL,fmt,argc,argv); +{//Append to doc tree branch in registry. + Bool res; RegCache; - unlock_doc=DocLock(sys_registry_doc); - if (res=DocTreeFind(sys_registry_doc,path, - &tree_branch,&start_indent,&end_indent)) { - sys_registry_doc->cur_entry=end_indent; - sys_registry_doc->cur_col=sys_registry_doc->cur_entry->min_col; - } else - DocTreeMake(sys_registry_doc,path); - DocPrint(sys_registry_doc,"%s",buf); - if (DrvIsWritable(*sys_registry_doc->filename.name)) - DocWrite(sys_registry_doc); - if (unlock_doc) - DocUnlock(sys_registry_doc); - Free(buf); + res=DocTreeAppendJoin(sys_registry_doc,path,TRUE,fmt,argc,argv); return res; } diff --git a/TempleOSCD/Adam/DolDoc/DocClipBoard.HC b/TempleOSCD/Adam/DolDoc/DocClipBoard.HC index 3346890..352e75b 100644 --- a/TempleOSCD/Adam/DolDoc/DocClipBoard.HC +++ b/TempleOSCD/Adam/DolDoc/DocClipBoard.HC @@ -87,17 +87,18 @@ public U0 DocCut(CDoc *doc,CDocEntry *start,CDocEntry *end) {//Del start to end entry, including end points. Bool unlock_doc=DocLock(doc); CDocEntry *doc_e1; - while (start!=doc) { - doc_e1=start->next; - if (start==doc->cur_entry) { - doc->cur_entry=start->next; - doc->cur_col=doc->cur_entry->min_col; - } - DocEntryDel(doc,start); - if (start==end) - break; - start=doc_e1; - } + if (start!=doc && (start->last!=end || end==doc)) + do { + doc_e1=start->next; + if (start==doc->cur_entry) { + doc->cur_entry=start->next; + doc->cur_col=doc->cur_entry->min_col; + } + DocEntryDel(doc,start); + if (start==end) + break; + start=doc_e1; + } while (start!=doc); DocRemSoftNewLines(doc,NULL); if (unlock_doc) DocUnlock(doc); @@ -108,15 +109,16 @@ public CDoc *DocCopy(CDoc *doc,CDocEntry *start,CDocEntry *end) CDoc *doc2=DocNew; Bool unlock_doc=DocLock(doc); CDocEntry *doc_ne; - while (start!=doc) { - if (!Bt(doldoc.type_flags_data,start->type_u8)) { - doc_ne=DocEntryCopy(doc2,start); - QueIns(doc_ne,doc2->head.last); - } - if (start==end) - break; - start=start->next; - } + if (start!=doc && (start->last!=end || end==doc)) + do { + if (!Bt(doldoc.type_flags_data,start->type_u8)) { + doc_ne=DocEntryCopy(doc2,start); + QueIns(doc_ne,doc2->head.last); + } + if (start==end) + break; + start=start->next; + } while (start!=doc); if (unlock_doc) DocUnlock(doc); return doc2; diff --git a/TempleOSCD/Adam/DolDoc/DocTree.HC b/TempleOSCD/Adam/DolDoc/DocTree.HC index a283975..3dd1bae 100644 --- a/TempleOSCD/Adam/DolDoc/DocTree.HC +++ b/TempleOSCD/Adam/DolDoc/DocTree.HC @@ -1,9 +1,9 @@ -#help_index "DolDoc" +#help_index "DolDoc/Tree" public Bool DocTreeFind(CDoc *haystack_doc,U8 *needle_path, CDocEntry **_tree_entry=NULL, CDocEntry **_start_indent=NULL, CDocEntry **_end_indent=NULL) -{//Find registry-like tree widget start and end. +{//Find tree widget start and end. I64 i=0,k=0; U8 *st1=StrNew(needle_path),*st2=MAlloc(StrLen(needle_path)+1); Bool res=FALSE,unlock_doc=DocLock(haystack_doc); @@ -58,8 +58,16 @@ ft_done: return res; } +public Bool DocTreeFFind(U8 *name,U8 *path) +{//Find tree widget in file. + CDoc *doc=DocRead(name); + Bool res=DocTreeFind(doc,path); + DocDel(doc); + return res; +} + public Bool DocTreeMake(CDoc *doc,U8 *path) -{//Make registry-like tree widget. +{//Make tree widget. I64 i=0,j=I64_MIN,k=0; U8 *st1=StrNew(path), *st2=MAlloc(StrLen(path)+1), @@ -113,6 +121,73 @@ mt_done: return res; } +Bool DocTreeWriteJoin(CDoc *doc,U8 *path,Bool write,U8 *fmt,I64 argc,I64 *argv) +{//Rewrite doc tree branch. + CDocEntry *tree_branch,*start_indent,*end_indent; + U8 *buf=StrPrintJoin(NULL,fmt,argc,argv); + Bool res,unlock_doc=DocLock(doc); + if (res=DocTreeFind(doc,path, + &tree_branch,&start_indent,&end_indent)) { + DocCut(doc,start_indent->next,end_indent->last); + doc->cur_entry=start_indent->next; + doc->cur_col=doc->cur_entry->min_col; + } else + DocTreeMake(doc,path); + DocPrint(doc,"%s",buf); + if (write && DrvIsWritable(*doc->filename.name)) + DocWrite(doc); + if (unlock_doc) + DocUnlock(doc); + Free(buf); + return res; +} + +Bool DocTreeAppendJoin(CDoc *doc,U8 *path,Bool write,U8 *fmt,I64 argc,I64 *argv) +{//Append to doc tree branch. + CDocEntry *tree_branch,*start_indent,*end_indent; + U8 *buf=StrPrintJoin(NULL,fmt,argc,argv); + Bool res,unlock_doc=DocLock(doc); + if (res=DocTreeFind(doc,path, + &tree_branch,&start_indent,&end_indent)) { + doc->cur_entry=end_indent; + doc->cur_col=doc->cur_entry->min_col; + } else + DocTreeMake(doc,path); + DocPrint(doc,"%s",buf); + if (write && DrvIsWritable(*doc->filename.name)) + DocWrite(doc); + if (unlock_doc) + DocUnlock(doc); + Free(buf); + return res; +} + +public Bool DocTreeWrite(CDoc *doc,U8 *path,Bool write=TRUE,U8 *fmt,...) +{//Rewrite doc tree branch. + return DocTreeWriteJoin(doc,path,write,fmt,argc,argv); +} + +public Bool DocTreeAppend(CDoc *doc,U8 *path,Bool write=TRUE,U8 *fmt,...) +{//Append to doc tree branch. + return DocTreeAppendJoin(doc,path,write,fmt,argc,argv); +} + +public Bool DocTreeFWrite(U8 *name,U8 *path,U8 *fmt,...) +{//Rewrite doc tree branch in file. + CDoc *doc=DocRead(name); + Bool res=DocTreeWriteJoin(doc,path,TRUE,fmt,argc,argv); + DocDel(doc); + return res; +} + +public Bool DocTreeFAppend(U8 *name,U8 *path,U8 *fmt,...) +{//Append to doc tree branch in file. + CDoc *doc=DocRead(name); + Bool res=DocTreeAppendJoin(doc,path,TRUE,fmt,argc,argv); + DocDel(doc); + return res; +} + #help_index "DolDoc/Compiler;Compiler" public I64 ExeDoc(CDoc *doc,I64 ccf_flags=0) {//JIT Compile and execute a document. @@ -141,8 +216,9 @@ public I64 ExeDoc(CDoc *doc,I64 ccf_flags=0) return res; } -public I64 DocTreeBranchExe(CDoc *doc,U8 *path) -{//JIT Compile and execute code in doc tree branch. +#help_index "DolDoc/Tree;DolDoc/Compiler;Compiler" +public I64 DocTreeExe(CDoc *doc,U8 *path) +{//Execute doc tree branch. CDoc *doc2; Bool unlock_doc=DocLock(doc); CDocEntry *tree_branch,*start_indent,*end_indent; @@ -157,11 +233,11 @@ public I64 DocTreeBranchExe(CDoc *doc,U8 *path) return res; } -public I64 ExeTreeBranch(U8 *registry_file,U8 *path) -{//JIT Compile and execute a specified branch in a specified file. +public I64 DocTreeFExe(U8 *name,U8 *path) +{//Execute doc tree branch in file. I64 res; - CDoc *doc=DocRead(registry_file); - res=DocTreeBranchExe(doc,path); + CDoc *doc=DocRead(name); + res=DocTreeExe(doc,path); DocDel(doc); return res; } diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index e349adb..b7ab9b9 100644 Binary files a/TempleOSCD/Compiler/Compiler.BIN and b/TempleOSCD/Compiler/Compiler.BIN differ diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 989e1f4..667f88f 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -11,7 +11,6 @@ public _extern _LAST_FUN I64 LastFun(I64 argc,I64 *argv); public extern I64 RunFile(U8 *name,I64 ccf_flags=0,...); public extern I64 RunFile2(U8 *name,I64 ccf_flags=0,...); public extern CCmpGlbls cmp; - #help_index "Compiler/Directive" #help_file "::/Doc/Directives" public extern Bool Echo(Bool val); diff --git a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD index bad2108..c6dd23e 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD @@ -1,8 +1,9 @@ $MA,"Cd ",LM="Cd;Dir;\n"$$MA,"DrvC ",LM="Drv('C');\n"$$MA,"DrvD ",LM="Drv('D');\n"$$MA,"/ ",LM="Cd(\"/\");Dir;\n"$$MA,"TOS ",LM="Cd(\"/Home/TOS\");Dir;\n"$$MA,"Home ",LM="Cd(\"/Home\");Dir;\n"$$MA,"ChgDskT ",LM="ChgDsk('T');\n"$$MA,"MergeD ",LM="S2T(\"C:/*\",\"+r+S\");Merge(\"C:/*;!*/LineRep*\",\"D:/*;!*/LineRep*\",\"+r+d\");\n"$$MA,"MergeT ",LM="S2T(\"C:/*\",\"+r+S\");Merge(\"C:/*;!*/LineRep*\",\"T:/*;!*/LineRep*\",\"+r+d\");\n"$$MA,"D:/Wb ",LM="Cd(\"D:/Wb\");Dir;\n"$ -$MA,"MakeC ",LM="TOSBootHDIns('C');\n"$$MA+PU,"BootC ",LM="BootRAM(\"C:/Kernel.BIN.C\");"$$MA,"Regen ",LM="TOSRegen;\n"$$MA,"PreRegen",LM="TOSPreRegen;\n"$$MA,"SongsIn ",LM="TOSSongsIn;\n"$$MA,"SongsOut",LM="TOSSongsOut;\n"$$MA,"MakeD ",LM="TOSBootHDIns('D');\n"$$MA+PU,"BootD ",LM="BootRAM(\"D:/Kernel.BIN.C\");"$$MA,"CopyDrv ",LM="TOSPmtAndCopyDrv;\n"$$MA,"MakeWeb ",LM="FreshenBlog;\n"$ +$MA,"MakeC ",LM="TOSBootHDIns('C');\n"$$MA+PU,"BootC ",LM="BootRAM(\"C:/Kernel.BIN.C\");"$$MA,"Regen ",LM="TOSRegen;\n"$$MA,"PreRegen",LM="TOSPreRegen;\n"$$MA,"MakeD ",LM="TOSBootHDIns('D');\n"$$MA+PU,"BootD ",LM="BootRAM(\"D:/Kernel.BIN.C\");"$$MA,"CopyDrv ",LM="TOSPmtAndCopyDrv;\n"$ $MA,"Kernel ",LM="Cd(\"/Kernel\");Dir;\n"$$MA,"Compiler",LM="Cd(\"/Compiler\");Dir;\n"$$MA,"BlkDev ",LM="Cd(\"/Kernel/BlkDev\");Dir;\n"$$MA,"Mem ",LM="Cd(\"/Kernel/Mem\");Dir;\n"$$MA,"Serial ",LM="Cd(\"/Kernel/SerialDev\");Dir;\n"$$MA,"Bin ",LM="Cd(\"/Home/Sup1/Sup1Bin\");Dir;\n"$$MA,"HDAudio ",LM="Cd(\"/Home/Sup1/Sup1HDAudio\");Dir;\n"$$MA,"Examples",LM="Cd(\"/Home/Sup1/Sup1HDAudio/Examples\");Dir;\n"$$MA,"Dist ",LM="Cd(\"/Home/Sup1/Sup1Distro\");Dir;\n"$ $MA,"Adam ",LM="Cd(\"/Adam\");Dir;\n"$$MA,"AutoComp",LM="Cd(\"/Adam/AutoComplete\");Dir;\n"$$MA,"Ctrls ",LM="Cd(\"/Adam/Ctrls\");Dir;\n"$$MA,"ABlkDev ",LM="Cd(\"/Adam/ABlkDev\");Dir;\n"$$MA,"DolDoc ",LM="Cd(\"/Adam/DolDoc\");Dir;\n"$$MA,"Gr ",LM="Cd(\"/Adam/Gr\");Dir;\n"$$MA,"God ",LM="Cd(\"/Adam/God\");Dir;\n"$$MA,"Snd ",LM="Cd(\"/Adam/Snd\");Dir;\n"$$MA,"Boot ",LM="Cd(\"/Adam/Opt/Boot\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Adam/Opt/Utils\");Dir;\n"$ $LK+X,"ChgLog ",A="FI:::/Doc/ChgLog.DD"$$MA,"Blog ",LM="Blog;\n"$$MA,"EdGod ",LM="Ed(\"D:/Home/God.DD\");\n"$$MA,"BlogDir ",LM="Cd(\"/Home/Web/TAD/BlogDir\");Dir;\n"$$MA,"Partial ",LM="FreshenBlog;\n"$$MA,"CodeWalk",LM="CodeWalkThru;\n"$$MA,"TOSTheme",LM="TOSTheme;\n"$$MA,"Videos ",LM="Cd(\"/Home/Sup1/Sup1Videos\");Dir;\n"$ +$MA-X+PU,"EdHymns ",LM="#include \"::/Apps/Psalmody/Load\";Psalmody(\"~/Sup1/Sup1Hymns\");"$$MA-X+PU,"EdSongs ",LM="#include \"::/Apps/Psalmody/Load\";Psalmody(\"~/Sup1/Sup1Songs\");"$$MA,"SongsIn ",LM="TOSSongsIn;\n"$$MA,"SongsOut",LM="TOSSongsOut;\n"$$MA,"HomeIn ",LM="TOSHomeIn;\n"$$MA,"HomeOut ",LM="TOSHomeOut;\n"$$MA,"MakeWeb ",LM="FreshenBlog;\n"$ $MA,"Web ",LM="Cd(\"/Home/Web\");Dir;\n"$$MA,"TAD ",LM="Cd(\"/Home/Web/TAD\");Dir;\n"$$MA,"AppStore",LM="Cd(\"/Home/Web/AppStore\");Dir;\n"$$MA,"Sup1 ",LM="Cd(\"/Home/Sup1\");Dir;\n"$$MA,"Blog ",LM="Cd(\"/Home/Sup1/Sup1Blog\");Dir;\n"$$MA,"Code ",LM="Cd(\"/Home/Sup1/Sup1CodeScraps\");Dir;\n"$$MA,"Games ",LM="Cd(\"/Home/Sup1/Sup1Games\");Dir;\n"$$MA,"Graphics",LM="Cd(\"/Home/Sup1/Sup1Graphics\");Dir;\n"$$MA,"Utils ",LM="Cd(\"/Home/Sup1/Sup1Utils\");Dir;\n"$ $MA,"Apps ",LM="Cd(\"/Apps\");Dir;\n"$$MA,"Budget ",LM="Cd(\"/Apps/Budget\");Dir;\n"$$MA,"GrModels",LM="Cd(\"/Apps/GrModels\");Dir;\n"$$MA,"KeepAway",LM="Cd(\"/Apps/KeepAway\");Dir;\n"$$MA,"Logic ",LM="Cd(\"/Apps/Logic\");Dir;\n"$$MA,"Psalmody",LM="Cd(\"/Apps/Psalmody\");Dir;\n"$$MA,"Span ",LM="Cd(\"/Apps/Span\");Dir;\n"$$MA,"Strut ",LM="Cd(\"/Apps/Strut\");Dir;\n"$$MA,"TimeClk ",LM="Cd(\"/Apps/TimeClock\");Dir;\n"$ $MA,"Titan ",LM="Cd(\"/Apps/Titanium\");Dir;\n"$$MA,"ToTheFrt",LM="Cd(\"/Apps/ToTheFront\");Dir;\n"$$MA,"Vocab ",LM="Cd(\"/Apps/Vocabulary\");Dir;\n"$$MA,"XCaliber",LM="Cd(\"/Apps/X-Caliber\");Dir;\n"$$MA,"Books1 ",LM="Cd(\"/Home/Books1\");Dir;\n"$$MA,"Books2 ",LM="Cd(\"/Home/Books2\");Dir;\n"$$MA,"Hymns ",LM="Cd(\"/Home/Sup1/Sup1Hymns\");Dir;\n"$$MA,"Songs ",LM="Cd(\"/Home/Sup1/Sup1Songs\");Dir;\n"$ diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index 9aae86d..6b7fdf7 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -31,7 +31,7 @@ $ID,2$F64 best_score=4.9425; $ID,-2$$TR,"TOSNIST"$ $ID,2$I64 tos_nist_offset=-8049; $ID,-2$$TR,"BlackDiamond"$ -$ID,2$I64 best_score=1; +$ID,2$I64 best_score=23; $ID,-2$$TR,"DunGen"$ $ID,2$F64 best_score=20.5295; $ID,-2$$TR,"CastleFrankenstein"$ @@ -51,8 +51,6 @@ $ID,2$F64 best_score=43.9944; $ID,-2$$TR,"OSTestSuite"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; progress3_tf=0.000;progress4_tf=228.734; -$ID,-2$$TR,"Titanium"$ -$ID,2$I64 best_score=16469; $ID,-2$$TR,"XCaliber"$ $ID,2$I64 best_score=90; I64 msg_flags=2; @@ -60,15 +58,12 @@ $ID,-2$$TR,"Talons"$ $ID,2$F64 best_score=9999.0000; $ID,-2$$TR,"BomberGolf"$ $ID,2$I64 best_score=175; +$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=185.280; +progress3_tf=0.000;progress4_tf=186.240; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ -$ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$ -$ID,2$$TR,"Game1"$ -$ID,2$F64 best_score=1735.08564; -$TR,"SimpleVal"$ -$ID,2$1236; -$ID,-2$$ID,-2$$ID,-2$ \ No newline at end of file +$ID,2$$ID,-2$$ID,-2$ \ No newline at end of file diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC index 1e63763..8eb07d6 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC @@ -189,7 +189,6 @@ I64 MakeLineRepFile() U8 *st; CDoc *doc; I64 res,official; - CDocEntry *tree_branch,*start_indent,*end_indent; DocClear; Drv('C'); @@ -219,15 +218,10 @@ I64 MakeLineRepFile() CopyTree("B:/TOS/TOS","C:/Home"); DelTree("B:/TOS/TOS"); - doc=DocRead("C:/Adam/ADefine.HC.Z"); - DocTreeFind(doc,"LineRep",&tree_branch,&start_indent,&end_indent); - DocCut(doc,start_indent->next,end_indent->last); - doc->cur_entry=start_indent->next; - doc->cur_col=0; - DocPrint(doc,"DefinePrint(\"DD_TEMPLEOS_LOC\",\"%,d\");\n",res); - DocPrint(doc,"DefinePrint(\"DD_TEMPLEOS_LOC_OFFICIAL\",\"%,d\");\n",official); - DocWrite(doc); - DocDel(doc); + DocTreeFWrite("C:/Adam/ADefine.HC.Z","LineRep", + "DefinePrint(\"DD_TEMPLEOS_LOC\",\"%,d\");\n",res); + DocTreeFAppend("C:/Adam/ADefine.HC.Z","LineRep", + "DefinePrint(\"DD_TEMPLEOS_LOC_OFFICIAL\",\"%,d\");\n",official); DefinePrint("DD_TEMPLEOS_LOC","%,d",res); DefinePrint("DD_TEMPLEOS_LOC_OFFICIAL","%,d",official); @@ -575,6 +569,18 @@ public U0 TOSPreRegen() Copy("D:/Home/Sup1/Sup1Bin/God*","C:/Linux"); } +public U0 TOSHomeIn() +{//Copy D:/Home to C:/Home + DelTree("C:/Home"); + CopyTree("D:/Home","C:/Home"); +} + +public U0 TOSHomeOut() +{//Copy C:/Home to D:/Home + DelTree("D:/Home"); + CopyTree("C:/Home","D:/Home"); +} + public U0 TOSSongsIn() {//Copy songs from D:/Home/Sup1 to C:/Home/Sup1 Del("C:/Home/Sup1/Sup1Hymns/*"); diff --git a/TempleOSCD/Doc/ChgLog.DD b/TempleOSCD/Doc/ChgLog.DD index ac4e77c..e8d1341 100644 --- a/TempleOSCD/Doc/ChgLog.DD +++ b/TempleOSCD/Doc/ChgLog.DD @@ -2,7 +2,9 @@ $WW,1$$FG,5$$TX+CX,"Change Log"$$FG$ Use $LK,"R",A="MN:R"$() to rename if I change a label. -$IV,1$----01/24/17 13:44:47----$IV,0$ +$IV,1$----01/24/17 18:15:33----$IV,0$ +* $LK,"R",A="MN:R"$("TreeBranch","Tree"); +* Added $LK,"DocTreeWrite",A="MN:DocTreeWrite"$() and $LK,"DocTreeAppend",A="MN:DocTreeAppend"$(). $IV,1$----01/22/17 06:08:00----$IV,0$ * $BK,1$TempleOS version 5.02 Released$BK,0$