diff --git a/components/anchordocking/anchordockstorage.pas b/components/anchordocking/anchordockstorage.pas index d911a7c7c5..5a8258cf62 100644 --- a/components/anchordocking/anchordockstorage.pas +++ b/components/anchordocking/anchordockstorage.pas @@ -1957,8 +1957,7 @@ begin Layout.LoadFromConfig(Config); for i:=FControlNames.Count-1 downto 0 do begin AName:=FControlNames[i]; - if (AName<>'') and IsValidIdent(AName) - and (Layout.Root<>nil) then begin + if IsValidIdent(AName) and (Layout.Root<>nil) then begin Node:=Layout.Root.FindChildNode(AName,true); if (Node<>nil) and (Node.NodeType in [adltnControl,adltnCustomSite]) then continue; @@ -1979,8 +1978,7 @@ begin Layout.LoadFromConfig(Path, Config); for i:=FControlNames.Count-1 downto 0 do begin AName:=FControlNames[i]; - if (AName<>'') and IsValidIdent(AName) - and (Layout.Root<>nil) then begin + if IsValidIdent(AName) and (Layout.Root<>nil) then begin Node:=Layout.Root.FindChildNode(AName,true); if (Node<>nil) and (Node.NodeType in [adltnControl,adltnCustomSite]) then continue; diff --git a/components/codetools/basiccodetools.pas b/components/codetools/basiccodetools.pas index d40b4e8c34..6f015947c2 100644 --- a/components/codetools/basiccodetools.pas +++ b/components/codetools/basiccodetools.pas @@ -1076,7 +1076,7 @@ begin if SearchCodeInSource(Source,FormClassName+'=class(',1,SrcPos,false)<1 then exit; Result:=ReadNextPascalAtom(Source,SrcPos,AtomStart); - if (Result<>'') and (not IsValidIdent(Result)) then + if not IsValidIdent(Result) then Result:=''; end; diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas index b83afe8aae..367cc7e134 100644 --- a/components/codetools/codecompletiontool.pas +++ b/components/codetools/codecompletiontool.pas @@ -2897,7 +2897,7 @@ var if Result='' then Result:=ParamType; // otherwise use 'Param' - if (Result='') or (not IsValidIdent(Result)) then + if not IsValidIdent(Result) then Result:='Param'; // prepend an 'a' if Result[1]<>'a' then diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas index 82ad9f20f6..7c3bbda244 100644 --- a/components/codetools/codetoolmanager.pas +++ b/components/codetools/codetoolmanager.pas @@ -2623,7 +2623,7 @@ begin Result:=true; exit; end; - if (NewIdentifier='') or (not IsValidIdent(NewIdentifier)) then exit; + if not IsValidIdent(NewIdentifier) then exit; ClearCurCodeTool; SourceChangeCache.Clear; diff --git a/components/codetools/codetoolscfgscript.pas b/components/codetools/codetoolscfgscript.pas index 3859e4fcbc..7b35b4f05e 100644 --- a/components/codetools/codetoolscfgscript.pas +++ b/components/codetools/codetoolscfgscript.pas @@ -298,8 +298,7 @@ var AtomStart: PChar; SrcPos: PtrUInt; begin - if (Src='') or (OldName='') or (not IsValidIdent(OldName)) - or (NewName='') then exit; + if (Src='') or not IsValidIdent(OldName) or (NewName='') then exit; p:=PChar(Src); //debugln(['RenameCTCSVariable START ',dbgstr(Src)]); repeat @@ -1181,7 +1180,7 @@ begin Clear; for i:=0 to Source.Count-1 do begin Name:=Source.Names[i]; - if (Name='') or not IsValidIdent(Name) then continue; + if not IsValidIdent(Name) then continue; Value:=Source.ValueFromIndex[i]; Define(PChar(Name),Value); end; diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas index e23403ae81..97f1e4c22e 100644 --- a/components/codetools/definetemplates.pas +++ b/components/codetools/definetemplates.pas @@ -7946,7 +7946,7 @@ begin for i:=1 to Cnt do begin SubPath:=Path+'Defines/Macro'+IntToStr(i)+'/'; DefineName:=UpperCaseStr(XMLConfig.GetValue(SubPath+'Name','')); - if (DefineName='') or (not IsValidIdent(DefineName)) then begin + if not IsValidIdent(DefineName) then begin DebugLn(['Warning: [TFPCTargetConfigCache.LoadFromXMLConfig] invalid define name ',DefineName]); continue; end; @@ -7964,7 +7964,7 @@ begin StartPos:=1; while (p<=length(s)) and (s[p]<>';') do inc(p); DefineName:=copy(s,StartPos,p-StartPos); - if (DefineName<>'') and IsValidIdent(DefineName) then begin + if IsValidIdent(DefineName) then begin if Undefines=nil then Undefines:=TStringToStringTree.Create(false); Undefines[DefineName]:=''; @@ -8057,7 +8057,7 @@ begin Node:=Defines.Tree.FindLowest; while Node<>nil do begin Item:=PStringToStringTreeItem(Node.Data); - if (Item^.Name<>'') and IsValidIdent(Item^.Name) then begin + if IsValidIdent(Item^.Name) then begin inc(Cnt); SubPath:=Path+'Defines/Macro'+IntToStr(Cnt)+'/'; XMLConfig.SetDeleteValue(SubPath+'Name',Item^.Name,''); diff --git a/components/codetools/h2pastool.pas b/components/codetools/h2pastool.pas index 8dad14ed9c..e2dc762529 100644 --- a/components/codetools/h2pastool.pas +++ b/components/codetools/h2pastool.pas @@ -2520,8 +2520,8 @@ function TH2PasTool.CreateH2PNode(var PascalName: string; const CName: string; const PascalCode: string; ParentNode: TH2PNode; IsGlobal: boolean; InsertAsPreLast: boolean): TH2PNode; begin - if (PascalName<>'') and (PascalDesc<>ctnNone) and IsValidIdent(PascalName) - then begin + if (PascalDesc<>ctnNone) and IsValidIdent(PascalName) then + begin if WordIsKeyWord.DoItCaseInsensitive(PChar(PascalName)) then begin // C name is keyword => auto rename PascalName:=PascalName+'_'; diff --git a/components/codetools/ide/addassignmethoddlg.pas b/components/codetools/ide/addassignmethoddlg.pas index fd2ab92082..9e02b75006 100644 --- a/components/codetools/ide/addassignmethoddlg.pas +++ b/components/codetools/ide/addassignmethoddlg.pas @@ -390,7 +390,7 @@ begin FAssignBodyNode:=nil; FInheritedDeclContext:=CleanFindContext; NewProcName:=ProcNameEdit.Text; - if (NewProcName<>'') and IsValidIdent(NewProcName) then + if IsValidIdent(NewProcName) then FProcName:=NewProcName; Result:=(FCode<>nil) and CodeToolBoss.FindAssignMethod(FCode,FX,FY, @@ -433,7 +433,7 @@ begin DeclGroupBox.Caption:=crsCAMNewMethod; ProcNameLabel.Caption:=crsCAMMethodName; - if (NewProcName='') or (not IsValidIdent(NewProcName)) then + if not IsValidIdent(NewProcName) then ProcNameErrorLabel.Caption:=crsCAMInvalidIdentifier else if not Result then ProcNameErrorLabel.Caption:=crsCAMCursorIsNotInAPascalClassDeclaration @@ -445,7 +445,7 @@ begin ParamNameLabel.Caption:=crsCAMParameterName; if UseInheritedParam then ParamNameEdit.Text:=FInheritedParamName; - if (ParamNameEdit.Text='') or not IsValidIdent(ParamNameEdit.Text) then + if not IsValidIdent(ParamNameEdit.Text) then ParamNameErrorLabel.Caption:=crsCAMInvalidIdentifier else ParamNameErrorLabel.Caption:=''; @@ -453,7 +453,7 @@ begin ParamTypeLabel.Caption:=crsCAMParameterType; if UseInheritedParam then ParamTypeEdit.Text:=FInheritedParamType; - if (ParamTypeEdit.Text='') or not IsValidIdent(ParamTypeEdit.Text) then + if not IsValidIdent(ParamTypeEdit.Text) then ParamTypeErrorLabel.Caption:=crsCAMInvalidIdentifier else ParamTypeErrorLabel.Caption:=''; diff --git a/components/codetools/ide/newidewnddlg.pas b/components/codetools/ide/newidewnddlg.pas index 1ffcaec96b..65f28fd02d 100644 --- a/components/codetools/ide/newidewnddlg.pas +++ b/components/codetools/ide/newidewnddlg.pas @@ -100,11 +100,8 @@ begin end; function TNewIDEWndCfgDialog.IsFormNameValid: boolean; -var - s: TCaption; begin - s:=FormNameEdit.Text; - Result:=(s<>'') and IsValidIdent(s); + Result:=IsValidIdent(FormNameEdit.Text); end; function TNewIDEWndCfgDialog.IsMenuCaptionValid: boolean; diff --git a/components/codetools/keywordfunclists.pas b/components/codetools/keywordfunclists.pas index f6b0edfb50..61b866aebd 100644 --- a/components/codetools/keywordfunclists.pas +++ b/components/codetools/keywordfunclists.pas @@ -388,7 +388,7 @@ begin DoDataFunction:=ADataFunction; end; inc(FCount); - if (AKeyWord='') or not IsValidIdent(AKeyWord) then + if not IsValidIdent(AKeyWord) then FHasOnlyIdentifiers:=false; end; diff --git a/components/codetools/ppugraph.pas b/components/codetools/ppugraph.pas index 4e6622b184..fa9ebc9952 100644 --- a/components/codetools/ppugraph.pas +++ b/components/codetools/ppugraph.pas @@ -690,7 +690,7 @@ begin if (CompareFileExt(Filename,'ppu',false)<>0) then continue; AUnitName:=ExtractFileNameOnly(Filename); Filename:=AppendPathDelim(Directory)+Filename; - if (AUnitName='') or (not IsValidIdent(AUnitName)) then begin + if not IsValidIdent(AUnitName) then begin DebugLn(['TPPUGroups.AddFPCGroup NOTE: invalid ppu name: ',Filename]); continue; end; diff --git a/components/education/eduoptions.pas b/components/education/eduoptions.pas index 30a8c25c14..c7a8f21266 100644 --- a/components/education/eduoptions.pas +++ b/components/education/eduoptions.pas @@ -281,7 +281,7 @@ var begin for i:=0 to ChildCount-1 do begin Child:=Children[i]; - if (Child.Name='') or (not IsValidIdent(Child.Name)) then continue; + if not IsValidIdent(Child.Name) then continue; Config.AppendBasePath(Child.Name); try Result:=Child.Load(Config); @@ -300,7 +300,7 @@ var begin for i:=0 to ChildCount-1 do begin Child:=Children[i]; - if (Child.Name='') or (not IsValidIdent(Child.Name)) then continue; + if not IsValidIdent(Child.Name) then continue; Config.AppendBasePath(Child.Name); try Result:=Child.Save(Config); diff --git a/components/ideintf/idewindowintf.pas b/components/ideintf/idewindowintf.pas index 7ff9d9be35..58562def92 100644 --- a/components/ideintf/idewindowintf.pas +++ b/components/ideintf/idewindowintf.pas @@ -1643,7 +1643,7 @@ begin while i > 0 do begin ID := Config.GetValue(Path+'Desktop/FormIdList/a'+IntToStr(i), ''); //debugln(['TSimpleWindowLayoutList.LoadFromConfig ',i,' ',ID]); - if (ID <> '') and IsValidIdent(ID) then + if IsValidIdent(ID) then begin xLayoutIndex := IndexOf(ID); if (xLayoutIndex = -1) then @@ -2297,7 +2297,7 @@ procedure TIDEWindowCreatorList.ShowForm(AForm: TCustomForm; BringToFront: boole var Layout: TSimpleWindowLayout; begin - if (AForm.Name='') or (not IsValidIdent(AForm.Name)) then + if not IsValidIdent(AForm.Name) then raise Exception.Create('TIDEWindowCreatorList.ShowForm invalid form name '+AForm.Name); // auto create a layout storage for every shown form diff --git a/components/ideintf/oifavoriteproperties.pas b/components/ideintf/oifavoriteproperties.pas index 00a2e883b1..f84342e3c5 100644 --- a/components/ideintf/oifavoriteproperties.pas +++ b/components/ideintf/oifavoriteproperties.pas @@ -288,11 +288,11 @@ begin for i:=0 to NewCount-1 do begin p:=Path+'Item'+IntToStr(i)+'/'; NewPropertyName:=ConfigStore.GetValue(p+'PropertyName',''); - if (NewPropertyName='') or (not IsValidIdent(NewPropertyName)) then + if not IsValidIdent(NewPropertyName) then continue; NewInclude:=ConfigStore.GetValue(p+'Include',true); NewBaseClassname:=ConfigStore.GetValue(p+'BaseClass',''); - if (NewBaseClassname='') or (not IsValidIdent(NewBaseClassname)) then + if not IsValidIdent(NewBaseClassname) then continue; NewBaseClass:=GetClass(NewBaseClassname); NewItem:=TOIFavoriteProperty.Create(NewBaseClass,NewPropertyName, diff --git a/components/ideintf/propedits.pp b/components/ideintf/propedits.pp index 64f06e1057..6ec2820fc0 100644 --- a/components/ideintf/propedits.pp +++ b/components/ideintf/propedits.pp @@ -4885,7 +4885,7 @@ end; procedure TComponentNamePropertyEditor.SetValue(const NewValue: ansistring); begin - if (not IsValidIdent(NewValue)) or (NewValue='') then + if not IsValidIdent(NewValue) then raise Exception.Create(Format(oisComponentNameIsNotAValidIdentifier, [NewValue])); inherited SetValue(NewValue); PropertyHook.ComponentRenamed(TComponent(GetComponent(0))); diff --git a/components/rtticontrols/rttictrls.pas b/components/rtticontrols/rttictrls.pas index a76c5fae02..efe68c5d37 100644 --- a/components/rtticontrols/rttictrls.pas +++ b/components/rtticontrols/rttictrls.pas @@ -1677,9 +1677,8 @@ procedure TCustomPropertyLink.SetObjectAndProperty(NewPersistent: TPersistent; var AComponent: TComponent; begin - // Note: checking for IsValidIdent is not needed, because - // an identifier is is only needed for streaming. So every string as Name is - // allowed. + // Note: checking for IsValidIdent is not needed, because an identifier + // is only needed for streaming. So every string as Name is allowed. if (NewPersistent<>TIObject) or (NewPropertyName<>TIPropertyName) then begin FPropertyLoaded:=false; if (FTIObject is TComponent) then begin diff --git a/components/todolist/todolist.pas b/components/todolist/todolist.pas index 6adad67c5f..fd22ce46a9 100644 --- a/components/todolist/todolist.pas +++ b/components/todolist/todolist.pas @@ -452,7 +452,7 @@ begin CurOwner:=nil; CurProject:=nil; CurPkg:=nil; - if (IDEItem<>'') and IsValidIdent(IDEItem) then begin + if IsValidIdent(IDEItem) then begin // package CurPkg:=PackageEditingInterface.FindPackageWithName(IDEItem); CurOwner:=CurPkg; diff --git a/components/wiki/lazwiki/wiki2fpdocconvert.pas b/components/wiki/lazwiki/wiki2fpdocconvert.pas index 1caa203649..50b09936af 100644 --- a/components/wiki/lazwiki/wiki2fpdocconvert.pas +++ b/components/wiki/lazwiki/wiki2fpdocconvert.pas @@ -279,8 +279,8 @@ begin end; { IsValidIdent returns true if the first character of Ident is in: - 'A' to 'Z', 'a' to 'z' or '_' and the following characters are - on of: 'A' to 'Z', 'a' to 'z', '0'..'9' or '_' } + 'A' to 'Z', 'a' to 'z' or '_' and the following characters are one of: + 'A' to 'Z', 'a' to 'z', '0'..'9' or '_' } function IsValidNodeName(const Ident: string): boolean; var p: PChar; @@ -412,7 +412,7 @@ end; procedure TWiki2FPDocConverter.SetPackageName(AValue: string); begin - if (AValue='') or not IsValidIdent(AValue) then + if not IsValidIdent(AValue) then raise Exception.Create('invalid package name "'+AValue+'"'); if FPackageName=AValue then Exit; FPackageName:=AValue; diff --git a/designer/askcompnamedlg.pas b/designer/askcompnamedlg.pas index dba48ac339..bcef1a3b14 100644 --- a/designer/askcompnamedlg.pas +++ b/designer/askcompnamedlg.pas @@ -116,7 +116,7 @@ begin ErrorMsg:=lisEmpty; exit; end; - if (not IsValidIdent(AName)) then begin + if not IsValidIdent(AName) then begin ErrorMsg:=lisNotAValidPascalIdentifier; exit; end; diff --git a/designer/jitforms.pp b/designer/jitforms.pp index 993b9990cf..ef51b9c972 100644 --- a/designer/jitforms.pp +++ b/designer/jitforms.pp @@ -1228,7 +1228,7 @@ begin if IndexOf(JITComponent)<0 then raise Exception.Create('TJITComponentList.RemoveMethod JITComponent.ClassName='+ JITComponent.ClassName); - if (AName='') or (not IsValidIdent(AName)) then + if not IsValidIdent(AName) then raise Exception.Create('TJITComponentList.RemoveMethod invalid name: "'+AName+'"'); // delete TJITMethod @@ -1254,7 +1254,7 @@ begin if IndexOf(JITComponent)<0 then raise Exception.Create('TJITComponentList.RenameMethod JITComponent.ClassName='+ JITComponent.ClassName); - if (NewName='') or (not IsValidIdent(NewName)) then + if not IsValidIdent(NewName) then raise Exception.Create('TJITComponentList.RenameMethod invalid name: "'+NewName+'"'); // rename TJITMethod @@ -1278,7 +1278,7 @@ begin if IndexOf(JITComponent)<0 then raise Exception.Create('TJITComponentList.RenameComponentClass JITComponent.ClassName='+ JITComponent.ClassName); - if (NewName='') or (not IsValidIdent(NewName)) then + if not IsValidIdent(NewName) then raise Exception.Create('TJITComponentList.RenameComponentClass invalid name: "'+NewName+'"'); DoRenameClass(JITComponent.ClassType,NewName); end; @@ -1401,7 +1401,7 @@ begin if IndexOf(JITComponent)<0 then raise Exception.Create('TJITComponentList.CreateNewMethod JITComponent.ClassName='+ JITComponent.ClassName); - if (AName='') or (not IsValidIdent(AName)) then + if not IsValidIdent(AName) then raise Exception.Create('TJITComponentList.CreateNewMethod invalid name: "'+AName+'"'); OldCode:=JITComponent.MethodAddress(AName); if OldCode<>nil then begin diff --git a/doceditor/frmmakeskel.pp b/doceditor/frmmakeskel.pp index 9b36a466d8..5b21d2d1cf 100644 --- a/doceditor/frmmakeskel.pp +++ b/doceditor/frmmakeskel.pp @@ -85,7 +85,7 @@ end; Function TMakeSkelForm.PackageOK : Boolean; begin - Result:=(EPackage.Text<>'') and IsValidIdent(EPackage.Text); + Result:=IsValidIdent(EPackage.Text); end; Function TMakeSkelForm.InputFileOK : Boolean; diff --git a/examples/pascalstream/componentstreampas.pas b/examples/pascalstream/componentstreampas.pas index a0d3553605..93bb038335 100644 --- a/examples/pascalstream/componentstreampas.pas +++ b/examples/pascalstream/componentstreampas.pas @@ -279,7 +279,7 @@ var i: Integer; Item: TPASObjectWriterStackEl; begin - if (Component.Name='') or (not IsValidIdent(Component.Name)) then + if not IsValidIdent(Component.Name) then raise Exception.Create('TPASObjectWriter.BeginComponent not pascal identifier'); if (FStack<>nil) and (FStack.Count>0) then begin // auto create child components diff --git a/ide/addtoprojectdlg.pas b/ide/addtoprojectdlg.pas index 79dfd08efc..f63439807f 100644 --- a/ide/addtoprojectdlg.pas +++ b/ide/addtoprojectdlg.pas @@ -185,7 +185,7 @@ begin end; // check packagename - if (NewPkgName='') or (not IsValidIdent(NewPkgName)) then begin + if not IsValidIdent(NewPkgName) then begin IDEMessageDialog(lisProjAddInvalidPackagename, Format(lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag, [NewPkgName, LineEnding]), diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas index b94570db06..fa1ae1724f 100644 --- a/ide/buildmanager.pas +++ b/ide/buildmanager.pas @@ -1585,7 +1585,7 @@ begin else continue; CurUnitName:=ExtractFilenameOnly(FileInfo.Name); - if (CurUnitName='') or (not IsValidIdent(CurUnitName)) then + if not IsValidIdent(CurUnitName) then continue; CurFilename:=CurDir+FileInfo.Name; //DebugLn(['TBuildManager.CheckUnitPathForAmbiguousPascalFiles ',CurUnitName,' ',CurFilename]); diff --git a/ide/codebrowser.pas b/ide/codebrowser.pas index e617fc9560..1bea30f009 100644 --- a/ide/codebrowser.pas +++ b/ide/codebrowser.pas @@ -3327,7 +3327,7 @@ begin end; // get identifier - if (Identifier='') or (not IsValidIdent(Identifier)) then begin + if not IsValidIdent(Identifier) then begin DebugLn(['TQuickFixIdentifierNotFound_Search.Execute not an identifier "',dbgstr(Identifier),'"']); exit; end; diff --git a/ide/compileroptions.pp b/ide/compileroptions.pp index 955a6765b0..f019a5e26c 100644 --- a/ide/compileroptions.pp +++ b/ide/compileroptions.pp @@ -4328,7 +4328,7 @@ end; procedure TIDEBuildMacro.SetIdentifier(const AValue: string); begin if FIdentifier=AValue then exit; - if (AValue='') or (not IsValidIdent(AValue)) then + if not IsValidIdent(AValue) then raise Exception.Create('TIDEBuildMacro.SetIdentifier invalid identifier: '+AValue); FIdentifier:=AValue; {$IFDEF VerboseIDEModified} @@ -4535,7 +4535,7 @@ begin for i:=0 to NewCount-1 do begin NewItem:=TIDEBuildMacro.Create; NewItem.LoadFromXMLConfig(AXMLConfig,Path+'Item'+IntToStr(i+1)+'/',DoSwitchPathDelims); - if (NewItem.Identifier<>'') and IsValidIdent(NewItem.Identifier) then + if IsValidIdent(NewItem.Identifier) then FItems.Add(NewItem) else NewItem.Free; diff --git a/ide/etfpcmsgparser.pas b/ide/etfpcmsgparser.pas index 0199728a29..9575400433 100644 --- a/ide/etfpcmsgparser.pas +++ b/ide/etfpcmsgparser.pas @@ -2350,7 +2350,7 @@ begin Identifier:='' else begin Identifier:=GetFPCMsgValue1(MsgLine); - if (Identifier='') or not IsValidIdent(Identifier) then exit; + if not IsValidIdent(Identifier) then exit; end; if MsgLine.Attribute[AttrPosChecked]<>'' then exit; diff --git a/ide/etquickfixes.pas b/ide/etquickfixes.pas index 9890e3da8c..d7e86228ba 100644 --- a/ide/etquickfixes.pas +++ b/ide/etquickfixes.pas @@ -266,7 +266,7 @@ begin Tool.ReadNextAtom; Identifier:=Tool.GetAtom; CleanPos:=Tool.CurPos.StartPos; - Result:=(Identifier<>'') and IsValidIdent(Identifier); + Result:=IsValidIdent(Identifier); end; function GetMsgSrcPosOfThisIdentifier(Msg: TMessageLine; const Identifier: string; diff --git a/ide/extractprocdlg.pas b/ide/extractprocdlg.pas index 553628e496..825f7f45a6 100644 --- a/ide/extractprocdlg.pas +++ b/ide/extractprocdlg.pas @@ -210,7 +210,7 @@ var ProcName: String; begin ProcName:=GetProcName; - if (ProcName='') or (not IsValidIdent(ProcName)) then begin + if not IsValidIdent(ProcName) then begin IDEMessageDialog(lisInvalidProcName, Format(lisSVUOisNotAValidIdentifier, [ProcName]), mtError,[mbCancel]); ModalResult:=mrNone; diff --git a/ide/findrenameidentifier.pas b/ide/findrenameidentifier.pas index 4b0b1c2a72..41d205b1d0 100644 --- a/ide/findrenameidentifier.pas +++ b/ide/findrenameidentifier.pas @@ -588,7 +588,7 @@ var NewIdentifier: String; begin NewIdentifier:=NewEdit.Text; - if (NewIdentifier='') or (not IsValidIdent(NewIdentifier)) then begin + if not IsValidIdent(NewIdentifier) then begin IDEMessageDialog(lisFRIInvalidIdentifier, Format(lisSVUOisNotAValidIdentifier, [NewIdentifier]), mtError, [mbCancel]); ModalResult:=mrNone; diff --git a/ide/findunitdlg.pas b/ide/findunitdlg.pas index 5e6ec0bc2d..806e0e4c46 100644 --- a/ide/findunitdlg.pas +++ b/ide/findunitdlg.pas @@ -192,7 +192,7 @@ begin if not IsApplicable(Msg,MissingUnit,UsedByUnit) then exit; DebugLn(['TQuickFixUnitNotFound_Search.Execute Unit=',MissingUnit]); - if (MissingUnit='') or (not IsValidIdent(MissingUnit)) then begin + if not IsValidIdent(MissingUnit) then begin DebugLn(['TQuickFixUnitNotFound_Search.Execute not an identifier "',dbgstr(MissingUnit),'"']); exit; end; diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas index 51c9fed9a3..881e1f9b2c 100644 --- a/ide/frames/compiler_buildmacro_options.pas +++ b/ide/frames/compiler_buildmacro_options.pas @@ -140,7 +140,7 @@ begin ok:=false; try // check syntax - if (S='') or (not IsValidIdent(S)) then begin + if not IsValidIdent(S) then begin IDEMessageDialog(lisCCOErrorCaption, Format(lisInvalidMacroTheMacroMustBeAPascalIdentifie, [S]), mtError,[mbCancel]); diff --git a/ide/idehelpmanager.pas b/ide/idehelpmanager.pas index ad0b37dbdd..e15d510a55 100644 --- a/ide/idehelpmanager.pas +++ b/ide/idehelpmanager.pas @@ -693,8 +693,7 @@ begin end; AFilename:=SetDirSeparators(AFilename); LazarusIDE.DoOpenFileAndJumpToPos(AFilename,p,-1,-1,-1,[]); - end else if (URLScheme='openpackage') and (URLPath<>'') - and IsValidIdent(URLPath) then begin + end else if (URLScheme='openpackage') and IsValidIdent(URLPath) then begin PackageEditingInterface.DoOpenPackageWithName(URLPath,[],false); end else if (URLScheme='fpdoc') and (URLParams<>'') then begin OpenFPDoc(URLParams); @@ -744,7 +743,7 @@ begin exit; end; PkgName:=copy(PkgName,2,length(PkgName)); - if (PkgName='') or not IsValidIdent(PkgName) then begin + if not IsValidIdent(PkgName) then begin InvalidPathError('It does not start with a package name, for example #rtl.'); exit; end; @@ -760,7 +759,7 @@ begin end; AnUnitName:=ExtractSubPath; - if (AnUnitName='') or (not IsValidIdent(AnUnitName)) then begin + if not IsValidIdent(AnUnitName) then begin InvalidPathError('Unit name "'+AnUnitName+'" is invalid.'); exit; end; diff --git a/ide/main.pp b/ide/main.pp index 2514ea0f8c..1acedf566a 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -11319,7 +11319,7 @@ var OldOpenEditorsOnCodeToolChange: Boolean; begin DebugLn('Hint: (lazarus) TMainIDE.OnDesignerRenameComponent Old=',AComponent.Name,':',AComponent.ClassName,' New=',NewName,' Owner=',dbgsName(AComponent.Owner)); - if (not IsValidIdent(NewName)) or (NewName='') then + if not IsValidIdent(NewName) then raise Exception.Create(Format(lisComponentNameIsNotAValidIdentifier, [Newname])); if WordIsKeyWord.DoItCaseInsensitive(PChar(NewName)) or WordIsDelphiKeyWord.DoItCaseInsensitive(PChar(NewName)) diff --git a/ide/project.pp b/ide/project.pp index c0fc413c34..268a8f2a49 100644 --- a/ide/project.pp +++ b/ide/project.pp @@ -3852,7 +3852,7 @@ begin Prefix:=AnUnitName; while (Prefix<>'') and (Prefix[length(Prefix)] in ['0'..'9']) do Prefix:=copy(Prefix,1,length(Prefix)-1); - if (Prefix='') or (not IsValidIdent(Prefix)) then + if not IsValidIdent(Prefix) then Prefix:='Unit'; u:=0; repeat @@ -5483,7 +5483,7 @@ begin end; // check build macros - if (MacroName<>'') and IsValidIdent(MacroName) then + if IsValidIdent(MacroName) then begin Values:=GetBuildMacroValues(CompilerOptions,true); if Values<>nil then begin @@ -7121,7 +7121,7 @@ begin for i:=1 to Cnt do begin SubPath:=Path+'Macro'+IntToStr(i)+'/'; MacroName:=FXMLConfig.GetValue(SubPath+'Name',''); - if (MacroName='') or not IsValidIdent(MacroName) then continue; + if not IsValidIdent(MacroName) then continue; MacroValue:=FXMLConfig.GetValue(SubPath+'Value',''); //debugln(['LoadMacroValues Mode="',CurMode.Identifier,'" ',MacroName,'="',MacroValue,'" session=',CurMode.InSession]); AddMatrixMacro(MacroName,MacroValue,CurMode.Identifier,CurMode.InSession); diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index e5dc84af09..922270247f 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -1539,7 +1539,7 @@ begin // for example 'SysUtils.CompareText' FFileName:=FActiveSrcEdit.EditorComponent.GetWordAtRowCol( FActiveSrcEdit.EditorComponent.LogicalCaretXY); - if (FFileName<>'') and IsValidIdent(FFileName) then begin + if IsValidIdent(FFileName) then begin // search pascal unit AUnitName:=FFileName; InFilename:=''; @@ -4558,7 +4558,7 @@ function TLazSourceFileManager.NewUniqueComponentName(Prefix: string): string; function IdentifierIsOk(Identifier: string): boolean; begin Result:=false; - if (Identifier='') or not IsValidIdent(Identifier) then exit; + if not IsValidIdent(Identifier) then exit; if AllKeyWords.DoIdentifier(PChar(Identifier)) then exit; if IdentifierExists(Identifier) then exit; if IdentifierExists('T'+Identifier) then exit; @@ -4572,7 +4572,7 @@ begin exit(Prefix); while (Prefix<>'') and (Prefix[length(Prefix)] in ['0'..'9']) do System.Delete(Prefix,length(Prefix),1); - if (Prefix='') or (not IsValidIdent(Prefix)) then + if not IsValidIdent(Prefix) then Prefix:='Resource'; i:=0; repeat @@ -6845,7 +6845,7 @@ begin CTErrorLine:=0; CTErrorCol:=0; - if (AComponentClassName='') or (not IsValidIdent(AComponentClassName)) then + if not IsValidIdent(AComponentClassName) then begin DebugLn(['TLazSourceFileManager.FindComponentClass invalid component class name "',AComponentClassName,'"']); exit(mrCancel); @@ -7017,7 +7017,7 @@ begin Quiet:=([ofProjectLoading,ofQuiet]*Flags<>[]); HideAbort:=not (ofProjectLoading in Flags); - if (AComponentClassName='') or (not IsValidIdent(AComponentClassName)) then + if not IsValidIdent(AComponentClassName) then begin DebugLn(['TLazSourceFileManager.LoadComponentDependencyHidden invalid component class name "',AComponentClassName,'"']); exit(mrCancel); diff --git a/lcl/lazhelpintf.pas b/lcl/lazhelpintf.pas index 8b14f1440f..f06a53e0a7 100644 --- a/lcl/lazhelpintf.pas +++ b/lcl/lazhelpintf.pas @@ -1959,7 +1959,7 @@ begin for i:=0 to Count-1 do begin HelpDB:=Items[i]; Path:=HelpDB.ID; - if (Path='') or (not IsValidIdent(Path)) then continue; + if not IsValidIdent(Path) then continue; Storage.AppendBasePath(Path); try HelpDB.Load(Storage); @@ -1978,7 +1978,7 @@ begin for i:=0 to Count-1 do begin HelpDB:=Items[i]; Path:=HelpDB.ID; - if (Path='') or (not IsValidIdent(Path)) then continue; + if not IsValidIdent(Path) then continue; Storage.AppendBasePath(Path); try HelpDB.Save(Storage); @@ -2069,7 +2069,7 @@ begin for i:=0 to Count-1 do begin Viewer:=Items[i]; Path:=Viewer.StorageName; - if (Path='') or (not IsValidIdent(Path)) then continue; + if not IsValidIdent(Path) then continue; Storage.AppendBasePath(Path); try Viewer.Load(Storage); @@ -2088,7 +2088,7 @@ begin for i:=0 to Count-1 do begin Viewer:=Items[i]; Path:=Viewer.StorageName; - if (Path='') or (not IsValidIdent(Path)) then continue; + if not IsValidIdent(Path) then continue; Storage.AppendBasePath(Path); try Viewer.Save(Storage); diff --git a/lcl/lresources.pp b/lcl/lresources.pp index 261457b575..67290198a4 100644 --- a/lcl/lresources.pp +++ b/lcl/lresources.pp @@ -1358,7 +1358,7 @@ begin if Length(Result) > 0 then LFMStream.Read(Result[1],length(Result)); LFMStream.Position:=0; - if (Result='') or (not IsValidIdent(Result)) then + if not IsValidIdent(Result) then Result:=''; end; diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas index 74509852e5..eb3e2741fe 100644 --- a/packager/addtopackagedlg.pas +++ b/packager/addtopackagedlg.pas @@ -1122,7 +1122,7 @@ begin IDEComponentPalette.FindComponent(fLastNewComponentAncestorType)); // create unique classname - if (not IsValidIdent(ClassNameEdit.Text)) or (ClassNameEdit.Text='') then + if not IsValidIdent(ClassNameEdit.Text) then ClassNameEdit.Text:=IDEComponentPalette.CreateNewClassName( fLastNewComponentAncestorType); // choose the same page name diff --git a/packager/lpkcache.pas b/packager/lpkcache.pas index bc6a202a8f..22c29d89ce 100644 --- a/packager/lpkcache.pas +++ b/packager/lpkcache.pas @@ -308,7 +308,7 @@ begin if not FilenameIsAbsolute(LPKFilename) then exit; if CompareFilenames(ExtractFileExt(LPKFilename),'.lpk')<>0 then exit; PkgName:=ExtractFileNameOnly(LPKFilename); - if (PkgName='') or not IsValidIdent(PkgName) then exit; + if not IsValidIdent(PkgName) then exit; Result:=true; end; diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index fbb281c6c1..19dc3658d6 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -2225,7 +2225,7 @@ begin end; // check build macros - if (MacroName<>'') and IsValidIdent(MacroName) then + if IsValidIdent(MacroName) then begin Values:=GetBuildMacroValues(CompilerOptions,true); if Values<>nil then begin