pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Make sure to always use a valid identifier for a type name.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1012 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2009-11-16 09:28:25 +00:00
parent d028fcba64
commit e49d2da336
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wst/trunk/ws_helper/ws_parser_imp.pas
View File

@ -878,7 +878,7 @@ var
FSymbols.RegisterExternalAlias(locType,locTypeName); FSymbols.RegisterExternalAlias(locType,locTypeName);
end; end;
end else begin end else begin
locTypeInternalName := locTypeName; locTypeInternalName := ExtractIdentifier(locTypeName);
if locIsRefElement or AnsiSameText(locTypeInternalName,locInternalEltName) then begin if locIsRefElement or AnsiSameText(locTypeInternalName,locInternalEltName) then begin
locTypeInternalName := locTypeInternalName + '_Type'; locTypeInternalName := locTypeInternalName + '_Type';
end; end;
@ -1585,10 +1585,26 @@ begin
end; end;
function TSimpleTypeParser.ParseOtherContent(): TPasType; function TSimpleTypeParser.ParseOtherContent(): TPasType;
var
intrName : string;
hasIntrnName : Boolean;
tmpElement : TPasElement;
begin // todo : implement TSimpleTypeParser.ParseOtherContent begin // todo : implement TSimpleTypeParser.ParseOtherContent
if IsStrEmpty(FBaseName) then if IsStrEmpty(FBaseName) then
raise EXsdInvalidTypeDefinitionException.CreateFmt('Invalid simple type definition : base type not provided, "%s".',[FTypeName]); raise EXsdInvalidTypeDefinitionException.CreateFmt('Invalid simple type definition : base type not provided, "%s".',[FTypeName]);
Result := TPasTypeAliasType(FSymbols.CreateElement(TPasTypeAliasType,FTypeName,Self.Module.InterfaceSection,visDefault,'',0)); intrName := ExtractIdentifier(FTypeName);
hasIntrnName := ( intrName <> FTypeName ) or
IsReservedKeyWord(intrName);
if not hasIntrnName then begin
tmpElement := FindElement(intrName);
if ( tmpElement <> nil ) and ( not tmpElement.InheritsFrom(TPasUnresolvedTypeRef) ) then
hasIntrnName := True;
end;
if hasIntrnName then
intrName := '_' + intrName;
Result := TPasTypeAliasType(FSymbols.CreateElement(TPasTypeAliasType,intrName,Self.Module.InterfaceSection,visDefault,'',0));
if ( intrName <> FTypeName ) then
FSymbols.RegisterExternalAlias(Result,FTypeName);
TPasTypeAliasType(Result).DestType := FindElementNS(FBaseNameSpace,FBaseName,nvtExpandValue) as TPasType; TPasTypeAliasType(Result).DestType := FindElementNS(FBaseNameSpace,FBaseName,nvtExpandValue) as TPasType;
TPasTypeAliasType(Result).DestType.AddRef(); TPasTypeAliasType(Result).DestType.AddRef();
end; end;