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

Do not generate 2 type hints

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2573 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2012-10-22 13:31:03 +00:00
parent 76d8fd4b55
commit 13d25e5e00
1 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
wst/trunk/ws_helper/xsd_generator.pas
View File

@ -136,7 +136,7 @@ type
);virtual;abstract; );virtual;abstract;
function GetOwner() : IXsdGenerator; function GetOwner() : IXsdGenerator;
class function CanHandle(ASymbol : TObject) : Boolean;virtual;abstract; class function CanHandle(ASymbol : TObject) : Boolean;virtual;abstract;
function GetSchemaNode(ADocument : TDOMDocument) : TDOMNode; function GetSchemaNode(ADocument : TDOMDocument) : TDOMElement;
procedure DeclareNameSpaceOf_WST(ADocument : TDOMDocument); procedure DeclareNameSpaceOf_WST(ADocument : TDOMDocument);
procedure DeclareAttributeOf_WST(AElement : TDOMElement; const AAttName, AAttValue : DOMString); procedure DeclareAttributeOf_WST(AElement : TDOMElement; const AAttName, AAttValue : DOMString);
function GetRegistry() : IXsdTypeHandlerRegistry;{$IFDEF USE_INLINE}inline;{$ENDIF} function GetRegistry() : IXsdTypeHandlerRegistry;{$IFDEF USE_INLINE}inline;{$ENDIF}
@ -362,8 +362,9 @@ function FindAttributeByValueInNode(
const AAttValue : string; const AAttValue : string;
const ANode : TDOMNode; const ANode : TDOMNode;
out AResAtt : string; out AResAtt : string;
const AStartIndex : Integer = 0; const AStartIndex : Integer;
const AStartingWith : string = '' const AStartingWith : string;
var AFoundPosition : Integer
):boolean; ):boolean;
var var
i,c : Integer; i,c : Integer;
@ -380,6 +381,7 @@ begin
( b or ( Pos(AStartingWith,ANode.Attributes.Item[i].NodeName) = 1 )) ( b or ( Pos(AStartingWith,ANode.Attributes.Item[i].NodeName) = 1 ))
then begin then begin
AResAtt := ANode.Attributes.Item[i].NodeName; AResAtt := ANode.Attributes.Item[i].NodeName;
AFoundPosition := i;
Result := True; Result := True;
Exit; Exit;
end; end;
@ -388,21 +390,69 @@ begin
Result := False; Result := False;
end; end;
function FindAttributeByValueInNode(
const AAttValue : string;
const ANode : TDOMNode;
out AResAtt : string;
const AStartIndex : Integer = 0;
const AStartingWith : string = ''
):boolean;
var
i,c : Integer;
b : Boolean;
k : Integer;
begin
Result := FindAttributeByValueInNode(
AAttValue,ANode,AResAtt,AStartIndex,AStartingWith,k
);
end;
function GetNameSpaceShortName( function GetNameSpaceShortName(
const ANameSpace : string; const ANameSpace : string;
ADocument : TDOMDocument; ADocument : TDOMDocument;
const APreferedList : TStrings const APreferedList : TStrings
):string; ) : string;
var
k : Integer;
begin begin
if FindAttributeByValueInNode(ANameSpace,ADocument.DocumentElement,Result,0, s_xmlns) then begin k := -1;
while FindAttributeByValueInNode(ANameSpace,ADocument.DocumentElement,Result,(k+1), s_xmlns,k) do begin
Result := Copy(Result,Length(s_xmlns+':')+1,MaxInt); Result := Copy(Result,Length(s_xmlns+':')+1,MaxInt);
end else begin if (Result = '') then begin
if ( APreferedList <> nil ) then k := k + 1;
Result := Trim(APreferedList.Values[ANameSpace]); Continue;
if ( Result = '' ) then end;
Result := Format('ns%d',[GetNodeListCount(ADocument.DocumentElement.Attributes)]) ; exit;
ADocument.DocumentElement.SetAttribute(Format('%s:%s',[s_xmlns,Result]),ANameSpace);
end; end;
if ( APreferedList <> nil ) then
Result := Trim(APreferedList.Values[ANameSpace]);
if ( Result = '' ) then
Result := Format('ns%d',[GetNodeListCount(ADocument.DocumentElement.Attributes)]) ;
ADocument.DocumentElement.SetAttribute(Format('%s:%s',[s_xmlns,Result]),ANameSpace);
end;
function GetNameSpaceShortName(
const ANameSpace : string;
ADocument : TDOMElement;
const APreferedList : TStrings
):string;
var
k : Integer;
begin
k := -1;
while FindAttributeByValueInNode(ANameSpace,ADocument,Result,(k+1), s_xmlns,k) do begin
Result := Copy(Result,Length(s_xmlns+':')+1,MaxInt);
if (Result = '') then begin
k := k + 1;
Continue;
end;
exit;
end;
if ( APreferedList <> nil ) then
Result := Trim(APreferedList.Values[ANameSpace]);
if ( Result = '' ) then
Result := Format('ns%d',[GetNodeListCount(ADocument.Attributes)]) ;
ADocument.SetAttribute(Format('%s:%s',[s_xmlns,Result]),ANameSpace);
end; end;
function CreateElement(const ANodeName : DOMString; AParent : TDOMNode; ADoc : TDOMDocument):TDOMElement;//inline; function CreateElement(const ANodeName : DOMString; AParent : TDOMNode; ADoc : TDOMDocument):TDOMElement;//inline;
@ -590,9 +640,9 @@ begin
Result := IXsdGenerator(FOwner); Result := IXsdGenerator(FOwner);
end; end;
function TBaseTypeHandler.GetSchemaNode(ADocument : TDOMDocument) : TDOMNode; function TBaseTypeHandler.GetSchemaNode(ADocument : TDOMDocument) : TDOMElement;
begin begin
Result := GetOwner().GetSchemaNode(ADocument); Result := GetOwner().GetSchemaNode(ADocument) as TDOMElement;
end; end;
procedure TBaseTypeHandler.DeclareNameSpaceOf_WST(ADocument : TDOMDocument); procedure TBaseTypeHandler.DeclareNameSpaceOf_WST(ADocument : TDOMDocument);
@ -684,8 +734,8 @@ begin
typItm := ASymbol as TPasAliasType; typItm := ASymbol as TPasAliasType;
if Assigned(typItm) then begin if Assigned(typItm) then begin
unitExternalName := GetTypeNameSpace(AContainer,ASymbol); unitExternalName := GetTypeNameSpace(AContainer,ASymbol);
GetNameSpaceShortName(unitExternalName,ADocument,GetOwner().GetPreferedShortNames());
defSchemaNode := GetSchemaNode(ADocument) as TDOMElement; defSchemaNode := GetSchemaNode(ADocument) as TDOMElement;
GetNameSpaceShortName(unitExternalName,defSchemaNode,GetOwner().GetPreferedShortNames());
s := Format('%s:%s',[s_xs_short,s_element]); s := Format('%s:%s',[s_xs_short,s_element]);
resNode := CreateElement(s,defSchemaNode,ADocument); resNode := CreateElement(s,defSchemaNode,ADocument);
@ -704,7 +754,7 @@ begin
if trueDestType.InheritsFrom(TPasUnresolvedTypeRef) then if trueDestType.InheritsFrom(TPasUnresolvedTypeRef) then
trueDestType := AContainer.FindElement(AContainer.GetExternalName(typItm.DestType)) as TPasType; trueDestType := AContainer.FindElement(AContainer.GetExternalName(typItm.DestType)) as TPasType;
baseUnitExternalName := GetTypeNameSpace(AContainer,trueDestType); baseUnitExternalName := GetTypeNameSpace(AContainer,trueDestType);
s := GetNameSpaceShortName(baseUnitExternalName,ADocument,GetOwner().GetPreferedShortNames()); s := GetNameSpaceShortName(baseUnitExternalName,defSchemaNode,GetOwner().GetPreferedShortNames());
s := Format('%s:%s',[s,AContainer.GetExternalName(trueDestType)]); s := Format('%s:%s',[s,AContainer.GetExternalName(trueDestType)]);
resNode.SetAttribute(s_type,s) ; resNode.SetAttribute(s_type,s) ;
if trueDestType.InheritsFrom(TPasNativeSpecialSimpleType) then begin if trueDestType.InheritsFrom(TPasNativeSpecialSimpleType) then begin
@ -821,14 +871,14 @@ procedure TClassTypeDefinition_TypeHandler.Generate(
if ( q > 0 ) then begin if ( q > 0 ) then begin
ns := Copy(line,1,Pred(q)); ns := Copy(line,1,Pred(q));
localName := Copy(line,Succ(q),MaxInt); localName := Copy(line,Succ(q),MaxInt);
ns_short := GetNameSpaceShortName(ns,ADocument,GetOwner().GetPreferedShortNames()); ns_short := GetNameSpaceShortName(ns,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
attName := Format('%s:%s',[ns_short,localName]); attName := Format('%s:%s',[ns_short,localName]);
line := ls.Values[line]; line := ls.Values[line];
q := Pos('#',line); q := Pos('#',line);
if ( q > 0 ) then begin if ( q > 0 ) then begin
ns := Copy(line,1,Pred(q)); ns := Copy(line,1,Pred(q));
localName := Copy(line,Succ(q),MaxInt); localName := Copy(line,Succ(q),MaxInt);
ns_short := GetNameSpaceShortName(ns,ADocument,GetOwner().GetPreferedShortNames()); ns_short := GetNameSpaceShortName(ns,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
attValue := Format('%s:%s',[ns_short,localName]); attValue := Format('%s:%s',[ns_short,localName]);
end else begin end else begin
attValue := line; attValue := line;
@ -922,7 +972,7 @@ var
if isEmbeddedArray then begin if isEmbeddedArray then begin
s := AContainer.GetExternalName(TPasArrayType(propItmUltimeType).ElType); s := AContainer.GetExternalName(TPasArrayType(propItmUltimeType).ElType);
arrayItemType := TPasArrayType(propItmUltimeType).ElType; arrayItemType := TPasArrayType(propItmUltimeType).ElType;
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,arrayItemType),ADocument,GetOwner().GetPreferedShortNames()); prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,arrayItemType),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s])); propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
if arrayItemType.InheritsFrom(TPasNativeSpecialSimpleType) then begin if arrayItemType.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(arrayItemType,typeHelper) then if GetRegistry().FindHelper(arrayItemType,typeHelper) then
@ -930,7 +980,7 @@ var
end; end;
end else begin end else begin
s := AContainer.GetExternalName(propTypItm); s := AContainer.GetExternalName(propTypItm);
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),ADocument,GetOwner().GetPreferedShortNames()); prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s])); propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(propTypItm,typeHelper) then if GetRegistry().FindHelper(propTypItm,typeHelper) then
@ -980,7 +1030,7 @@ begin
inherited; inherited;
typItm := ASymbol as TPasClassType; typItm := ASymbol as TPasClassType;
if Assigned(typItm) then begin if Assigned(typItm) then begin
GetNameSpaceShortName(AContainer.GetExternalName(AContainer.CurrentModule) ,ADocument,GetOwner().GetPreferedShortNames()); GetNameSpaceShortName(AContainer.GetExternalName(AContainer.CurrentModule) ,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
defSchemaNode := GetSchemaNode(ADocument) as TDOMElement; defSchemaNode := GetSchemaNode(ADocument) as TDOMElement;
s := Format('%s:%s',[s_xs_short,s_complexType]); s := Format('%s:%s',[s_xs_short,s_complexType]);
@ -1028,7 +1078,7 @@ begin
end else begin end else begin
derivationNode := CreateElement(Format('%s:%s',[s_xs_short,s_extension]),cplxNode,ADocument); derivationNode := CreateElement(Format('%s:%s',[s_xs_short,s_extension]),cplxNode,ADocument);
end; end;
s := Trim(GetNameSpaceShortName(GetTypeNameSpace(AContainer,trueParent),ADocument,GetOwner().GetPreferedShortNames())); s := Trim(GetNameSpaceShortName(GetTypeNameSpace(AContainer,trueParent),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames()));
if ( Length(s) > 0 ) then if ( Length(s) > 0 ) then
s := s + ':'; s := s + ':';
s := s + AContainer.GetExternalName(trueParent); s := s + AContainer.GetExternalName(trueParent);
@ -1107,7 +1157,7 @@ begin
inherited; inherited;
typItm := ASymbol as TPasRecordType; typItm := ASymbol as TPasRecordType;
if Assigned(typItm) then begin if Assigned(typItm) then begin
GetNameSpaceShortName(AContainer.GetExternalName(AContainer.CurrentModule) ,ADocument,GetOwner().GetPreferedShortNames()); GetNameSpaceShortName(AContainer.GetExternalName(AContainer.CurrentModule) ,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
defSchemaNode := GetSchemaNode(ADocument) as TDOMElement; defSchemaNode := GetSchemaNode(ADocument) as TDOMElement;
s := Format('%s:%s',[s_xs_short,s_complexType]); s := Format('%s:%s',[s_xs_short,s_complexType]);
@ -1157,7 +1207,7 @@ begin
if Assigned(propTypItm) then begin if Assigned(propTypItm) then begin
if propTypItm.InheritsFrom(TPasUnresolvedTypeRef) then if propTypItm.InheritsFrom(TPasUnresolvedTypeRef) then
propTypItm := AContainer.FindElement(AContainer.GetExternalName(propTypItm)) as TPasType; propTypItm := AContainer.FindElement(AContainer.GetExternalName(propTypItm)) as TPasType;
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),ADocument,GetOwner().GetPreferedShortNames()); prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,AContainer.GetExternalName(propTypItm)])); propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,AContainer.GetExternalName(propTypItm)]));
if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(propTypItm,typeHelper) then if GetRegistry().FindHelper(propTypItm,typeHelper) then
@ -1200,14 +1250,9 @@ procedure TBaseArrayRemotable_TypeHandler.Generate(
ADocument : TDOMDocument ADocument : TDOMDocument
); );
function GetNameSpaceShortName(const ANameSpace : string):string; function GetNameSpaceShortName(const ANameSpace : string):string;overload;
begin begin
if FindAttributeByValueInNode(ANameSpace,ADocument.DocumentElement,Result,0,s_xmlns) then begin Result := GetNameSpaceShortName(ANameSpace,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
Result := Copy(Result,Length(s_xmlns+':')+1,MaxInt);
end else begin
Result := Format('ns%d',[GetNodeListCount(ADocument.DocumentElement.Attributes)]) ;
ADocument.DocumentElement.SetAttribute(Format('%s:%s',[s_xmlns,Result]),ANameSpace);
end;
end; end;
var var
@ -1347,6 +1392,10 @@ begin
sl := TStringList(FShortNames); sl := TStringList(FShortNames);
//sl.Sorted := True; //sl.Sorted := True;
sl.Duplicates := dupIgnore; sl.Duplicates := dupIgnore;
SetPreferedShortNames(s_soap,s_soap_short_name);
SetPreferedShortNames(s_xs,s_xs_short);
SetPreferedShortNames(s_WST_base_namespace,s_WST);
SetPreferedShortNames(s_wsdl,'wsdl');
end; end;
procedure TCustomXsdGenerator.SetPreferedShortNames(const ALongName, AShortName: string); procedure TCustomXsdGenerator.SetPreferedShortNames(const ALongName, AShortName: string);