From bf7568b83314b0579bb2dd78d9fe70288b84bbd1 Mon Sep 17 00:00:00 2001 From: xmm15 Date: Sat, 15 Feb 2020 21:41:28 -0600 Subject: [PATCH] BEqu -> BEqual, rqst -> request --- src/0000Boot/0000Kernel.BIN.C | Bin 190432 -> 190432 bytes src/Apps/GrModels/Models.HC | 2 +- src/Apps/Psalmody/PsalmodyMain.HC | 8 ++++---- src/Apps/ToTheFront/TTFMove.HC | 2 +- src/Apps/ToTheFront/TTFVis.HC | 6 +++--- src/Compiler/BackLib.HC | 2 +- src/Compiler/CMisc.HC | 2 +- src/Compiler/Compiler.BIN | Bin 194048 -> 194048 bytes src/Compiler/ParseExp.HC | 2 +- src/Compiler/ParseStatement.HC | 2 +- src/Demo/Games/FlatTops.HC | 6 +++--- src/Doc/Bit.DD | 2 +- src/Doc/Glossary.DD | 2 +- src/Kernel.BIN.C | Bin 190352 -> 190352 bytes src/Kernel/BlkDev/DiskATA.HC | 2 +- src/Kernel/BlkDev/DiskATAId.HC | 2 +- src/Kernel/BlkDev/DiskAddDev.HC | 2 +- src/Kernel/Job.HC | 20 ++++++++++---------- src/Kernel/KDebug.HC | 8 ++++---- src/Kernel/KMisc.HC | 12 ++++++------ src/Kernel/KTask.HC | 2 +- src/Kernel/KUtils.HC | 4 ++-- src/Kernel/Kernel.MAP | 8 ++++---- src/Kernel/KernelA.HH | 6 +++--- src/Kernel/KernelB.HH | 4 ++-- src/Kernel/KernelC.HH | 4 ++-- src/Kernel/KeyDev.HC | 2 +- src/Kernel/MultiProc.HC | 2 +- src/Kernel/SerialDev/Keyboard.HC | 10 +++++----- src/Kernel/SerialDev/Message.HC | 2 +- src/Kernel/SerialDev/Mouse.HC | 4 ++-- src/Misc/Tour/Tour1.IN | 2 +- src/Tmp/MyDistro.iso | Bin 38928384 -> 38928384 bytes src/Zenith/DolDoc/DocChar.HC | 26 +++++++++++++------------- src/Zenith/DolDoc/DocFind.HC | 2 +- src/Zenith/DolDoc/DocForm.HC | 2 +- src/Zenith/DolDoc/DocGet.HC | 2 +- src/Zenith/DolDoc/DocNew.HC | 2 +- src/Zenith/DolDoc/DocPlain.HC | 6 +++--- src/Zenith/DolDoc/DocPutKey.HC | 4 ++-- src/Zenith/DolDoc/DocRecalc.HC | 2 +- src/Zenith/DolDoc/DocRecalcLib.HC | 8 ++++---- src/Zenith/Gr/SpriteEd.HC | 2 +- src/Zenith/Gr/SpriteNew.HC | 2 +- src/Zenith/Gr/SpriteSideBar.HC | 6 +++--- src/Zenith/TaskSettings.HC | 6 +++--- src/Zenith/Training.HC | 2 +- src/Zenith/Utils/Find.HC | 2 +- src/Zenith/WinMgr.HC | 4 ++-- src/Zenith/ZMathODE.HC | 2 +- 50 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/0000Boot/0000Kernel.BIN.C b/src/0000Boot/0000Kernel.BIN.C index 42fc28a86fc32d0098bcbd7823397ff01c5adced..28b4551d30ec4c6c298a5da64e20651e4f4f9465 100755 GIT binary patch delta 488 zcmaEGp8LUh?g=LB*VY+6*K*?CypZK0^JX5F`;m+rH@}HhV`a?VESwyn%(86VG{)%( zg^c2p+uANLnHx-7$0#y6r@ftJ`JQQvlj}PbCrfk~GZ{^o?AzhT!o3ZmSYq<~Ho?s& zI+7WoGE9w|H`jI$J(wn)x=piC|~kFgfzGB9pWCp&Mz+lxzNt&HLriDbevhBAh>3CQ_CO)VZbQb3?RT9SVuI-!_eLa($=bWQh)ACZBbaeLMVEn)gB!OH6*>Cb;=T zM=~Q+hUwmh&9z;|tW2d!n>Y2RNHVUQEWYwMTYj2`vt!ZpfHo%4%|BP3Q(`#=G!$f; z(&V>is#s2etZ=lE*xY<}1~*gii^+v;qMMCweq~}>F?q7)opQF+Vrwogh0V+E{AFSG z_+Pqt*~5pNta=QYd3uw3UZ=4D%}(C@?R646)<;59`r^{wD+AvygkIH6TDa`b$Y&&Z`<1^vuf$dD<)2)jcIj3_^X57d; z85)G!uT5smwPJcXb-U|1Mk99S|D_wIS6yZFWSUhr`QdNj=?+U7S-0Q4$|$15WaGU3 z^LIwG=INcKOnlR4wlnf?cdKSvXwGG#&A<@vflags,DOCf_FORM,old_form); + LBEqual(&(DocPut)->flags,DOCf_FORM,old_form); DocBottom; switch (i) { case T_MAN: diff --git a/src/Apps/Psalmody/PsalmodyMain.HC b/src/Apps/Psalmody/PsalmodyMain.HC index d9f0bcf3..aa5c97cd 100755 --- a/src/Apps/Psalmody/PsalmodyMain.HC +++ b/src/Apps/Psalmody/PsalmodyMain.HC @@ -516,13 +516,13 @@ mo_got_message: while (psm.cur_note->last!=&psm.head) { psm.cur_note=psm.cur_note->last; if (psm.cur_note!=&psm.head) - LBEqu(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); + LBEqual(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); } } else { if (psm.cur_note->last!=&psm.head) { psm.cur_note=psm.cur_note->last; if (psm.cur_note!=&psm.head) - LBEqu(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); + LBEqual(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); } } break; @@ -530,13 +530,13 @@ mo_got_message: if (arg2&SCF_CTRL) { while (psm.cur_note!=&psm.head) { if (psm.cur_note!=&psm.head) - LBEqu(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); + LBEqual(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); psm.cur_note=psm.cur_note->next; } } else { if (psm.cur_note!=&psm.head) { if (psm.cur_note!=&psm.head) - LBEqu(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); + LBEqual(&psm.cur_note->flags,PSMf_SEL,arg2&SCF_SHIFT); psm.cur_note=psm.cur_note->next; } } diff --git a/src/Apps/ToTheFront/TTFMove.HC b/src/Apps/ToTheFront/TTFMove.HC index 10c90d06..fd202d52 100755 --- a/src/Apps/ToTheFront/TTFMove.HC +++ b/src/Apps/ToTheFront/TTFMove.HC @@ -116,7 +116,7 @@ Bool UnitMove(Unit *tmpu,I64 x,I64 y) tmpu->row=r; tmpu->col=c; VisRecalc(VR_UPDATE_FRIENDLY_UNIT,tmpu); - LBEqu(&tmpu->vis[enemy_player],0, + LBEqual(&tmpu->vis[enemy_player],0, VisRecalc(VR_ONE_ENEMY_UNIT,tmpu)); } else break; diff --git a/src/Apps/ToTheFront/TTFVis.HC b/src/Apps/ToTheFront/TTFVis.HC index 1dfa3280..8ee09505 100755 --- a/src/Apps/ToTheFront/TTFVis.HC +++ b/src/Apps/ToTheFront/TTFVis.HC @@ -24,7 +24,7 @@ U0 VRSetUp(I64 player) ut1=&units[player^1][0]; for (i=0;ivis[player],0); - LBEqu(&ut0->vis[player],0,ut0->life>0); + LBEqual(&ut0->vis[player],0,ut0->life>0); } } @@ -41,7 +41,7 @@ U0 VRMerge(I64 player) } ut1=&units[player^1][0]; for (j=0;jvis[player],0,Bt(mask,j) && ut1->life>0); + LBEqual(&ut1->vis[player],0,Bt(mask,j) && ut1->life>0); Free(mask); } @@ -77,7 +77,7 @@ Bool MPVisRecalc(MPCtrl1 *job) } } if (job->mode==VR_UPDATE_FRIENDLY_UNIT) - LBEqu(&vis_unit_bitmap[cur_player], + LBEqual(&vis_unit_bitmap[cur_player], i+job->tmpu->num*((UNITS_NUM+7)&~7),seen); } break; diff --git a/src/Compiler/BackLib.HC b/src/Compiler/BackLib.HC index 372eaf7a..57f3e306 100755 --- a/src/Compiler/BackLib.HC +++ b/src/Compiler/BackLib.HC @@ -655,7 +655,7 @@ move_redundant: } if (tmpi->ic_count>last_start>tmpi->ic_last_start) tmpi->ic_last_start=last_start; - BEqu(&tmpi->ic_flags,ICf_LOCK,old_lock); + BEqual(&tmpi->ic_flags,ICf_LOCK,old_lock); } U0 ICLea(CIntermediateCode *tmpi,CICType t1,I64 r1,I64 d1, diff --git a/src/Compiler/CMisc.HC b/src/Compiler/CMisc.HC index 59d4e49c..786242bd 100755 --- a/src/Compiler/CMisc.HC +++ b/src/Compiler/CMisc.HC @@ -1,6 +1,6 @@ Bool Option(I64 num,Bool val) {//Set compiler $LK,"Option",A="FI:::/Doc/Options.DD"$ to val. - return BEqu(&Fs->last_cc->opts,num,val); + return BEqual(&Fs->last_cc->opts,num,val); } Bool GetOption(I64 num) diff --git a/src/Compiler/Compiler.BIN b/src/Compiler/Compiler.BIN index bc2d377f9b10bdaa05d4203189e31c223f0d9988..6777072cf4d38c836f66f3bc1911e84cf574dede 100755 GIT binary patch delta 164 zcmZp8!`<+PdxMxhi4iw)9_>z zOMH-P#OAb~2wleD&HHy=&}Lk=dBW2hrqdbi8D*yDx-zkE@0MmPHD>hO&gjpW&&X)K zy)b}L{{RyM!}KbBCd2KQ1(>4FZ})n@bed0A_!lEXypwBSsG|=9M{pP;0|Un*0}$yT N%E+)?_&w8WHUQfJG4cQa delta 173 zcmZp8!`<+PdxMxh3j+{rmeOxxWM#-ND$$#~(7>4u%wm}QVWZe2!)eSw(akdrPe!r$ zI0grAPV0%#Wn|dAf9C~l#%Y@;JiTGc=4))k5aBz0eFu}&_6}*r3S&l(?Tr46`HYM< z+Y192^$)NYRVpyJlom{{*Jsk%ep!Gi>bwkx@GnM&cqiAuPzH|RFh&LjjztC_(m|Aw VVY|))rZaro#osf%WMg7r004DmHR}KX diff --git a/src/Compiler/ParseExp.HC b/src/Compiler/ParseExp.HC index 1e025729..b0668533 100755 --- a/src/Compiler/ParseExp.HC +++ b/src/Compiler/ParseExp.HC @@ -1128,7 +1128,7 @@ U8 *LexExpression2Bin(CCompCtrl *cc,I64 *_type=NULL) } else res=NULL; COCPop(cc); - BEqu(&cc->flags,CCf_PASS_TRACE_PRESENT,old_trace); + BEqual(&cc->flags,CCf_PASS_TRACE_PRESENT,old_trace); return res; } diff --git a/src/Compiler/ParseStatement.HC b/src/Compiler/ParseStatement.HC index 0e58516d..c157745e 100755 --- a/src/Compiler/ParseStatement.HC +++ b/src/Compiler/ParseStatement.HC @@ -107,7 +107,7 @@ CHashFun *ParseFunJoin(CCompCtrl *cc,CHashClass *tmp_return, if (name) //if not fun_ptr HashAdd(tmpf,cc->htc.glbl_hash_table); } - BEqu(&tmpf->type,HTf_PUBLIC,fsp_flags&FSF_PUBLIC); + BEqual(&tmpf->type,HTf_PUBLIC,fsp_flags&FSF_PUBLIC); tmpf->return_class=tmp_return; tmpf->use_count=0; HashSrcFileSet(cc,tmpf); diff --git a/src/Demo/Games/FlatTops.HC b/src/Demo/Games/FlatTops.HC index 022ce6ec..50cf06c7 100755 --- a/src/Demo/Games/FlatTops.HC +++ b/src/Demo/Games/FlatTops.HC @@ -522,7 +522,7 @@ U0 SquadronActions() ObjLaunch(tmps->player,i,tmps->host,,,tmps->é); tmpo=tmps->next_in_squadron; while (tmpo!=tmps) { - LBEqu(&completed_mask,tmpo->member_num,tmpo->flags&OF_ACTIVE); + LBEqual(&completed_mask,tmpo->member_num,tmpo->flags&OF_ACTIVE); tmpo=tmpo->next_in_squadron; } if (completed_mask|tmps->dead_mask==tmps->total_mask) @@ -531,7 +531,7 @@ U0 SquadronActions() case SA_FLYING: tmpo=tmps->next_in_squadron; while (tmpo!=tmps) { - LBEqu(&completed_mask,tmpo->member_num,!(tmpo->flags&OF_ACTIVE)); + LBEqual(&completed_mask,tmpo->member_num,!(tmpo->flags&OF_ACTIVE)); tmpo=tmpo->next_in_squadron; } if (completed_mask|tmps->dead_mask==tmps->total_mask) @@ -549,7 +549,7 @@ U0 SquadronActions() tmpo=tmps->next_in_squadron; while (tmpo!=tmps) { tmpo->flags|=OF_RETURNING; - LBEqu(&completed_mask,tmpo->member_num,!(tmpo->flags&OF_ACTIVE)); + LBEqual(&completed_mask,tmpo->member_num,!(tmpo->flags&OF_ACTIVE)); tmpo=tmpo->next_in_squadron; } if (completed_mask|tmps->dead_mask==tmps->total_mask) diff --git a/src/Doc/Bit.DD b/src/Doc/Bit.DD index e2e78c63..b4414bba 100755 --- a/src/Doc/Bit.DD +++ b/src/Doc/Bit.DD @@ -4,7 +4,7 @@ $WW,1$$FG,2$Bt$FG$: Bit Test $FG,2$Bts$FG$: Bit Test and Set to one $FG,2$Btr$FG$: Bit Test and Reset to zero $FG,2$Btc$FG$: Bit Test and Compliment (toggle) -$FG,2$BEqu$FG$: Set bit to value. +$FG,2$BEqual$FG$: Set bit to value. $FG$Bit operations are "atomic", no interrupt between the reading and writing the bit, important when multitasking. For multicore use "locked" forms.$FG$ diff --git a/src/Doc/Glossary.DD b/src/Doc/Glossary.DD index 6bfbf155..be66fa6e 100755 --- a/src/Doc/Glossary.DD +++ b/src/Doc/Glossary.DD @@ -197,7 +197,7 @@ $FG,2$Q$FG$-$FG,2$S$FG$ are ISO file write drives. $FG,2$T$FG$-$FG,2$Z$FG$ are ATAPI CD/DVD drives. For commands taking a drive letter as an argument, char $FG,2$0$FG$ is the current drive. -$ID,-2$$LK,"Bt, Bts, Btr, Btc, BEqu",A="HI:Bit"$ +$ID,-2$$LK,"Bt, Bts, Btr, Btc, BEqual",A="HI:Bit"$ $LK,"Define",A="HI:Define"$ $LK,"DolDoc",A="FI:::/Doc/DolDocOverview.DD"$ $LK,"Editor Link Types",A="MN:LK_FILE"$ diff --git a/src/Kernel.BIN.C b/src/Kernel.BIN.C index d3ae68cc38d5e5d4a0cbc4f1fa99610dba49f40a..a4aa071f2400a4fa847020aa2ffe5a05a5a95070 100755 GIT binary patch delta 555 zcmXv~Ur5to6#d=1Z;rOLTu!&OYQIUWG9+hvsf3ziFkx9U22H9}I(;z9mQX}X!x}RU zCSUTa9s()FndaytzlUB7f`tAN(VjFBgCZwAY)K$OzuY=pxSV^=Jr5`GQIn9zsd{Cr z{9aM3VMFATf@#To5XM>NlwFA@63oyf+7!B_YzIb-$u~s@)EnHs zI`%EOSWcu={=b|qzq>{r%8a^dOswbq6CKti=CCPUd~2+-5nGP*VAge3Ln4#5~3$Y~KO*`t-;1O#?()ooC@ zU6Cfwg--r;6GRXuxqmbCIY8udZm<^1d+j(_jUYZJhe65b zzQBYNj!LP$xP=d^F|N~HZ10GKFR$m_%ydf~UNrIsGj^NcF8}Pnw1_8D{AmLY7^G@| zQtod>cNytC8*1kFqd2Hjgj&w?s(x&>^T*HewnDRUk069g#yeHNQ6^Th`hgB6(e3iP8IK6Cb8_nI zyH;dwe|4HMl8LEo!gkkljCJfxhl(dZ{4G4)VJRc)_PbXZ*P1YvOy8i-B(;4h7gGlx zUs7qBPO@&ONB0|##y1Vq3p|*_w+BfwHApb_ZNF^DbWMRtV&nGJK}-`xm|dMUr+?hf zD7rl)oykFr1>~RYGisTp@=fn=XO!OV(Zl4g#$}?-z!2}_ded;ErcINGx+nAmS Ya`J+N!J@n;m}I55TRdipU;!He0G#s4H~;_u diff --git a/src/Kernel/BlkDev/DiskATA.HC b/src/Kernel/BlkDev/DiskATA.HC index 52de420e..bc9317fd 100755 --- a/src/Kernel/BlkDev/DiskATA.HC +++ b/src/Kernel/BlkDev/DiskATA.HC @@ -216,7 +216,7 @@ I64 ATAReadNativeMax(CBlkDev *bd,F64 timeout) if (ATAGetDevId(bd,timeout,TRUE)==BDT_NULL) okay=FALSE; else - BEqu(&bd->flags,BDf_EXT_SIZE,Bt(&bd->dev_id_record[86],10)); + BEqual(&bd->flags,BDf_EXT_SIZE,Bt(&bd->dev_id_record[86],10)); } if (okay) { if (bd->flags & BDF_EXT_SIZE && bd->base1) { diff --git a/src/Kernel/BlkDev/DiskATAId.HC b/src/Kernel/BlkDev/DiskATAId.HC index 6b5c06fa..9a20cab3 100755 --- a/src/Kernel/BlkDev/DiskATAId.HC +++ b/src/Kernel/BlkDev/DiskATAId.HC @@ -142,7 +142,7 @@ public I64 ATARep(Bool prompt=TRUE,Bool just_ide=FALSE,CATARep **_head=NULL) for (i=0;ifs_type,FStf_DISABLE,!val); + return !LBEqual(&drive->fs_type,FStf_DISABLE,!val); else return FALSE; } diff --git a/src/Kernel/Job.HC b/src/Kernel/Job.HC index 51607310..4654e45b 100755 --- a/src/Kernel/Job.HC +++ b/src/Kernel/Job.HC @@ -161,15 +161,15 @@ CJob *TaskMessage(CTask *_srv,CTask *master, return tmpc; } -Bool JobResScan(CJob *rqst=NULL,I64 *_res=NULL) -{//Check rqst complete, return with or without. +Bool JobResScan(CJob *request=NULL,I64 *_res=NULL) +{//Check request complete, return with or without. CJobCtrl *ctrl; CJob *tmpc,*tmpc1; - if (!rqst || Bt(&rqst->flags,JOBf_DONE)) { - if (!rqst || rqst->master_task) + if (!request || Bt(&request->flags,JOBf_DONE)) { + if (!request || request->master_task) ctrl=&Fs->srv_ctrl; else - ctrl=rqst->ctrl; + ctrl=request->ctrl; PUSHFD CLI while (LBts(&ctrl->flags,JOBCf_LOCKED)) @@ -177,7 +177,7 @@ Bool JobResScan(CJob *rqst=NULL,I64 *_res=NULL) tmpc1=&ctrl->next_done; tmpc=tmpc1->next; while (tmpc!=tmpc1) { - if (!rqst || rqst==tmpc) { + if (!request || request==tmpc) { QueueRemove(tmpc); LBtr(&ctrl->flags,JOBCf_LOCKED); POPFD @@ -196,25 +196,25 @@ Bool JobResScan(CJob *rqst=NULL,I64 *_res=NULL) return FALSE; } -I64 JobResGet(CJob *rqst=NULL) +I64 JobResGet(CJob *request=NULL) {//See $LK,"::/Demo/MultiCore/Lock.HC"$ I64 res; CJob *tmpc1; - if (!rqst) { + if (!request) { tmpc1=&Fs->srv_ctrl.next_done; while (tmpc1==tmpc1->next) { LBts(&Fs->task_flags,TASKf_IDLE); Yield; } } else { - while (!Bt(&rqst->flags,JOBf_DONE)) { + while (!Bt(&request->flags,JOBf_DONE)) { LBts(&Fs->task_flags,TASKf_IDLE); Yield; } } LBtr(&Fs->task_flags,TASKf_IDLE); //Could get taken by someone else. - JobResScan(rqst,&res); + JobResScan(request,&res); return res; } diff --git a/src/Kernel/KDebug.HC b/src/Kernel/KDebug.HC index ab675bfc..5e9c4ef7 100755 --- a/src/Kernel/KDebug.HC +++ b/src/Kernel/KDebug.HC @@ -226,7 +226,7 @@ U0 RawPrint(I64 mS=100,U8 *format,...) "%s",buf; Busy(mS<<10); POPFD - LBEqu(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); + LBEqual(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); Raw(old_raw); Free(buf); } @@ -243,7 +243,7 @@ U0 RawD(I64 mS=100,U8 *addr,I64 count=0x80) D(addr,count); Busy(mS<<10); POPFD - LBEqu(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); + LBEqual(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); Raw(old_raw); } @@ -259,7 +259,7 @@ U0 RawDm(I64 mS=100,U8 *addr,I64 count=0x80) Dm(addr,count); Busy(mS<<10); POPFD - LBEqu(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); + LBEqual(&Fs->task_flags,TASKf_INPUT_FILTER_TASK,old_input_filter); Raw(old_raw); } @@ -558,7 +558,7 @@ U0 Debug2() UserTaskCont; fp_getstr2=old_getstr2; Fs->win_inhibit=old_win_inhibit; - LBEqu(&Fs->task_flags,TASKf_AWAITING_MESSAGE,old_waiting_message); + LBEqual(&Fs->task_flags,TASKf_AWAITING_MESSAGE,old_waiting_message); } U0 Fault3(I64 fault_num,I64 fault_err_code) diff --git a/src/Kernel/KMisc.HC b/src/Kernel/KMisc.HC index 24ac8ded..238f1baa 100755 --- a/src/Kernel/KMisc.HC +++ b/src/Kernel/KMisc.HC @@ -149,7 +149,7 @@ U0 SleepUntil(I64 wake_jiffy) Bool old_idle=LBts(&Fs->task_flags,TASKf_IDLE); Fs->wake_jiffy=wake_jiffy; Yield; - LBEqu(&Fs->task_flags,TASKf_IDLE,old_idle); + LBEqual(&Fs->task_flags,TASKf_IDLE,old_idle); } U0 Sleep(I64 mS) @@ -269,7 +269,7 @@ Bool IsMute() Bool Silent(Bool val=ON) {//Turn-off StdOut console text. (Not sound.) - return LBEqu(&Fs->display_flags,DISPLAYf_SILENT,val); + return LBEqual(&Fs->display_flags,DISPLAYf_SILENT,val); } Bool IsSilent() @@ -279,7 +279,7 @@ Bool IsSilent() Bool SysDebug(Bool val) {//Set SysDebug bit you can use while debugging. - return LBEqu(&sys_semas[SEMA_DEBUG],0,val); + return LBEqual(&sys_semas[SEMA_DEBUG],0,val); } Bool IsSysDebug() @@ -291,7 +291,7 @@ Bool Raw(Bool val) {//Set to direct scrn, BLACK & WHITE, non-windowed output mode. if (!val) VGAFlush; - return !LBEqu(&Fs->display_flags,DISPLAYf_NOT_RAW,!val); + return !LBEqual(&Fs->display_flags,DISPLAYf_NOT_RAW,!val); } Bool IsRaw() @@ -301,7 +301,7 @@ Bool IsRaw() Bool SingleUser(Bool val) {//Set single-user mode. - return LBEqu(&sys_semas[SEMA_SINGLE_USER],0,val); + return LBEqual(&sys_semas[SEMA_SINGLE_USER],0,val); } Bool IsSingleUser() @@ -311,7 +311,7 @@ Bool IsSingleUser() Bool DebugMode(Bool val) {//Set debug-mode. - return LBEqu(&sys_semas[SEMA_DBG_MODE],0,val); + return LBEqual(&sys_semas[SEMA_DBG_MODE],0,val); } Bool IsDebugMode() diff --git a/src/Kernel/KTask.HC b/src/Kernel/KTask.HC index 85b29b7b..f59983c0 100755 --- a/src/Kernel/KTask.HC +++ b/src/Kernel/KTask.HC @@ -81,7 +81,7 @@ Bool Suspend(CTask *task=NULL,Bool state=TRUE) PUSHFD CLI if (TaskValidate(task)) - res=LBEqu(&task->task_flags,TASKf_SUSPENDED,state); + res=LBEqual(&task->task_flags,TASKf_SUSPENDED,state); else res=FALSE; POPFD diff --git a/src/Kernel/KUtils.HC b/src/Kernel/KUtils.HC index cd9d7818..035113ce 100755 --- a/src/Kernel/KUtils.HC +++ b/src/Kernel/KUtils.HC @@ -85,7 +85,7 @@ _MEMCOMPARE:: POP RSI POP RBP RET1 24 -_BEQU:: +_BEQUAL:: PUSH RBP MOV RBP,RSP XOR RAX,RAX @@ -100,7 +100,7 @@ _BEQU:: @@10: ADC AL,0 POP RBP RET1 24 -_LBEQU:: +_LBEQUAL:: PUSH RBP MOV RBP,RSP XOR RAX,RAX diff --git a/src/Kernel/Kernel.MAP b/src/Kernel/Kernel.MAP index 679705c2..595993a9 100755 --- a/src/Kernel/Kernel.MAP +++ b/src/Kernel/Kernel.MAP @@ -379,7 +379,6 @@ $LK,"_LXCHG_U8",A="FL:::/Kernel/KUtils.HC,244"$ $LK,"CtrlAltX",A="FL:::/Kernel/KeyDev.HC,173",BI=80$ $LK,"UserTaskCont",A="FL:::/Kernel/KTask.HC,384",BI=81$ $LK,"RFLAGf_NESTED_TASK",A="FL:::/Kernel/KernelA.HH,332"$ -$LK,"BEqu",A="FL:::/Kernel/KernelB.HH,28"$ $LK,"FAT32MkDir",A="FL:::/Kernel/BlkDev/FileSysFAT.HC,919",BI=82$ $LK,"ClusBlkRead",A="FL:::/Kernel/BlkDev/DiskClus.HC,44",BI=83$ $LK,"_MEMCOPY",A="FL:::/Kernel/KUtils.HC,55"$ @@ -527,7 +526,6 @@ $LK,"MSF_FIXED",A="FL:::/Kernel/KernelA.HH,209"$ $LK,"screencast",A="FL:::/Kernel/KGlobals.HC,29"$ $LK,"MEM_HEAP_BASE",A="FL:::/Kernel/KStart32.HC,6"$ $LK,"_CPUID",A="FL:::/Kernel/KUtils.HC,319"$ -$LK,"_LBEQU",A="FL:::/Kernel/KUtils.HC,104"$ $LK,"Caller",A="FL:::/Kernel/KDebug.HC,60",BI=114$ $LK,"SUF_S2T",A="FL:::/Kernel/KernelA.HH,3737"$ $LK,"ATA_DEV_RST",A="FL:::/Kernel/KernelA.HH,2270"$ @@ -723,6 +721,7 @@ $LK,"HashFunSegFind",A="FL:::/Kernel/FunSeg.HC,10",BI=139$ $LK,"Dr",A="FL:::/Kernel/KDebug.HC,328",BI=140$ $LK,"FBlkRead",A="FL:::/Kernel/BlkDev/DiskCFile.HC,129",BI=141$ $LK,"CPUId",A="FL:::/Kernel/KernelB.HH,263"$ +$LK,"_BEQUAL",A="FL:::/Kernel/KUtils.HC,89"$ $LK,"ARC_BITS_MAX",A="FL:::/Kernel/KernelA.HH,3685"$ $LK,"FilesFind2",A="FL:::/Kernel/BlkDev/DiskFind.HC,1",BI=142$ $LK,"TaskKillDying",A="FL:::/Kernel/KTask.HC,528",BI=143$ @@ -900,7 +899,6 @@ $LK,"RedSeaFileFind",A="FL:::/Kernel/BlkDev/FileSysRedSea.HC,155",BI=182$ $LK,"CTRLF_CAPTURE_RIGHT_MS",A="FL:::/Kernel/KernelA.HH,3046"$ $LK,"SYS_PCIBIOS_SERVICE_DIR",A="FL:::/Kernel/PCIBIOS.HC,4"$ $LK,"tS",A="FL:::/Kernel/KMisc.HC,122",BI=183$ -$LK,"LBEqu",A="FL:::/Kernel/KernelB.HH,34"$ $LK,"ICF_RES_NOT_USED",A="FL:::/Kernel/KernelA.HH,1611"$ $LK,"DOCEt_SEL",A="FL:::/Kernel/KernelA.HH,960"$ $LK,"ArcDetermineCompressionType",A="FL:::/Kernel/Compress.HC,102",BI=184$ @@ -1498,7 +1496,6 @@ $LK,"FirstDayOfMon",A="FL:::/Kernel/KDate.HC,71",BI=317$ $LK,"counts",A="FL:::/Kernel/KGlobals.HC,21"$ $LK,"PutChars",A="FL:::/Kernel/KeyDev.HC,20",BI=318$ $LK,"ZenithErr",A="FL:::/Kernel/Job.HC,433",BI=319$ -$LK,"_BEQU",A="FL:::/Kernel/KUtils.HC,89"$ $LK,"DOCEf_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,1069"$ $LK,"DOCEF_RAW_TYPE",A="FL:::/Kernel/KernelA.HH,981"$ $LK,"DriveFATBlkClean",A="FL:::/Kernel/BlkDev/DiskDrive.HC,99",BI=320$ @@ -1545,6 +1542,7 @@ $LK,"VM_VIRTUALBOX",A="FL:::/Kernel/KernelA.HH,3893"$ $LK,"SCF_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3486"$ $LK,"CCompCtrl",A="FL:::/Kernel/KernelA.HH,2179"$ $LK,"TASK_CONTEXT_SAVE",A="FL:::/Kernel/Sched.HC,56"$ +$LK,"LBEqual",A="FL:::/Kernel/KernelB.HH,34"$ $LK,"SCf_NEW_KEY",A="FL:::/Kernel/KernelA.HH,3471"$ $LK,"CDirContext",A="FL:::/Kernel/KernelA.HH,2747"$ $LK,"BootDVDProbeAll",A="FL:::/Kernel/BlkDev/DiskATAId.HC,29",BI=331$ @@ -2233,6 +2231,7 @@ $LK,"SCf_NO_SHIFT",A="FL:::/Kernel/KernelA.HH,3476"$ $LK,"ARGT_MOFFS32",A="FL:::/Kernel/KernelA.HH,1926"$ $LK,"ARGT_MOFFS16",A="FL:::/Kernel/KernelA.HH,1925"$ $LK,"WIG_TASK_DEFAULT",A="FL:::/Kernel/KernelA.HH,1444"$ +$LK,"BEqual",A="FL:::/Kernel/KernelB.HH,28"$ $LK,"PRTF_LEFT_JUSTIFY",A="FL:::/Kernel/KernelA.HH,3870"$ $LK,"FUF_SINGLE",A="FL:::/Kernel/KernelA.HH,2576"$ $LK,"FUf_SINGLE",A="FL:::/Kernel/KernelA.HH,2548"$ @@ -2666,6 +2665,7 @@ $LK,"IRQ_TIMER",A="FL:::/Kernel/KInts.HC,16"$ $LK,"DOC_COLOR_TREE",A="FL:::/Kernel/KernelA.HH,1144"$ $LK,"DOCEf_HAS_BIN",A="FL:::/Kernel/KernelA.HH,1067"$ $LK,"DOCEF_HAS_BIN",A="FL:::/Kernel/KernelA.HH,979"$ +$LK,"_LBEQUAL",A="FL:::/Kernel/KUtils.HC,104"$ $LK,"VGAP_CRTC_INDEX",A="FL:::/Kernel/KernelA.HH,3677"$ $LK,"KbdMouseInit",A="FL:::/Kernel/SerialDev/Mouse.HC,348",BI=571$ $LK,"ATTRF_SEL",A="FL:::/Kernel/KernelA.HH,896"$ diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index 6fdd5f81..979ea080 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -47,9 +47,9 @@ extern class CTask; #define F64_MAX (0x7FEFFFFFFFFFFFFF(F64)) #define F64_MIN (0xFFEFFFFFFFFFFFFF(F64)) #define inf (0x7FF0000000000000(F64)) -#define � (0x7FF0000000000000(F64)) +#define ì (0x7FF0000000000000(F64)) #define pi (0x400921FB54442D18(F64)) -#define � (0x400921FB54442D18(F64)) +#define ã (0x400921FB54442D18(F64)) #define exp_1 (0x4005BF0A8B145769(F64)) //The number "e" #define log2_10 (0x400A934F0979A371(F64)) #define log2_e (0x3FF71547652B82FE(F64)) @@ -1553,7 +1553,7 @@ public class CAutoCompleteDictGlobals #define OPTf_KEEP_PRIVATE 0x21 #define OPTf_NO_REG_VAR 0x22 //Applied to funs, not statements #define OPTf_GLBLS_ON_DATA_HEAP 0x23 -//Disable 10-byte float consts for �,log2_10,log10_2,loge_2 +//Disable 10-byte float consts for ã,log2_10,log10_2,loge_2 #define OPTf_NO_BUILTIN_CONST 0x24 //Applied to funs, not statements #define OPTf_USE_IMM64 0x25 //Not completely implemented diff --git a/src/Kernel/KernelB.HH b/src/Kernel/KernelB.HH index 9eaf7145..9d83db34 100755 --- a/src/Kernel/KernelB.HH +++ b/src/Kernel/KernelB.HH @@ -24,13 +24,13 @@ public _intern IC_LBTR Bool LBtr( U8 *bit_field,I64 bit); //Locked bit test and reset to zero. public _intern IC_LBTS Bool LBts( U8 *bit_field,I64 bit); //Locked bit test and set to one. -public _extern _BEQU Bool BEqu( +public _extern _BEQUAL Bool BEqual( U8 *bit_field,I64 bit,Bool val);//Set bit equ to val. public _extern _BIT_FIELD_EXT_U32 U32 BFieldExtU32( U8 *bit_field,I64 bit,I64 size); //Extract U32 from bit field. public _extern _BIT_FIELD_OR_U32 U0 BFieldOrU32( U8 *bit_field,I64 bit,U32 pattern); //Or U32 into bit field. -public _extern _LBEQU Bool LBEqu( +public _extern _LBEQUAL Bool LBEqual( U8 *bit_field,I64 bit,Bool val); //Locked Set bit equ to val. #help_index "Boot" diff --git a/src/Kernel/KernelC.HH b/src/Kernel/KernelC.HH index fbb61ef3..0292ea29 100755 --- a/src/Kernel/KernelC.HH +++ b/src/Kernel/KernelC.HH @@ -474,8 +474,8 @@ public extern I64 PopUp(U8 *buf,CTask *parent=NULL,CTask **_pu_task=NULL); public extern I64 PopUpPrint(U8 *format,...); #help_index "Job/Exe;Task/Job/Exe;MultiCore" -public extern I64 JobResGet(CJob *rqst=NULL); -public extern Bool JobResScan(CJob *rqst=NULL,I64 *_res=NULL); +public extern I64 JobResGet(CJob *request=NULL); +public extern Bool JobResScan(CJob *request=NULL,I64 *_res=NULL); #help_index "Job/Text & Messages;Task/Job/Text & Messages" public extern CJob *TaskText(CTask *srv,CTask *master,U8 *data,I64 flags); diff --git a/src/Kernel/KeyDev.HC b/src/Kernel/KeyDev.HC index b53738db..97e7c878 100755 --- a/src/Kernel/KeyDev.HC +++ b/src/Kernel/KeyDev.HC @@ -194,7 +194,7 @@ U0 CtrlAltCBSet(U8 ch,U0 (*fp_handler)(I64 sc), else keydev.ctrl_alt_shift_descs[ch]=NULL; - BEqu(&keydev.ctrl_alt_in_irq_flags,ch,in_irq); + BEqual(&keydev.ctrl_alt_in_irq_flags,ch,in_irq); } } diff --git a/src/Kernel/MultiProc.HC b/src/Kernel/MultiProc.HC index 63c876e6..e231f43e 100755 --- a/src/Kernel/MultiProc.HC +++ b/src/Kernel/MultiProc.HC @@ -70,7 +70,7 @@ USE64 U0 TSSBusy(I64 tr,Bool val=OFF) {//See $LK,"::/Demo/Lectures/Ring3.HC"$. - LBEqu((&sys_gdt)(U8 *)+tr+4,9,val); + LBEqual((&sys_gdt)(U8 *)+tr+4,9,val); } CTSS *TSSNew(I64 cpu_num) diff --git a/src/Kernel/SerialDev/Keyboard.HC b/src/Kernel/SerialDev/Keyboard.HC index 2d6d38cf..948fc049 100755 --- a/src/Kernel/SerialDev/Keyboard.HC +++ b/src/Kernel/SerialDev/Keyboard.HC @@ -52,9 +52,9 @@ U0 KbdCmdFlush() U0 KbdLEDsSet(I64 sc) { U8 v=0; - BEqu(&v,0,Bt(&sc,SCf_SCROLL)); - BEqu(&v,1,Bt(&sc,SCf_NUM)); - BEqu(&v,2,Bt(&sc,SCf_CAPS)); + BEqual(&v,0,Bt(&sc,SCf_SCROLL)); + BEqual(&v,1,Bt(&sc,SCf_NUM)); + BEqual(&v,2,Bt(&sc,SCf_CAPS)); try { KbdCmdSend(KBD_PORT,0xED); KbdCmdSend(KBD_PORT,v); @@ -308,8 +308,8 @@ U0 KbdBuildSC(U8 raw_byte,Bool in_irq,U8 *_last_raw_byte,I64 *_last_sc) return; } sc=raw_byte; - BEqu(&sc,SCf_E0_PREFIX,*_last_raw_byte==0xE0); - BEqu(&sc,SCf_KEY_UP,raw_byte & 0x80); + BEqual(&sc,SCf_E0_PREFIX,*_last_raw_byte==0xE0); + BEqual(&sc,SCf_KEY_UP,raw_byte & 0x80); *_last_raw_byte=raw_byte; sc_flags=_last_sc->u32[0]&~0x1FF; diff --git a/src/Kernel/SerialDev/Message.HC b/src/Kernel/SerialDev/Message.HC index 9877f070..390cfb87 100755 --- a/src/Kernel/SerialDev/Message.HC +++ b/src/Kernel/SerialDev/Message.HC @@ -6,7 +6,7 @@ U0 InputFilterTask() Fs->win_inhibit=WIG_USER_TASK_DEFAULT; LBts(&Fs->task_flags,TASKf_INPUT_FILTER_TASK); old_filter=LBts(&Fs->last_input_filter_task->task_flags,TASKf_FILTER_INPUT); - LBEqu(&Fs->task_flags,TASKf_FILTER_INPUT,old_filter); + LBEqual(&Fs->task_flags,TASKf_FILTER_INPUT,old_filter); while (TRUE) { CLI JobsHandler(old_flags); diff --git a/src/Kernel/SerialDev/Mouse.HC b/src/Kernel/SerialDev/Mouse.HC index 78d742cf..502e8cf8 100755 --- a/src/Kernel/SerialDev/Mouse.HC +++ b/src/Kernel/SerialDev/Mouse.HC @@ -35,8 +35,8 @@ U0 MouseUpdate(I64 x,I64 y,I64 z,Bool l,Bool r) } mouse.lb=l; mouse.rb=r; - LBEqu(&kbd.scan_code,SCf_MS_L_DOWN,mouse.lb); - LBEqu(&kbd.scan_code,SCf_MS_R_DOWN,mouse.rb); + LBEqual(&kbd.scan_code,SCf_MS_L_DOWN,mouse.lb); + LBEqual(&kbd.scan_code,SCf_MS_R_DOWN,mouse.rb); } U0 MouseSet(I64 x=I64_MAX,I64 y=I64_MAX,I64 z=I64_MAX,I64 l=I64_MAX,I64 r=I64_MAX) diff --git a/src/Misc/Tour/Tour1.IN b/src/Misc/Tour/Tour1.IN index bd53cd70..10333b2d 100755 --- a/src/Misc/Tour/Tour1.IN +++ b/src/Misc/Tour/Tour1.IN @@ -50,7 +50,7 @@ U0 RevealPopUpHelp(I64 scf) Sound; Sleep(1); } - LBEqu(&Fs->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); + LBEqual(&Fs->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); Sound; } while (tS-t0<1.0); } diff --git a/src/Tmp/MyDistro.iso b/src/Tmp/MyDistro.iso index 30b054018cbbdf12a98bf39eb93975d2c9f5f440..0bbe86dd34eebe3188c628e0893e581213320a62 100755 GIT binary patch delta 9269 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 VZt-1PPRzb*E69!7y{c5A_%Hn7)WrY* delta 8867 zcmai(cU)6f`@p#;A%PH(JrzPg2%^ZUB1Dl9A?)F-1Fe?26~Vf$7PSSpB9)`HdbNG) zYO6TPsqL*%>+5P?_v@^vty@a5R@h3bxb2 z(Oi*y{#Vi#f%Ml(&Wjx#&5h)2g`~Ba%^u4oIg_bcI_Ic5kR6}I6$EkHX~076h+n`u&|am#bBhzWYIZe(gn7dEKS?AkfUBk*@`;{HW3T3utv=-EH<@zS))|V0Cv8bOh_d^tzw4lBvC1QHno|~{EQgMdvDSkS2!Qq`yJxU zu6{;*wM3uA9$p~b=F^4!WFFLGqq-gIGg!8$*H0s(@@%v-C8NDm$4a5vfEy+ z?wGb@hi;K|2w@ApmJO0~PV|7$L)&sxmZFdbA&yTRjg&tjvqqvlGTS5lNn0szk3@T9 zwnzF?_Vw(MXphYHNPk+USK@JDI5u!|o6g8mq|?x!vF?EJXJq2*4oS+V$RBx}Q{qEbUQ zjaQDu#fzv!8Zc40#1gR!6P3;ZE|$G5IoHI#dq+9M@mv|dKq;0woD$zDjg^DY-=@?yw{+6R?IG$TnNt0J+qn5S;|IIdaB6Q4DV0CE z>kVce;s(84UMr>M4*KpEvIG8Ww6Hji_5nlz;* zj&5A(mZh+SPV|9~+P|sMtw{z2Y)zxvu~+2<8Rg}y^1j=^E}RoHg{V)(a!qVSj{4#& zio&Esr-6kuez44+PT1_OWQ%93rzUZ^jN7T6#Bq97wM*S~zjDe9jZ^m2$+WjC%%kEI z_o|caU3}U&>BsNnQr;gL(dC19bZ`lkatfOhQZ0MFq+vf=4o zGZb1Ur@m>HPIMaG-QJlSp<24OXK!KkH0+7Nt7;D$-{!T|ofb~_>Kpmm8x>R?Lv?K;_5~2o}*Vn z`gE*QdDp3Y>QufhD!(=v?eS*VBKm(Ko9PG#>(BW%Sg%QucNPj=78?~_h!Z7;t* zvtYCy`mbfcK+!}`JYSbv^$+*@0sida-hkVs;Z5VEeUwbJ??Zz%vVK+&*5(%2OYS&u zJOibl3Ki{<*&gY=Y^A(C677-M9_hX9>)9jG9+~Zt-p9V4JreDa*%mRqZ=l)LI_^X5 zo7f^Ih6eI7Yq8c^T+eF*fgr|fgT-+U+cJJxu-NmZ`$kEviqj-B4+zmq7aXb|W?iqI9~J_%2RZ5%(LB(3uM#RQ7cq)SAUbaChb^5nAEq!|@tiJ771P}>y1fqawKnKJC zoq$-NGiy86rI)8eb?W)cU4S^4YP*Va9SRvgBwpAPGojeC{jaRfm-rAJt6^e<_*UP3+;2tmo%-1G)n#Ko1}lNCWgh zPoNj$=cS9%z%*)chi)NQw(l>DK zn!$%Hy)Ydoa8_I#|2jw0y*Y(v{J<9qpsenT^p-DrFaC-xot9DHU4LO=29U`vEX*3Q z#d7v9oJ3-_ZGa_a!=!7O)b+`>B%hou-gDeUYY=TWy$#%fmPkXqTcnG!(K2FA>79pFqT$1QT>4>O+_GJINbV^slVd=gbZe8}?@HFtxR8oEgt^Mpk=sJXi#SsfBAWjdu5 z+@Sgt$f&HBWy?A|X68gc-wzWZL)0r$o~Nie6;?Vh^M#B)4Kk}{$t)>+D4=|rL6oYe z*W0Sc>tU@idTBenBvKJGsxT?jUTkiqX3QK3kTOwQ&$lvtPeWk{TRhNE6eC5MIUL$L!j8CJ@ro2EZCK}yo#pL`jI$UEM{(NnAQezC|V86eG z8_N~2Rg7j9txCuZrQ@{5Igp2)x2LWV#uZ!@TNh!}hcD3!(A*f}QDxF8SkWWS9I`pXV6lYJFM96W)8^D6YaK z7z|+?G)`82r6(KFH~+9qxWB8ExUx94{5Z!=XHN#@3(oAliu`n~aG_@jiD}a1E9w>V z@__=Tm{&M_h)R<=Y0`MhD5fRX3WM0v*1|x}P0GS!Wz|$E{hw=v>SSn8w-*{zxY;g) zyuyNfi_FC`=xgfrc2NlJHmb-QIvU1T0R2&0*Hr5nqO{pt1gB`WH1utdd!WwW!PBnb`7*<@r?aT_#QSO!O{;+bPTZulKhmDeqraqn@CUeq7>5J&rQ7 ze_5WtkkCJiB+*%2%Kl)J`Xr3yqDODHOkhrVtL+mRZl&|I{yweGUUcW=vi@}4@G@on z(D*W-9Ow)51Ns94fPugu;8kESFa#J13wwYIA|MzfyA-lk@Iq>r)XczYz;BeOlyce1X>_)cr# zfpWHW=9Mn!v1^mn3U6t+7==f0LGQeFkNV+IDYNrZe|YHZjGH~kmQt4IP(E(0$XV+V zZ#~I+K7K9mKClj04+y{pU?cDW@FDOo;3HrYuo>6_Yz4Lf9|NBNp90%~9Y8a%6W9gp z2KE4-0WAOnJ_q&!UjSbMBJdTk4=@4yfdjxn;A`Lz@NeKSa0ECC90QI6-vHkN{{c<_ zCxKJIY2XZS7B~m|7dQ`G04@TTfXl!Y;5*W#`kWumfB*(d|54=M+hi!!3}Q2D3=R3WMeRg5Y@m7>Z}<*2@>eyIMa z0jPnfL8w@7OECC7c~zxAN4ls9aJ5v9<>0q5VZ)k z7_|ho6txVs9JK<~fLe)aM7@hzg=#`k)N0fk)O)D4sP|FpQ0q|wY6EH`>I2k=sDGh8 zLTy5AMr}cDMQuZUjQRxiDQY`v2dWvh6SWJq8?^`Z8L9=vP@kjrqP{?Vi4sv?q4uFn zsQst|sDr4lQHN0fMjb{SK^;XMLmfwbgZdWrAJhrdNz^ISY1A3iS=2eye^KXA7f=^b zmr$2cS5V)fuA*8|*HG6{H&EZBen8zs-9p_){fN4Q`U&+j>KD{q)IHRF)UT)qsNYb( zqaLCjp&q0DK>dmO3-tumhWZ<2M*V|&ih9Pu^hY4zPy{7I$x+TI1xkr>LAjz-C^wWE z<&N?|wL^KLyindKACxc359N;vKn0?LP{F7WRC`nhR46J8r9p+Gw5SMFB&s7S3Kfmg zp<+;-P_d}as4l2DR9BRxz6ls5qLNU_s8>+kP~A}}s2-?PR2oW;>WS)wN=Nl3CYb&R zyv?@UedzIGkCBPjLw4Lt*)5PQcE}3+Um2uEEn5Faf%hFIGo;|1L^D1+!{@^~(=9=4 z%OJ_>6)!yR3T8{{OL*0apXnnWe`C`B4Ljr1wK^$>dlN)6ZYlPXQjNxKHv}`JYSfQ= zOR3CRu2%*AA54`leQ_;FC9B`^lTwy5(?881kNt#CBQr@S(@@_`;?7wYn*1`!ht>sp zd!>&Dom}Z6-!Uy9lQ>&f`LKN^`Au3yC+rK&B-1PfI-w#glT^PD2bugdnWRZ>!s9qw zcPg}Y%p{wnT?x%mnPiPM#?$bkC4Va9rbW@2Ez1Mzqv-_cBq*1Y;cxOEpGC+xQ}Bf>V$#tI-zbBG z2lom|2cZ=XXYI{v`Ml+5pI1)N zbi==6BH`a|8PZ7bObv2zJr0+3Jlwm&_Xi3|EcM9APzlRD3W>WZ@=*c#m^0zArpctn z5MFyyK%xa4&4EHC#O;JuC{~*GLVQ?G^WW>!jxD$!F^Kbiy3O_uW}+PSuk*NNdibn> z7`z?YM&P{*$s@JKIz3tD3f>1!Wq@hx*g`VX%k`P`ftSmvsmjgpHpInu(FJK-=r7sF zg~oJmb|J~Hb=duK{%IjJ+tVVlUu)^_o|c|25U`K6rhCxqcb(x?h1-LZ(sTQgYfZw< zkPH%Ia@Q4;#~#9gX~i&jx5s4=7doy>nYSsedoejd=-5{~8BHar#bhBDz5Z+Ie2R|R z&j(*Y2JVyoRcd`h>m+zBC?)}>0DUo8k}ovZ6_bv_ad;0EVtFNHdIsT>LBgXe1tdra zH5U_=Dd78Ja$}sSt+0eV>BWBA<=Ku~e;+!Bu76UfSnji|gqVDmm6CfCw*OU1min_col; } if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); } else { cc=doc_ce->min_col; while (doc_ce->last!=doc && @@ -60,7 +60,7 @@ public U0 EdCursorLeft(CDoc *doc,I64 sc=I64_MIN) doc_ce->last->de_flags&(DOCEF_SKIP|DOCEF_FILTER_SKIP))) { doc_ce=doc_ce->last; if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); } if (doc_ce->last!=doc) { doc_ce=doc_ce->last; @@ -78,7 +78,7 @@ public U0 EdCursorLeft(CDoc *doc,I64 sc=I64_MIN) } else cc=doc_ce->max_col; if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); } } } @@ -123,7 +123,7 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=I64_MIN) old_de_flags=doc_ce->de_flags; old_color=doc_ce->type; if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); if (IsEditableText(doc_ce) && ccmax_col) { dst=doc_ce->tag+cc; doc_ne=DocEntryNewTag(doc,doc_ce,dst); @@ -141,17 +141,17 @@ public U0 EdCursorRight(CDoc *doc,I64 sc=I64_MIN) } else { if (doc_ce!=doc) { if (cc<=doc_ce->min_col && sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc_ce->next; while (doc_ce!=doc && doc_ce->de_flags&(DOCEF_SKIP|DOCEF_FILTER_SKIP)) { if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc_ce->next; } cc=doc_ce->min_col; if (doc_ce->type_u8==DOCT_SOFT_NEW_LINE) { if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc_ce->next; cc=doc_ce->min_col; } @@ -198,7 +198,7 @@ public U0 EdLineUp(CDoc *doc,I64 sc=I64_MIN) } else if (doc_ce->last!=doc) doc_ce=doc_ce->last; if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc->cur_entry=doc_ce; DocFormBwd(doc); doc_ce=doc->cur_entry; @@ -206,14 +206,14 @@ public U0 EdLineUp(CDoc *doc,I64 sc=I64_MIN) doc_ce->de_flags & (DOCEF_SKIP|DOCEF_FILTER_SKIP))) { doc_ce=doc_ce->last; if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); } y=doc_ce->y; doc->y=y; while (doc_ce!=doc && (doc_ce->y>=y && doc_ce->x>=x || doc_ce->de_flags & (DOCEF_SKIP|DOCEF_FILTER_SKIP))) { if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc_ce->last; } @@ -222,7 +222,7 @@ public U0 EdLineUp(CDoc *doc,I64 sc=I64_MIN) else { if (!IsEditableText(doc_ce)) { if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); } else { if (doc_ce->next->x==x) { doc_ce=doc_ce->next; @@ -345,7 +345,7 @@ public U0 EdLineDown(CDoc *doc,I64 sc=I64_MIN) doc_ce2->de_flags & (DOCEF_SKIP|DOCEF_FILTER_SKIP) || doc_ce2->x==x && !doc_ce2->max_col && Bt(doldoc.type_flags_nontag_invis,doc_ce2->type_u8)) && sc>=0) - BEqu(&doc_ce2->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce2->type,DOCEt_SEL,sc&SCF_SHIFT); if (doc_ce2==doc_ce) break; doc_ce2=doc_ce2->next; } @@ -377,7 +377,7 @@ public U0 EdLineDown(CDoc *doc,I64 sc=I64_MIN) if (!(doc->flags & DOCF_FORM)) while (doc_ce!=doc && doc_ce!=doc->cur_entry) { if (sc>=0) - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc_ce->next; } doc->x=doc->cur_entry->x+doc->cur_col; diff --git a/src/Zenith/DolDoc/DocFind.HC b/src/Zenith/DolDoc/DocFind.HC index f7ecf21a..eed4c0db 100755 --- a/src/Zenith/DolDoc/DocFind.HC +++ b/src/Zenith/DolDoc/DocFind.HC @@ -172,7 +172,7 @@ public U0 EdSelAll(CDoc *doc,Bool sel) Bool unlock=DocLock(doc); CDocEntry *doc_e=doc->head.next; while (doc_e!=doc) { - BEqu(&doc_e->type,DOCEt_SEL,sel); + BEqual(&doc_e->type,DOCEt_SEL,sel); doc_e=doc_e->next; } if (unlock) diff --git a/src/Zenith/DolDoc/DocForm.HC b/src/Zenith/DolDoc/DocForm.HC index 6922f00f..8d8c9915 100755 --- a/src/Zenith/DolDoc/DocForm.HC +++ b/src/Zenith/DolDoc/DocForm.HC @@ -324,7 +324,7 @@ dm_restart: Fs->catch_except=TRUE; } } - LBEqu(&Fs->task_flags,TASKf_BREAK_TO_SHIFT_ESC,old_break_shift_esc); + LBEqual(&Fs->task_flags,TASKf_BREAK_TO_SHIFT_ESC,old_break_shift_esc); Fs->border_src=old_border_src; Fs->task_end_cb=old_end_cb; return res; diff --git a/src/Zenith/DolDoc/DocGet.HC b/src/Zenith/DolDoc/DocGet.HC index 82b42573..0acc1b09 100755 --- a/src/Zenith/DolDoc/DocGet.HC +++ b/src/Zenith/DolDoc/DocGet.HC @@ -21,7 +21,7 @@ public I64 DocGetKey(I64 *_sc=NULL) old_key_desc=LBtr(&Fs->win_inhibit,WIf_SELF_KEY_DESC); do ch=GetKey(&sc,TRUE); while (sc&SCF_KEY_DESC); - LBEqu(&Fs->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); + LBEqual(&Fs->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); DocRecalc(DocPut); cont=FALSE; diff --git a/src/Zenith/DolDoc/DocNew.HC b/src/Zenith/DolDoc/DocNew.HC index 816eaae3..dd21b9ff 100755 --- a/src/Zenith/DolDoc/DocNew.HC +++ b/src/Zenith/DolDoc/DocNew.HC @@ -6,7 +6,7 @@ public Bool DocLock(CDoc *doc) while (LBts(&doc->locked_flags,DOClf_LOCKED)) Yield; if (doc->owning_task!=Fs) - LBEqu(&doc->flags,DOCf_BREAK_UNLOCKED,BreakLock(Fs)); + LBEqual(&doc->flags,DOCf_BREAK_UNLOCKED,BreakLock(Fs)); doc->owning_task=Fs; return TRUE; } else diff --git a/src/Zenith/DolDoc/DocPlain.HC b/src/Zenith/DolDoc/DocPlain.HC index 36e00c8f..7abccdea 100755 --- a/src/Zenith/DolDoc/DocPlain.HC +++ b/src/Zenith/DolDoc/DocPlain.HC @@ -8,13 +8,13 @@ I64 ParseDocFlagSingle(CCompCtrl *cc,I64 *_de_flags,U32 *_type,Bool turn_on) (tmph=HashFind(cc->cur_str,doldoc.hash,DHT_DOC_FLAG))) { res=tmph->user_data0; if (res<64) { - BEqu(_de_flags,res,turn_on); + BEqual(_de_flags,res,turn_on); switch (res) { case DOCEf_BLINK: case DOCEf_INVERT: case DOCEf_UNDERLINE: case DOCEf_SEL: - BEqu(_type,res,turn_on); + BEqual(_type,res,turn_on); break; } } @@ -573,7 +573,7 @@ U0 DocEntryToggle(CDoc *doc) } else { old_color_names=LBts(&doc->flags,DOCf_COLOR_NAMES); st=Doc2PlainText(doc,doc_ce); - LBEqu(&doc->flags,DOCf_COLOR_NAMES,old_color_names); + LBEqual(&doc->flags,DOCf_COLOR_NAMES,old_color_names); DocEntryDel(doc,doc_ce); DocPrint(doc,"$$$$%$$Q$$$$",st); } diff --git a/src/Zenith/DolDoc/DocPutKey.HC b/src/Zenith/DolDoc/DocPutKey.HC index 28472c14..13c453dd 100755 --- a/src/Zenith/DolDoc/DocPutKey.HC +++ b/src/Zenith/DolDoc/DocPutKey.HC @@ -63,7 +63,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) KeyDescSet("Edit/GoTo Doc End"); } else { while (doc_ce!=doc) { - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc->cur_entry=doc_ce->next; } doc->cur_col=doc_ce->min_col; @@ -94,7 +94,7 @@ public U0 DocPutKey(CDoc *doc,I64 ch=0,I64 sc=0) } else { if (doc_ce==doc) doc_ce=doc_ce->last; while (doc_ce!=doc) { - BEqu(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); + BEqual(&doc_ce->type,DOCEt_SEL,sc&SCF_SHIFT); doc_ce=doc->cur_entry=doc_ce->last; } doc_ce=doc->cur_entry=doc->head.next; diff --git a/src/Zenith/DolDoc/DocRecalc.HC b/src/Zenith/DolDoc/DocRecalc.HC index efd9ec63..e824b333 100755 --- a/src/Zenith/DolDoc/DocRecalc.HC +++ b/src/Zenith/DolDoc/DocRecalc.HC @@ -1293,7 +1293,7 @@ rc_skip: vss->pos=doc->top_line_num; } } - LBEqu(&doc->flags,DOCf_MORE,more); + LBEqual(&doc->flags,DOCf_MORE,more); } } if (!same_win) { diff --git a/src/Zenith/DolDoc/DocRecalcLib.HC b/src/Zenith/DolDoc/DocRecalcLib.HC index a83e41e3..94bdd983 100755 --- a/src/Zenith/DolDoc/DocRecalcLib.HC +++ b/src/Zenith/DolDoc/DocRecalcLib.HC @@ -137,21 +137,21 @@ public Bool DocCursor(Bool show=OFF,CDoc *doc=NULL) {//Show or hide cursor. if (!doc && !(doc=DocPut)) return FALSE; - return !LBEqu(&doc->flags,DOCf_HIDE_CURSOR,!show); + return !LBEqual(&doc->flags,DOCf_HIDE_CURSOR,!show); } public Bool DocHighlightCursor(Bool show=OFF,CDoc *doc=NULL) {//Highlight or Don't highlight cursor. if (!doc && !(doc=DocPut)) return FALSE; - return !LBEqu(&doc->flags,DOCf_DONT_HIGHLIGHT_CURSOR,!show); + return !LBEqual(&doc->flags,DOCf_DONT_HIGHLIGHT_CURSOR,!show); } public Bool DocScroll(Bool val=OFF,CDoc *doc=NULL) {//Turn scroll bars OFF/ON. if (!doc && !(doc=DocPut)) return FALSE; - return !LBEqu(&doc->flags,DOCf_NO_SCROLL_BARS,!val); + return !LBEqual(&doc->flags,DOCf_NO_SCROLL_BARS,!val); } public U0 DocCollapse(Bool collapse=TRUE,CDoc *doc=NULL) @@ -164,7 +164,7 @@ public U0 DocCollapse(Bool collapse=TRUE,CDoc *doc=NULL) doc_e=doc->head.next; while (doc_e!=doc) { if (doc_e->de_flags&DOCEF_TREE) - BEqu(&doc_e->de_flags,DOCEf_CHECKED_COLLAPSED,collapse); + BEqual(&doc_e->de_flags,DOCEf_CHECKED_COLLAPSED,collapse); doc_e=doc_e->next; } DocRecalc(doc); diff --git a/src/Zenith/Gr/SpriteEd.HC b/src/Zenith/Gr/SpriteEd.HC index 17ab9988..624a8820 100755 --- a/src/Zenith/Gr/SpriteEd.HC +++ b/src/Zenith/Gr/SpriteEd.HC @@ -563,7 +563,7 @@ I64 SpriteQueueSelAll(CSprite *head,Bool val=TRUE) I64 res=0; CSprite *tmpg=head->next; while (tmpg!=head) { - BEqu(&tmpg->type,SPf_SEL,val); + BEqual(&tmpg->type,SPf_SEL,val); res++; tmpg=tmpg->next; } diff --git a/src/Zenith/Gr/SpriteNew.HC b/src/Zenith/Gr/SpriteNew.HC index 4002a60a..07f6f598 100755 --- a/src/Zenith/Gr/SpriteNew.HC +++ b/src/Zenith/Gr/SpriteNew.HC @@ -102,7 +102,7 @@ U0 SpriteSelAll(U8 *elems,Bool val) { CSprite *tmpg=elems-offset(CSprite.start); while (tmpg->type&SPG_TYPE_MASK) { - BEqu(&tmpg->type,SPf_SEL,val); + BEqual(&tmpg->type,SPf_SEL,val); tmpg(U8 *)+=SpriteElemSize(tmpg); } } diff --git a/src/Zenith/Gr/SpriteSideBar.HC b/src/Zenith/Gr/SpriteSideBar.HC index 92aa7819..5a219416 100755 --- a/src/Zenith/Gr/SpriteSideBar.HC +++ b/src/Zenith/Gr/SpriteSideBar.HC @@ -12,7 +12,7 @@ CSprite *SpriteSideBar2SpriteQueue(CDoc *doc,CSprite *head,I64 *_cur_elem_num) tmpg=SpriteSetSettings(,head,doc_e->left_exp); if (tmpg!=head) { tmpg=MAllocIdent(tmpg); - BEqu(&tmpg->type,SPf_SEL,Bt(&doc_e->type,DOCEt_SEL)); + BEqual(&tmpg->type,SPf_SEL,Bt(&doc_e->type,DOCEt_SEL)); if (*_cur_elem_num==doc_e->left_exp) { *_cur_elem_num=num; found=TRUE; @@ -47,8 +47,8 @@ U0 SpriteSideBarPickNew(CDoc *doc,CSprite *head,I64 old_num) DocPrint(doc,"$$LTRED$$$$MU-UL,\"%$$Q\",LE=%d$$\n",st,cur_elem_num++); else doc_e=DocPrint(doc,"$$LTBLUE$$$$MU-UL,\"%$$Q\",LE=%d$$\n",st,cur_elem_num++); - BEqu(&doc_e->de_flags,DOCEf_SEL,Bt(&tmpg->type,&SPf_SEL)); - BEqu(&doc_e->type,DOCEt_SEL,Bt(&tmpg->type,SPf_SEL)); + BEqual(&doc_e->de_flags,DOCEf_SEL,Bt(&tmpg->type,&SPf_SEL)); + BEqual(&doc_e->type,DOCEt_SEL,Bt(&tmpg->type,SPf_SEL)); Free(st); tmpg=tmpg->next; } diff --git a/src/Zenith/TaskSettings.HC b/src/Zenith/TaskSettings.HC index fe27fd9c..e62e802e 100755 --- a/src/Zenith/TaskSettings.HC +++ b/src/Zenith/TaskSettings.HC @@ -64,9 +64,9 @@ U0 SettingsPop2(CTask *task,CTaskSettings *tmpse) CDoc *doc; if (doc=DocPut(task)) { - LBEqu(&doc->flags,DOCf_HIDE_CURSOR,!tmpse->hide_cursor); - LBEqu(&doc->flags,DOCf_DONT_HIGHLIGHT_CURSOR,!tmpse->highlight_cursor); - LBEqu(&doc->flags,DOCf_NO_SCROLL_BARS,!tmpse->scroll); + LBEqual(&doc->flags,DOCf_HIDE_CURSOR,!tmpse->hide_cursor); + LBEqual(&doc->flags,DOCf_DONT_HIGHLIGHT_CURSOR,!tmpse->highlight_cursor); + LBEqual(&doc->flags,DOCf_NO_SCROLL_BARS,!tmpse->scroll); } WinBorder(tmpse->border,task); diff --git a/src/Zenith/Training.HC b/src/Zenith/Training.HC index 7e8bca21..9daca753 100755 --- a/src/Zenith/Training.HC +++ b/src/Zenith/Training.HC @@ -153,7 +153,7 @@ public U0 KeyMap(CTask *task=NULL) KeyMapFamily(task,SCF_CTRL,TRUE,TRUE); KeyMapFamily(task,SCF_ALT,TRUE,TRUE); KeyMapCtrlAltFamily(TRUE,TRUE); - LBEqu(&task->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); + LBEqual(&task->win_inhibit,WIf_SELF_KEY_DESC,old_key_desc); "\nKeyMap Completed.\n"; } diff --git a/src/Zenith/Utils/Find.HC b/src/Zenith/Utils/Find.HC index 61481f6a..32d5fbda 100755 --- a/src/Zenith/Utils/Find.HC +++ b/src/Zenith/Utils/Find.HC @@ -167,7 +167,7 @@ before or after "dd" are label characters. if (fuf_flags&~(FUG_FILES_FIND|FUF_IGNORE|FUF_ALL| FUF_WHOLE_LABELS|FUF_WHOLE_LABELS_BEFORE|FUF_WHOLE_LABELS_AFTER)) throw('FUF'); - LBEqu(&fuf_flags,FUf_REPLACE,replace_text); + LBEqual(&fuf_flags,FUf_REPLACE,replace_text); tmpde=tmpde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND); fuf_flags&=FUF_ALL|FUF_REPLACE|FUF_IGNORE|FUF_WHOLE_LABELS| FUF_WHOLE_LABELS_BEFORE|FUF_WHOLE_LABELS_AFTER; diff --git a/src/Zenith/WinMgr.HC b/src/Zenith/WinMgr.HC index 3bb6822a..93fa491d 100755 --- a/src/Zenith/WinMgr.HC +++ b/src/Zenith/WinMgr.HC @@ -27,8 +27,8 @@ public U0 Refresh(I64 count=1,Bool force=FALSE) Sleep(1); } if (old_doc) - LBEqu(&old_doc->flags,DOCf_DO_FULL_REFRESH,old_full_refresh); - LBEqu(&Fs->task_flags,TASKf_IDLE,old_idle); + LBEqual(&old_doc->flags,DOCf_DO_FULL_REFRESH,old_full_refresh); + LBEqual(&Fs->task_flags,TASKf_IDLE,old_idle); } #help_index "Windows" diff --git a/src/Zenith/ZMathODE.HC b/src/Zenith/ZMathODE.HC index 664952a3..ae2b708d 100755 --- a/src/Zenith/ZMathODE.HC +++ b/src/Zenith/ZMathODE.HC @@ -56,7 +56,7 @@ public Bool ODEPause(CMathODE *ode,Bool val=ON) {//Pause ODE. Bool res; if (!ode) return OFF; - res=LBEqu(&ode->flags,ODEf_PAUSED,val); + res=LBEqual(&ode->flags,ODEf_PAUSED,val); if (val) while (Bt(&ode->flags,ODEf_BUSY)) Yield;