diff --git a/src/u_ceproject.pas b/src/u_ceproject.pas index bec7bfa8..409c5362 100644 --- a/src/u_ceproject.pas +++ b/src/u_ceproject.pas @@ -582,7 +582,7 @@ var src: string; i: Integer; begin - if fSrcs.Count = 0 then + if fSrcs.Count.equals(0) then exit; allMissing := true; for i:= 0 to fSrcs.Count-1 do @@ -783,7 +783,7 @@ begin processOutputToStrings(prc, lst); while prc.Running do sleep(1); - com := prc.ExitStatus = 0; + com := prc.ExitStatus.equals(0); for j := 0 to lst.Count -1 do fMsgs.message(lst[j], fAsProjectItf, amcProj, amkAuto); finally @@ -818,7 +818,7 @@ begin if poUsePipes in prc.Options then runProcOutput(prc); finally - result := prc.ExitStatus = 0; + result := prc.ExitStatus.equals(0); prc.Free; end; end; @@ -862,7 +862,7 @@ begin if not runPrePostProcess(config.preBuildProcess) then fMsgs.message('warning: pre-compilation process or commands not properly executed', fAsProjectItf, amcProj, amkWarn); - if (Sources.Count = 0) and (config.pathsOptions.extraSources.Count = 0) then + if Sources.Count.equals(0) and config.pathsOptions.extraSources.Count.equals(0) then exit; prjname := shortenPath(filename, 25); @@ -991,7 +991,7 @@ var begin compProcOutput(proc); prjname := shortenPath(filename); - fCompiled := fCompilProc.ExitStatus = 0; + fCompiled := fCompilProc.ExitStatus.equals(0); updateOutFilename; if fCompiled then fMsgs.message(prjname + ' has been successfully compiled', diff --git a/src/u_common.pas b/src/u_common.pas index e4a7b719..eb267baf 100644 --- a/src/u_common.pas +++ b/src/u_common.pas @@ -93,6 +93,14 @@ type function normalizePath: string; end; + TDexedInt64Helper = type helper for Int64 + function equals(const value: integer): boolean; inline; + end; + + TDexedLongIntHelper = type helper(TIntegerHelper) for LongInt + function equals(const value: integer): boolean; inline; + end; + TStringsHelper = class helper for TStrings // Same as text but without the additional line terminator. function strictText: string; @@ -521,13 +529,22 @@ begin exit(TrimFilename(self)); end; +function TDexedInt64Helper.equals(const value: integer): boolean; inline; +begin + result := value = self; +end; + +function TDexedLongIntHelper.equals(const value: integer): boolean; inline; +begin + result := value = self; +end; + function TStringsHelper.strictText: string; begin result := self.Text; setLength(result, result.length - self.LineBreak.length); end; - function TJSONObjectHelper.findObject(const key: TJSONStringType; out value: TJSONObject): boolean; var v: TJSONData; diff --git a/src/u_controls.pas b/src/u_controls.pas index cc2b1c14..d0919ce7 100644 --- a/src/u_controls.pas +++ b/src/u_controls.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, Forms, Controls, ComCtrls, ExtCtrls, buttons, Graphics, - Menus, Clipbrd; + Menus, Clipbrd, u_common; type TPageControlButton = (pbClose, pbMoveLeft, pbMoveRight, pbAdd, pbSplit); @@ -410,7 +410,7 @@ begin leftp := getPage(fPageIndex); leftp.Align := alLeft; - if fOldSplitPos = 0 then + if fOldSplitPos.equals(0) then leftp.Width:= (fContent.Width - fSplitter.Width) div 2 else leftp.Width:= fOldSplitPos; @@ -469,7 +469,7 @@ begin {$POP} end; - if fPages.Count = 0 then + if fPages.Count.equals(0) then fPageIndex:=-1; updateButtonsState; @@ -744,7 +744,7 @@ begin exit; c := getColumnIndex; - if c = 0 then + if c.equals(0) then s := fList.Selected.Caption else s := fList.Selected.SubItems[c-1]; @@ -778,7 +778,7 @@ begin exit; c := getColumnIndex; - if c = 0 then + if c.equals(0) then begin for i := 0 to fList.Items.Count - 1 do s += fList.Items[i].Caption + LineEnding; diff --git a/src/u_d2syn.pas b/src/u_d2syn.pas index 3ae278c1..e3e59517 100644 --- a/src/u_d2syn.pas +++ b/src/u_d2syn.pas @@ -7,7 +7,7 @@ interface uses Classes, SysUtils, Graphics, SynEditHighlighter, SynEditHighlighterFoldBase, SynEditTypes, - u_dlangutils,u_dlangmaps; + u_dlangutils, u_dlangmaps, u_common; type @@ -444,7 +444,7 @@ begin readerReset; // script line - if (LineIndex = 0) and (fTokStart = 1) and readDelim(reader, fTokStop, '#!') then + if LineIndex.equals(0) and fTokStart.equals(1) and readDelim(reader, fTokStop, '#!') then begin fTokKind := tkCommt; readLine(reader, fTokStop); @@ -613,11 +613,11 @@ begin end else readerNext; end; end; - if fCurrRange.nestedCommentsCount = 0 then + if fCurrRange.nestedCommentsCount.equals(0) then begin - if (fTokKind = tkCommt) then + if fTokKind = tkCommt then EndCodeFoldBlock(fkComments2 in fFoldKinds) - else if (fTokKind = tkDDocs) then + else if fTokKind = tkDDocs then EndCodeFoldBlock(fkDDoc in fFoldKinds); fCurrRange.rangeKinds -= [rkBlockDoc2, rkBlockCom2]; end; @@ -741,7 +741,7 @@ begin if readUntil(reader, fTokStop, ')"') then begin fCurrRange.nestedQParensStrings -= 1; - if fCurrRange.nestedQParensStrings = 0 then + if fCurrRange.nestedQParensStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); exit; @@ -757,7 +757,7 @@ begin if readUntil(reader, fTokStop, ')"') then begin fCurrRange.nestedQParensStrings -= 1; - if fCurrRange.nestedQParensStrings = 0 then + if fCurrRange.nestedQParensStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); fCurrRange.rangeKinds -= [rkStringQParen]; @@ -776,7 +776,7 @@ begin if readUntil(reader, fTokStop, ']"') then begin fCurrRange.nestedQSquareStrings -= 1; - if fCurrRange.nestedQSquareStrings = 0 then + if fCurrRange.nestedQSquareStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); exit; @@ -792,7 +792,7 @@ begin if readUntil(reader, fTokStop, ']"') then begin fCurrRange.nestedQSquareStrings -= 1; - if fCurrRange.nestedQSquareStrings = 0 then + if fCurrRange.nestedQSquareStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); fCurrRange.rangeKinds -= [rkStringQSquare]; @@ -811,7 +811,7 @@ begin if readUntil(reader, fTokStop, '>"') then begin fCurrRange.nestedQGeStrings -= 1; - if fCurrRange.nestedQGeStrings = 0 then + if fCurrRange.nestedQGeStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); exit; @@ -827,7 +827,7 @@ begin if readUntil(reader, fTokStop, ')"') then begin fCurrRange.nestedQGeStrings -= 1; - if fCurrRange.nestedQGeStrings = 0 then + if fCurrRange.nestedQGeStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); fCurrRange.rangeKinds -= [rkStringQGe]; @@ -846,7 +846,7 @@ begin if readUntil(reader, fTokStop, '}"') then begin fCurrRange.nestedQCurlyStrings -= 1; - if fCurrRange.nestedQCurlyStrings = 0 then + if fCurrRange.nestedQCurlyStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); exit; @@ -862,7 +862,7 @@ begin if readUntil(reader, fTokStop, '}"') then begin fCurrRange.nestedQCurlyStrings -= 1; - if fCurrRange.nestedQCurlyStrings = 0 then + if fCurrRange.nestedQCurlyStrings.equals(0) then begin readDelim(reader, fTokStop, stringPostfixes); fCurrRange.rangeKinds -= [rStringQCurly]; @@ -1023,7 +1023,7 @@ begin if rkAttrib in fCurrRange.rangeKinds then begin fCurrRange.attribParenCount -= 1; - if fCurrRange.attribParenCount = 0 then + if fCurrRange.attribParenCount.equals(0) then begin fCurrRange.rangeKinds -= [rkAttrib]; fTokKind := tkAttri; diff --git a/src/u_dcd.pas b/src/u_dcd.pas index fb43d01d..7dce49be 100644 --- a/src/u_dcd.pas +++ b/src/u_dcd.pas @@ -507,7 +507,7 @@ begin fTempLines.Clear; processOutputToStrings(fClient, fTempLines); while fClient.Running do ; - if fTempLines.Count = 0 then + if fTempLines.Count.equals(0) then begin updateServerlistening; exit; @@ -559,7 +559,7 @@ begin fTempLines.Clear; processOutputToStrings(fClient, fTempLines); while fClient.Running do ; - if fTempLines.Count = 0 then + if fTempLines.Count.equals(0) then begin updateServerlistening; exit; @@ -611,7 +611,7 @@ begin exit; i := fDoc.MouseBytePosition; - if i = 0 then + if i.equals(0) then exit; terminateClient; diff --git a/src/u_dlang.pas b/src/u_dlang.pas index 2e0df478..f8d6d51b 100644 --- a/src/u_dlang.pas +++ b/src/u_dlang.pas @@ -185,9 +185,9 @@ begin fReaderHead := text; while (LineAnColumn <> colAndLine) do Next; - // + // editor not 0 based ln index - if fLineIndex = 0 then + if fLineIndex.equals(0) then fLineIndex := 1; end; @@ -848,7 +848,7 @@ begin begin tokenStringBraceBalance -= Byte(reader.head^ = '}'); tokenStringBraceBalance += Byte(reader.head^ = '{'); - if tokenStringBraceBalance = 0 then + if tokenStringBraceBalance.equals(0) then begin if (reader.head^ = '}') and ((reader.head + 1)^ in stringPostfixes) and not isIdentifier((reader.head + 2)^) then @@ -1123,7 +1123,7 @@ begin if t^.kind <> TLexTokenKind.ltkSymbol then continue; // skip parens pairs, if not already skipping square bracket pairs - if (s = 0) then + if s.equals(0) then begin p += byte(t^.Data = '('); p -= byte(t^.Data = ')'); @@ -1131,14 +1131,14 @@ begin continue; end; // skip square bracket pairs, if not already skipping parens pairs - if (p = 0) then + if p.equals(0) then begin s += byte(t^.Data = '['); s -= byte(t^.Data = ']'); if s > 0 then continue; end; - if (s = 0) and (p = 0) and (t^.Data = ',') then + if s.equals(0) and p.equals(0) and (t^.Data = ',') then result += 1; end; end; @@ -1179,13 +1179,13 @@ begin p += Byte((t^.kind = TLexTokenKind.ltkSymbol) and (t^.Data = ')')); p -= Byte((t^.kind = TLexTokenKind.ltkSymbol) and (t^.Data = '(')); // (a.(b).c|.d) -> a.(b).c - if p = 0 then + if p.equals(0) then begin li := i+1; break; end; end; - if (li <> -1) and (ri >= li) then + if not li.equals(-1) and (ri >= li) then begin for i := li to ri do result += tokens[i]^.Data; diff --git a/src/u_dmdwrap.pas b/src/u_dmdwrap.pas index 48e81715..dcb9e318 100644 --- a/src/u_dmdwrap.pas +++ b/src/u_dmdwrap.pas @@ -749,7 +749,7 @@ begin list.Add('-main'); if baseopt.fRelease or fRelease then list.Add('-release'); - if (fVerIds.Count = 0) then + if fVerIds.Count.equals(0) then for str in baseopt.fVerIds do begin if not isStringDisabled(str) then @@ -931,11 +931,11 @@ begin baseopt := TDebugOpts(base); if baseopt.fDebugConditions or fDebugConditions then list.Add('-debug'); - if (baseopt.fDbgLevel <> 0) and (fDbgLevel = 0) then + if not baseopt.fDbgLevel.equals(0) and fDbgLevel.equals(0) then list.Add('-debug=' + intToStr(baseopt.fDbgLevel)) - else if fDbgLevel <> 0 then + else if not fDbgLevel.equals(0) then list.Add('-debug=' + intToStr(fDbgLevel)); - if fDbgIdents.Count = 0 then + if fDbgIdents.Count.equals(0) then for idt in baseopt.fDbgIdents do list.Add('-debug=' + idt) else for idt in fDbgIdents do @@ -1154,7 +1154,7 @@ begin end else begin baseopt := TPathsOpts(base); - if fExtraSrcs.Count = 0 then + if fExtraSrcs.Count.equals(0) then rightList := baseopt.fExtraSrcs else rightList := fExtraSrcs; @@ -1175,8 +1175,8 @@ begin finally exts.Free; end; - // - if fImpMod.Count = 0 then + + if fImpMod.Count.equals(0) then rightList := baseopt.fImpMod else rightList := fImpMod; @@ -1189,8 +1189,8 @@ begin str := c + str; list.Add('-I'+ fSymStringExpander.expand(str)); end; - // - if fImpStr.Count = 0 then + + if fImpStr.Count.equals(0) then rightList := baseopt.fImpStr else rightList := fImpStr; @@ -1389,7 +1389,7 @@ begin end else begin baseopt := TOtherOpts(base); - if fCustom.Count = 0 then + if fCustom.Count.equals(0) then rightList := baseopt.fCustom else rightList := fCustom; @@ -1439,17 +1439,17 @@ begin baseopt := TOtherOpts(base); case compiler of dmd: - if fDmdOthers.Count = 0 then + if fDmdOthers.Count.equals(0) then lst := baseopt.fDmdOthers else lst := fDmdOthers; ldc, ldmd: - if fLdcOthers.Count = 0 then + if fLdcOthers.Count.equals(0) then lst := baseopt.fLdcOthers else lst := fLdcOthers; gdc, gdmd: - if fGdcOthers.Count = 0 then + if fGdcOthers.Count.equals(0) then lst := baseopt.fGdcOthers else lst := fGdcOthers; diff --git a/src/u_dubproject.pas b/src/u_dubproject.pas index da6ba697..d66fa293 100644 --- a/src/u_dubproject.pas +++ b/src/u_dubproject.pas @@ -448,7 +448,7 @@ begin break; end; end; - if (j = 0) then + if j.equals(0) then continue; n := s[1..j-1]; @@ -1085,7 +1085,7 @@ begin fCompiled := fDubProc.ExitStatus = 0; // note: fCompiled is also used to indicate if there's something produced // so the 'or' RHS is there for fNextTerminatedCommand <> dcBuild; - if fCompiled or (fDubProc.ExitStatus = 0) then + if fCompiled or fDubProc.ExitStatus.equals(0) then begin fMsgs.message(n + ' has been successfully ' + dubCmd2PostMsg[fNextTerminatedCommand], fAsProjectItf, amcProj, amkInf) @@ -1593,7 +1593,7 @@ procedure TDubProject.updateImportPathsFromJson; Parameters.Add(n); Execute; while Running do ; - if ExitStatus = 0 then + if ExitStatus.equals(0) then begin TDubLocalPackages.setNeedUpdate; TDubLocalPackages.update(); @@ -1652,7 +1652,7 @@ procedure TDubProject.updateImportPathsFromJson; Parameters.Add('--version=' + p); Execute; while Running do ; - if ExitStatus = 0 then + if ExitStatus.equals(0) then begin TDubLocalPackages.setNeedUpdate; TDubLocalPackages.update(); diff --git a/src/u_dubprojeditor.pas b/src/u_dubprojeditor.pas index 07828906..7d4b759b 100644 --- a/src/u_dubprojeditor.pas +++ b/src/u_dubprojeditor.pas @@ -470,9 +470,9 @@ var begin if fSelectedNode.isNil then exit; - if fSelectedNode.Level = 0 then + if fSelectedNode.Level.equals(0) then exit; - if (fSelectedNode.Text = 'name') and (fSelectedNode.Level = 0) then + if (fSelectedNode.Text = 'name') and fSelectedNode.Level.equals(0) then exit; if fSelectedNode.Data.isNil then exit; diff --git a/src/u_editor.pas b/src/u_editor.pas index 354475d0..05e57a8f 100644 --- a/src/u_editor.pas +++ b/src/u_editor.pas @@ -846,7 +846,7 @@ var dc1: TDexedMemo = nil; dc2: TDexedMemo = nil; begin - if page.isNil or (page.ControlCount = 0) then + if page.isNil or page.ControlCount.equals(0) then exit; if pageControl.splitPage.isNotNil and (page <> pageControl.splitPage) then diff --git a/src/u_gdb.pas b/src/u_gdb.pas index 9a3c9431..97b1ee9b 100644 --- a/src/u_gdb.pas +++ b/src/u_gdb.pas @@ -1203,7 +1203,7 @@ begin p := projectByIndex[i]; if not p.filename.fileExists or p.filename.isEmpty then fProjects.Delete(i) - else if (p.arguments.Count = 0) and (p.environmentPaths.Count = 0) and + else if p.arguments.Count.equals(0) and p.environmentPaths.Count.equals(0) and (p.workingDirectory = '') and (p.queryArguments = false) then fProjects.Delete(i); end; @@ -1754,7 +1754,7 @@ begin end; '{': begin - if t = 0 then + if t.equals(0) then writeIndent() else newLineAndIndent(); @@ -2268,7 +2268,7 @@ var rng: TStringRange = (ptr: nil; pos: 0; len: 0); begin json.Clear; - if str.length = 0 then + if str.length.equals(0) then exit; rng.init(str); json.Arrays['OUT'] := TJSONArray.Create; @@ -2867,7 +2867,7 @@ begin case fEvalKind of gekCustom: begin - if fOptions.customEvalHistory.Count = 0 then + if fOptions.customEvalHistory.Count.equals(0) then fOptions.customEvalHistory.Add(''); e := InputComboEx('Evaluate', 'Expression', fOptions.customEvalHistory, true); if not e.isBlank then diff --git a/src/u_halstead.pas b/src/u_halstead.pas index 5b1d3818..f206a030 100644 --- a/src/u_halstead.pas +++ b/src/u_halstead.pas @@ -196,7 +196,7 @@ procedure THalsteadMetrics.Measure(document: TDexedMemo); if val.isNil then exit; n1 := val.AsInteger; - if n1 = 0 then + if n1.equals(0) then exit; val := obj.Find('n1Sum'); @@ -208,7 +208,7 @@ procedure THalsteadMetrics.Measure(document: TDexedMemo); if val.isNil then exit; n2 := val.AsInteger; - if n2 = 0 then + if n2.equals(0) then exit; val := obj.Find('n2Sum'); @@ -269,7 +269,7 @@ var i: integer; begin if not fShowAllResults - and ((maxBugsPerFunction = 0) and (maxBugsPerModule = 0) and (maxVolumePerFunction = 0)) then + and (maxBugsPerFunction = 0) and (maxBugsPerModule = 0) and (maxVolumePerFunction = 0) then exit; if not assigned(fMsgs) then diff --git a/src/u_libmaneditor.pas b/src/u_libmaneditor.pas index 2dad03c4..0ecee475 100644 --- a/src/u_libmaneditor.pas +++ b/src/u_libmaneditor.pas @@ -846,7 +846,7 @@ procedure TLibManEditorWidget.btnMoveUpClick(Sender: TObject); var i: integer; begin - if list.Selected.isNil or (list.Selected.Index = 0) then + if list.Selected.isNil or list.Selected.Index.equals(0) then exit; i := list.Selected.Index; diff --git a/src/u_main.pas b/src/u_main.pas index 2b655765..de41f89e 100644 --- a/src/u_main.pas +++ b/src/u_main.pas @@ -723,7 +723,7 @@ end; procedure TRunnableOptions.afterLoad; begin inherited; - if fStaticSwitches.Count = 0 then + if fStaticSwitches.Count.equals(0) then setDefaultSwitches else sanitizeSwitches; @@ -2978,7 +2978,7 @@ var form: TForm; memo: TMemo; begin - if fRunnablesOptions.fStaticSwitches.Count = 0 then + if fRunnablesOptions.fStaticSwitches.Count.equals(0) then fRunnablesOptions.setDefaultSwitches; form := TForm.Create(nil); form.BorderIcons:= [biSystemMenu]; @@ -3021,7 +3021,7 @@ begin result := false; fMsgs.clearByData(fDoc); FreeRunnableProc; - if fDoc.isNil or (fDoc.Lines.Count = 0) then + if fDoc.isNil or fDoc.Lines.Count.equals(0) then exit; firstlineFlags := fDoc.Lines[0]; @@ -3071,7 +3071,7 @@ begin fDoc.saveTempFile; fname := runnableExename.stripFileExt; - if fRunnablesOptions.staticSwitches.Count = 0 then + if fRunnablesOptions.staticSwitches.Count.equals(0) then fRunnablesOptions.setDefaultSwitches; {$IFDEF RELEASE} dmdProc.ShowWindow := swoHIDE; @@ -3168,7 +3168,7 @@ begin if not asObj then sysutils.DeleteFile(fname + objExt); - if (dmdProc.ExitStatus = 0) then + if dmdProc.ExitStatus.equals(0) then begin result := true; fMsgs.message(shortenPath(fDoc.fileName, 25) + ' successfully compiled', @@ -3250,7 +3250,7 @@ const ic : array[boolean] of TAppMessageKind = (amkWarn, amkInf); begin asyncprocTerminate(sender); - if fCovModUt and assigned(fRunProc) and (fRunProc.ExitStatus = 0) then + if fCovModUt and assigned(fRunProc) and fRunProc.ExitStatus.equals(0) then begin fname := fDoc.fileName.stripFileExt; fullcov := true; @@ -3587,7 +3587,7 @@ begin if sender.isNil then exit; act := TAction(sender); - if act.Tag = 0 then + if act.Tag.equals(0) then exit; widg := TDexedWidget(act.Tag); @@ -4310,7 +4310,7 @@ var begin if checkProjectLock then exit; - if fProjectGroup.projectCount = 0 then + if fProjectGroup.projectCount.equals(0) then exit; fProjBeforeGroup := fProj; fGroupCompilationCnt := 0; diff --git a/src/u_miniexplorer.pas b/src/u_miniexplorer.pas index 422e96b5..c54facd2 100644 --- a/src/u_miniexplorer.pas +++ b/src/u_miniexplorer.pas @@ -852,7 +852,7 @@ begin m.Caption := d[i]; m.OnClick := @mnuDriveItemClick; mnuDrives.Items.Add(m); - if i = 0 then + if i.equals(0) then treeFolders.Root:= m.Caption; end; m := Tmenuitem.Create(self); diff --git a/src/u_mru.pas b/src/u_mru.pas index c4760686..0ae7dd14 100644 --- a/src/u_mru.pas +++ b/src/u_mru.pas @@ -113,9 +113,9 @@ var i: integer; begin i := indexOf(value); - if i = -1 then + if i.equals(-1) then exit(true); - if i = 0 then + if i.equals(0) then exit(false); if Count < 2 then exit(false); diff --git a/src/u_optionseditor.pas b/src/u_optionseditor.pas index 84df1eb8..ff1340b6 100644 --- a/src/u_optionseditor.pas +++ b/src/u_optionseditor.pas @@ -124,7 +124,7 @@ var begin if assigned(observer) then begin - if selCat.Items.Count = 0 then + if selCat.Items.Count.equals(0) then updateCategories; n := selCat.Items.FindNodeWithText(observer.optionedWantCategory()); if n.isNotNil then diff --git a/src/u_procinput.pas b/src/u_procinput.pas index ed7f5791..f8a8051b 100644 --- a/src/u_procinput.pas +++ b/src/u_procinput.pas @@ -64,7 +64,7 @@ begin fname := getDocPath + OptsFname; if OptsFname.fileExists then fMru.LoadFromFile(fname); - if fMru.Count = 0 then + if fMru.Count.equals(0) then fMru.Insert(0, '(your input here)'); case GetIconScaledSize of @@ -153,7 +153,7 @@ procedure TProcInputWidget.sendInput; var inp: string; begin - if fProc.Input.isNil or (fProc.Input.Handle = 0) then + if fProc.Input.isNil or fProc.Input.Handle.equals(0) then exit; fMru.Insert(0,txtInp.Text); diff --git a/src/u_profileviewer.pas b/src/u_profileviewer.pas index 11bfde5b..ade8190c 100644 --- a/src/u_profileviewer.pas +++ b/src/u_profileviewer.pas @@ -422,7 +422,7 @@ var if not fOptions.hideAttributes then exit; p := pos('(', idt); - if p = 0 then + if p.equals(0) then p := integer.MaxValue; for s in a do begin @@ -450,7 +450,7 @@ begin free; end; - if log.length = 0 then + if log.length.equals(0) then exit; // ======== Timer Is 35.... ============ diff --git a/src/u_projgroup.pas b/src/u_projgroup.pas index 723606dd..87862ff8 100644 --- a/src/u_projgroup.pas +++ b/src/u_projgroup.pas @@ -689,7 +689,7 @@ end; procedure TProjectGroupWidget.btnMoveUpClick(Sender: TObject); begin - if (lstProj.ItemIndex = -1) or (lstProj.ItemIndex = 0) then + if lstProj.ItemIndex.equals(-1) or lstProj.ItemIndex.equals(0) then exit; projectGroup.items.Exchange(lstProj.ItemIndex, lstProj.ItemIndex - 1); lstProj.Items.Exchange(lstProj.ItemIndex, lstProj.ItemIndex - 1); diff --git a/src/u_projinspect.pas b/src/u_projinspect.pas index 909afcd1..cb148002 100644 --- a/src/u_projinspect.pas +++ b/src/u_projinspect.pas @@ -685,12 +685,12 @@ begin chd := nil; fld := rng.takeUntil(['/','\']).yield; chd := itm.FindNode(fld); - if chd.isNil and ((rng.empty and (j = 1)) or (not rng.empty and (j = 0))) then + if chd.isNil and ((rng.empty and j.equals(1)) or (not rng.empty and j.equals(0))) then chd := Tree.Items.AddChild(itm, fld); if chd.isNotNil then itm := chd; // reached fname - if rng.empty and (j = 1) then + if rng.empty and j.equals(1) then begin itm.Data:= NewStr(fProj.sourceAbsolute(i)); itm.ImageIndex := 2; diff --git a/src/u_projutils.pas b/src/u_projutils.pas index 4603e2cd..27d739c3 100644 --- a/src/u_projutils.pas +++ b/src/u_projutils.pas @@ -246,14 +246,14 @@ begin end; deleteDups(lst); // issue 300 when no moduleDeclaration lst can be empty - if (lst.Count = 0) and (project.sourcesCount > 0) then + if lst.Count.equals(0) and not project.sourcesCount.equals(0) then begin for i := 0 to project.sourcesCount-1 do lst.Add(project.sourceAbsolute(i)); result := commonFolder(lst); result := result.extractFileDir; end - else if (project.sourcesCount = 0) then + else if project.sourcesCount.equals(0) then result := '' else begin diff --git a/src/u_search.pas b/src/u_search.pas index 8e834050..fb57c6da 100644 --- a/src/u_search.pas +++ b/src/u_search.pas @@ -414,7 +414,7 @@ begin c.LoadFromFile(f); s += findAll(f, c, false); end; - if s = 0 then + if s.equals(0) then begin m := getMessageDisplay; m.message(format('0 result for the pattern <%s>', [fToFind]), @@ -435,7 +435,7 @@ begin f := h.getDocument(i).fileName; s += findAll(f, h.getDocument(i).Lines, false); end; - if s = 0 then + if s.equals(0) then begin m := getMessageDisplay; m.message(format('0 result for the pattern <%s>', [fToFind]), @@ -585,7 +585,7 @@ begin else fDoc.CaretX := fDoc.CaretX + 1; end; - if fDoc.SearchReplace(fToFind, '', getOptions) = 0 then + if fDoc.SearchReplace(fToFind, '', getOptions).equals(0) then begin s := format('the expression cannot be found, restart from the %s ?', [r[chkBack.Checked]]); if dlgOkCancel(s) = mrOk then @@ -668,7 +668,7 @@ begin end; while(true) do begin - if fDoc.SearchReplace(fToFind, fReplaceWth, opts) = 0 then + if fDoc.SearchReplace(fToFind, fReplaceWth, opts).equals(0) then break; if fCancelAll then begin diff --git a/src/u_shortcutseditor.pas b/src/u_shortcutseditor.pas index bf9fa941..00a484bb 100644 --- a/src/u_shortcutseditor.pas +++ b/src/u_shortcutseditor.pas @@ -239,7 +239,7 @@ end; function TShortcutEditor.anItemIsSelected: boolean; begin result := true; - if tree.Selected.isNil or (tree.Selected.Level = 0) or tree.Selected.Data.isNil then + if tree.Selected.isNil or tree.Selected.Level.equals(0) or tree.Selected.Data.isNil then result := false; end; {$ENDREGION} diff --git a/src/u_symlist.pas b/src/u_symlist.pas index bd596a5e..9e84cd0b 100644 --- a/src/u_symlist.pas +++ b/src/u_symlist.pas @@ -738,7 +738,7 @@ begin exit; if fDoc.isNil then exit; - if (fDoc.Lines.Count = 0) or not fDoc.isDSource then + if fDoc.Lines.Count.equals(0) or not fDoc.isDSource then begin clearTree; updateVisibleCat; diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas index b7509fd4..c097278e 100644 --- a/src/u_synmemo.pas +++ b/src/u_synmemo.pas @@ -1704,9 +1704,9 @@ begin end; if (t <> 0) and (s <> 0) then result := imMixed - else if t = 0 then + else if t.equals(0) then result := imSpaces - else if s = 0 then + else if s.equals(0) then result := imTabs else result := imNone; @@ -1741,7 +1741,7 @@ begin if not fIsDSource and not alwaysAdvancedFeatures then exit; BeginUndoBlock; - if ((CaretX-1) and 1) = 0 then + if ((CaretX-1) and 1).equals(0) then ExecuteCommand(ecChar, ' ', nil); ExecuteCommand(ecChar, c, nil); EndUndoBlock; @@ -1879,7 +1879,7 @@ begin if (line.length > 1) and (line[1..2] = '//') then numUndo += 1; end; - if numUndo = 0 then + if numUndo.equals(0) then mustUndo := false else if numUndo = BlockEnd.Y + 1 - BlockBegin.Y then mustUndo := true; @@ -2067,7 +2067,7 @@ begin exit; old := GetWordAtRowCol(LogicalCaretXY); DcdWrapper.getLocalSymbolUsageFromCursor(locs); - if length(locs) = 0 then + if length(locs).equals(0) then begin dlgOkInfo('Unknown, ambiguous or non-local symbol for "'+ old +'"'); exit; @@ -2839,7 +2839,7 @@ begin caretX := caretX + 1; getCompletionList(); - if fCompletion.TheForm.ItemList.Count = 0 then + if fCompletion.TheForm.ItemList.Count.equals(0) then begin fCompletion.TheForm.Close; exit; @@ -2950,7 +2950,7 @@ end; procedure TDexedMemo.AutoDotTimerEvent(sender: TObject); begin - if (not fCanAutoDot) or (fAutoDotDelay = 0) then + if not fCanAutoDot or fAutoDotDelay.equals(0) then exit; fCanAutoDot := false; @@ -3153,7 +3153,7 @@ begin if fHasModuleDeclaration then result := getModuleName(fLexToks); end; - if result.length = 0 then + if result.length.equals(0) then begin if fFilename.length > 0 then result := fFilename.extractFileName @@ -3234,7 +3234,7 @@ begin exit(braceCloseInvalid); c += byte((tok^.kind = TLexTokenKind.ltkSymbol) and (((tok^.Data = '{')) or (tok^.Data = 'q{'))); c -= byte((tok^.kind = TLexTokenKind.ltkSymbol) and (tok^.Data = '}')); - if bet and (c = 0) then + if bet and c.equals(0) then exit(braceCloseLessEven); end; if (tok <> nil) and (tok^.kind = ltkIllegal) then diff --git a/src/u_todolist.pas b/src/u_todolist.pas index 9094ec9c..ac58db2b 100644 --- a/src/u_todolist.pas +++ b/src/u_todolist.pas @@ -434,7 +434,7 @@ begin c := getContext; case c of tcNone: exit; - tcProject: if (fProj = nil) or (fProj.sourcesCount = 0) then + tcProject: if (fProj = nil) or fProj.sourcesCount.equals(0) then exit; tcFile: if fDoc = nil then exit; @@ -613,7 +613,7 @@ var col: Integer; begin col := lstItems.SortColumn; - if col = 0 then + if col.equals(0) then begin txt1 := item1.Caption; txt2 := item2.Caption;