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

xml rpc start

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@194 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2007-06-26 20:42:29 +00:00
parent 93b437494c
commit ba1e2d2d2b
9 changed files with 1879 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1382
wst/trunk/base_xmlrpc_formatter.pas Normal file
View File

File diff suppressed because it is too large Load Diff

83
wst/trunk/tests/test_suite/testformatter_unit.pas
View File

@ -284,6 +284,8 @@ type
TTestFormatterSimpleType= class(TTestCase) TTestFormatterSimpleType= class(TTestCase)
protected protected
function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;virtual;abstract; function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;virtual;abstract;
function Support_ComplextType_with_SimpleContent():Boolean;virtual;
function Support_nil():Boolean;virtual;
published published
procedure Test_Int_8; procedure Test_Int_8;
procedure Test_Int_8_ScopeData; procedure Test_Int_8_ScopeData;
@ -374,6 +376,20 @@ type
function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;override; function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;override;
end; end;
{ TTestXmlRpcFormatterAttributes }
TTestXmlRpcFormatterAttributes = class(TTestFormatterSimpleType)
protected
function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;override;
end;
TTestXmlRpcFormatter= class(TTestFormatter)
protected
function CreateFormatter(ARootType : PTypeInfo):IFormatterBase;override;
function Support_ComplextType_with_SimpleContent():Boolean;override;
function Support_nil():Boolean;override;
end;
{ TTestArray } { TTestArray }
TTestArray= class(TTestCase) TTestArray= class(TTestCase)
@ -431,7 +447,17 @@ type
end; end;
implementation implementation
uses base_binary_formatter, base_soap_formatter; uses base_binary_formatter, base_soap_formatter, base_xmlrpc_formatter;
function TTestFormatterSimpleType.Support_ComplextType_with_SimpleContent( ): Boolean;
begin
Result := True;
end;
function TTestFormatterSimpleType.Support_nil(): Boolean;
begin
Result := True;
end;
procedure TTestFormatterSimpleType.Test_Int_8; procedure TTestFormatterSimpleType.Test_Int_8;
const VAL_1 = 12; VAL_2 = -10; const VAL_1 = 12; VAL_2 = -10;
@ -453,7 +479,7 @@ begin
f.EndScope(); f.EndScope();
s := TMemoryStream.Create(); s := TMemoryStream.Create();
f.SaveToStream(s); f.SaveToStream(s); s.SaveToFile(ClassName + '.xml');
intVal_U := 0; intVal_U := 0;
intVal_S := 0; intVal_S := 0;
@ -1074,6 +1100,9 @@ var
nu : TComplexInt64UContentRemotable; nu : TComplexInt64UContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexInt64SContentRemotable.Create(); ns := TComplexInt64SContentRemotable.Create();
nu := TComplexInt64UContentRemotable.Create(); nu := TComplexInt64UContentRemotable.Create();
@ -1147,6 +1176,9 @@ var
nu : TComplexInt32UContentRemotable; nu : TComplexInt32UContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexInt32SContentRemotable.Create(); ns := TComplexInt32SContentRemotable.Create();
nu := TComplexInt32UContentRemotable.Create(); nu := TComplexInt32UContentRemotable.Create();
@ -1220,6 +1252,9 @@ var
nu : TComplexInt16UContentRemotable; nu : TComplexInt16UContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexInt16SContentRemotable.Create(); ns := TComplexInt16SContentRemotable.Create();
nu := TComplexInt16UContentRemotable.Create(); nu := TComplexInt16UContentRemotable.Create();
@ -1293,6 +1328,9 @@ var
nu : TComplexInt8UContentRemotable; nu : TComplexInt8UContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexInt8SContentRemotable.Create(); ns := TComplexInt8SContentRemotable.Create();
nu := TComplexInt8UContentRemotable.Create(); nu := TComplexInt8UContentRemotable.Create();
@ -1366,6 +1404,9 @@ var
nu : TComplexFloatDoubleContentRemotable; nu : TComplexFloatDoubleContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexFloatExtendedContentRemotable.Create(); ns := TComplexFloatExtendedContentRemotable.Create();
nu := TComplexFloatDoubleContentRemotable.Create(); nu := TComplexFloatDoubleContentRemotable.Create();
@ -1440,6 +1481,9 @@ var
ns : TComplexStringContentRemotable; ns : TComplexStringContentRemotable;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
ns := TComplexStringContentRemotable.Create(); ns := TComplexStringContentRemotable.Create();
a := TClass_CplxSimpleContent.Create(); a := TClass_CplxSimpleContent.Create();
@ -1552,6 +1596,9 @@ var
a : TClass_B; a : TClass_B;
x : string; x : string;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
a := nil; a := nil;
try try
@ -2402,6 +2449,9 @@ var
x : string; x : string;
a, b : TComplexInt32SContentRemotable; a, b : TComplexInt32SContentRemotable;
begin begin
if not Support_ComplextType_with_SimpleContent() then
Exit;
s := nil; s := nil;
a := nil; a := nil;
b := nil; b := nil;
@ -3066,6 +3116,31 @@ begin
Fail('Write me!'); Fail('Write me!');
end; end;
{ TTestXmlRpcFormatterAttributes }
function TTestXmlRpcFormatterAttributes.CreateFormatter(ARootType: PTypeInfo): IFormatterBase;
begin
Result := TXmlRpcBaseFormatter.Create() as IFormatterBase;
//Result.BeginObject('Env',ARootType)
end;
{ TTestXmlRpcFormatter }
function TTestXmlRpcFormatter.CreateFormatter(ARootType: PTypeInfo): IFormatterBase;
begin
Result := TXmlRpcBaseFormatter.Create() as IFormatterBase;
end;
function TTestXmlRpcFormatter.Support_ComplextType_with_SimpleContent(): Boolean;
begin
Result := False;
end;
function TTestXmlRpcFormatter.Support_nil(): Boolean;
begin
Result := False;
end;
initialization initialization
RegisterStdTypes(); RegisterStdTypes();
GetTypeRegistry().Register(sXSD_NS,TypeInfo(TTestEnum),'TTestEnum').RegisterExternalPropertyName('teOne', '1'); GetTypeRegistry().Register(sXSD_NS,TypeInfo(TTestEnum),'TTestEnum').RegisterExternalPropertyName('teOne', '1');
@ -3101,4 +3176,8 @@ initialization
RegisterTest(TTest_TDateRemotable); RegisterTest(TTest_TDateRemotable);
RegisterTest(TTest_TDurationRemotable); RegisterTest(TTest_TDurationRemotable);
RegisterTest(TTest_TTimeRemotable); RegisterTest(TTest_TTimeRemotable);
RegisterTest(TTestXmlRpcFormatterAttributes);
RegisterTest(TTestXmlRpcFormatter);
end. end.

99
wst/trunk/tests/test_suite/testmetadata_unit.pas
View File

@ -20,7 +20,8 @@ interface
uses uses
Classes, SysUtils, DOM, XMLWrite, Classes, SysUtils, DOM, XMLWrite,
fpcunit, testutils, testregistry, fpcunit, testutils, testregistry,
metadata_generator, binary_streamer, metadata_repository, parserdefs, metadata_generator, binary_streamer, metadata_repository, pastree,
pascal_parser_intf,
metadata_wsdl; metadata_wsdl;
type type
@ -29,7 +30,7 @@ type
TTestMetadata= class(TTestCase) TTestMetadata= class(TTestCase)
protected protected
function CreateSymbolTable():TSymbolTable; function CreateSymbolTable():TwstPasTreeContainer;
published published
procedure test_Metadata(); procedure test_Metadata();
end; end;
@ -39,32 +40,74 @@ implementation
{ TTestMetadata } { TTestMetadata }
function TTestMetadata.CreateSymbolTable(): TSymbolTable; function TTestMetadata.CreateSymbolTable(): TwstPasTreeContainer;
Var
inft : TInterfaceDefinition; function CreateProc(
const AName : string;
AClass : TPasClassType;
AContainer : TwstPasTreeContainer
) : TPasProcedure ;
begin
Result := TPasProcedure(AContainer.CreateElement(TPasProcedure,AName,AContainer.CurrentModule.InterfaceSection,visDefault,'',0));
Result.ProcType := TPasProcedureType(AContainer.CreateElement(TPasProcedureType,'',Result,visDefault,'',0));
AClass.Members.Add(Result);
end;
function CreateFunc(
const AName, AResultTypeName : string;
AClass : TPasClassType;
AContainer : TwstPasTreeContainer
) : TPasFunction ;
begin
Result := TPasFunction(AContainer.CreateElement(TPasFunction,AName,AContainer.CurrentModule.InterfaceSection,visDefault,'',0));
Result.ProcType := AContainer.CreateFunctionType('','result',Result,True,'',0);
AClass.Members.Add(Result);
TPasFunctionType(Result.ProcType).ResultEl.ResultType := AContainer.FindElement(AResultTypeName) as TPasType;
TPasFunctionType(Result.ProcType).ResultEl.ResultType.AddRef();
end;
function CreateParam(
const AName, ATypeName : string;
const AAccess : TArgumentAccess;
AProc : TPasProcedure;
AContainer : TwstPasTreeContainer
) : TPasArgument ;
begin
Result := TPasArgument(AContainer.CreateElement(TPasArgument,AName,AProc,visDefault,'',0));
Result.ArgType := AContainer.FindElement(ATypeName) as TPasType;
Result.ArgType.AddRef();
Result.Access := AAccess;
end;
var
inft : TPasClassType;
sct : TPasSection;
locProc : TPasProcedure;
begin begin
Result := TSymbolTable.Create('test_unit_name'); Result := TwstPasTreeContainer.Create();
Result.Add(TTypeDefinition.Create('integer')); CreateWstInterfaceSymbolTable(Result);
Result.Add(TTypeDefinition.Create('string')); Result.CreateElement(TPasModule,'test_unit_name',Result.Package,visDefault,'',0);
Result.Add(TTypeDefinition.Create('double')); sct := TPasSection(Result.CreateElement(TPasSection,'',Result.CurrentModule,visDefault,'',0));
Result.CurrentModule.InterfaceSection := sct;
inft := TInterfaceDefinition.Create('service_1'); inft := TPasClassType(Result.CreateElement(TPasClassType,'service_1',sct,visDefault,'',0));
Result.Add(inft); inft.ObjKind := okInterface;
inft.AddMethod('void_operation_proc',mtProcedure); sct.Declarations.Add(inft);
inft.AddMethod('void_operation_func',mtProcedure).AddParameter('result',pmOut,Result.ByName('integer') as TTypeDefinition); sct.Types.Add(inft);
CreateProc('void_operation_proc',inft,Result);
CreateFunc('void_operation_func','Integer',inft,Result);
inft := TInterfaceDefinition.Create('service_2'); inft := TPasClassType(Result.CreateElement(TPasClassType,'service_2',sct,visDefault,'',0));
Result.Add(inft); inft.ObjKind := okInterface;
with inft.AddMethod('dis_proc',mtProcedure) do begin sct.Declarations.Add(inft);
AddParameter('d',pmNone,Result.ByName('double') as TTypeDefinition); sct.Types.Add(inft);
AddParameter('i',pmConst,Result.ByName('integer') as TTypeDefinition); locProc := CreateProc('dis_proc',inft,Result);
AddParameter('s',pmOut,Result.ByName('string') as TTypeDefinition); CreateParam('d','double',argDefault,locProc,Result);
end; CreateParam('i','Integer',argConst,locProc,Result);
with inft.AddMethod('sid_func',mtFunction) do begin CreateParam('s','string',argOut,locProc,Result);
AddParameter('s',pmConst,Result.ByName('string') as TTypeDefinition); locProc := CreateFunc('sid_func','double',inft,Result);
AddParameter('i',pmVar,Result.ByName('integer') as TTypeDefinition); CreateParam('s','string',argConst,locProc,Result);
AddParameter('d',pmOut,Result.ByName('double') as TTypeDefinition); CreateParam('i','Integer',argVar,locProc,Result);
end;
end; end;
procedure PrintWSDL(ARep : PServiceRepository); procedure PrintWSDL(ARep : PServiceRepository);
@ -92,7 +135,7 @@ end;
procedure TTestMetadata.test_Metadata(); procedure TTestMetadata.test_Metadata();
var var
st : TSymbolTable; st : TwstPasTreeContainer;
mg : TMetadataGenerator; mg : TMetadataGenerator;
wtr : IDataStore; wtr : IDataStore;
strm : TMemoryStream; strm : TMemoryStream;
@ -134,8 +177,8 @@ begin
AssertNotNull('params pointer',po^.Params); AssertNotNull('params pointer',po^.Params);
pop := po^.Params; pop := po^.Params;
AssertEquals('param name','result',pop^.Name); AssertEquals('param name','result',pop^.Name);
AssertEquals('param type name','integer',pop^.TypeName); AssertEquals('param type name','int',pop^.TypeName);
AssertEquals('param modifier',ord(pmOut),ord(pop^.Modifier)); AssertEquals('param modifier',ord(argOut),ord(pop^.Modifier));
rp^.NameSpace := 'http://test_name_space/'; rp^.NameSpace := 'http://test_name_space/';
//PrintWSDL(rp); //PrintWSDL(rp);

456
wst/trunk/tests/test_suite/wst_test_suite.lpi
View File

@ -7,7 +7,7 @@
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/> <IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="11"/> <ActiveEditorIndexAtStart Value="7"/>
</General> </General>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -27,7 +27,7 @@
<PackageName Value="FPCUnitTestRunner"/> <PackageName Value="FPCUnitTestRunner"/>
</Item1> </Item1>
</RequiredPackages> </RequiredPackages>
<Units Count="42"> <Units Count="46">
<Unit0> <Unit0>
<Filename Value="wst_test_suite.lpr"/> <Filename Value="wst_test_suite.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -40,9 +40,9 @@
<Filename Value="testformatter_unit.pas"/> <Filename Value="testformatter_unit.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="testformatter_unit"/> <UnitName Value="testformatter_unit"/>
<CursorPos X="38" Y="1359"/> <CursorPos X="31" Y="297"/>
<TopLine Value="1348"/> <TopLine Value="290"/>
<EditorIndex Value="11"/> <EditorIndex Value="7"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit1> </Unit1>
@ -52,27 +52,23 @@
<UnitName Value="server_service_soap"/> <UnitName Value="server_service_soap"/>
<CursorPos X="38" Y="29"/> <CursorPos X="38" Y="29"/>
<TopLine Value="18"/> <TopLine Value="18"/>
<EditorIndex Value="7"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="..\..\soap_formatter.pas"/> <Filename Value="..\..\soap_formatter.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="soap_formatter"/> <UnitName Value="soap_formatter"/>
<CursorPos X="34" Y="145"/> <CursorPos X="37" Y="29"/>
<TopLine Value="125"/> <TopLine Value="23"/>
<EditorIndex Value="8"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="..\..\base_binary_formatter.pas"/> <Filename Value="..\..\base_binary_formatter.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_binary_formatter"/> <UnitName Value="base_binary_formatter"/>
<CursorPos X="26" Y="1573"/> <CursorPos X="45" Y="93"/>
<TopLine Value="1562"/> <TopLine Value="138"/>
<EditorIndex Value="4"/> <EditorIndex Value="1"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
@ -80,8 +76,8 @@
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="..\..\base_service_intf.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_service_intf"/> <UnitName Value="base_service_intf"/>
<CursorPos X="1" Y="1"/> <CursorPos X="3" Y="122"/>
<TopLine Value="1"/> <TopLine Value="186"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Bookmarks Count="2"> <Bookmarks Count="2">
@ -94,9 +90,9 @@
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="..\..\base_soap_formatter.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_soap_formatter"/> <UnitName Value="base_soap_formatter"/>
<CursorPos X="15" Y="441"/> <CursorPos X="3" Y="1645"/>
<TopLine Value="430"/> <TopLine Value="1641"/>
<EditorIndex Value="6"/> <EditorIndex Value="2"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit6> </Unit6>
@ -106,17 +102,18 @@
<UnitName Value="binary_formatter"/> <UnitName Value="binary_formatter"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="9"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="..\..\binary_streamer.pas"/> <Filename Value="..\..\binary_streamer.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="binary_streamer"/> <UnitName Value="binary_streamer"/>
<CursorPos X="18" Y="40"/> <CursorPos X="1" Y="488"/>
<TopLine Value="40"/> <TopLine Value="476"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Bookmarks Count="1">
<Item0 X="38" Y="488" ID="2"/>
</Bookmarks>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="..\..\server_binary_formatter.pas"/> <Filename Value="..\..\server_binary_formatter.pas"/>
@ -124,7 +121,7 @@
<UnitName Value="server_binary_formatter"/> <UnitName Value="server_binary_formatter"/>
<CursorPos X="22" Y="100"/> <CursorPos X="22" Y="100"/>
<TopLine Value="86"/> <TopLine Value="86"/>
<EditorIndex Value="10"/> <EditorIndex Value="6"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit9> </Unit9>
@ -132,34 +129,31 @@
<Filename Value="..\..\metadata_repository.pas"/> <Filename Value="..\..\metadata_repository.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="metadata_repository"/> <UnitName Value="metadata_repository"/>
<CursorPos X="25" Y="14"/> <CursorPos X="1" Y="334"/>
<TopLine Value="701"/> <TopLine Value="337"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="D:\Lazarus\fpcsrc\rtl\objpas\typinfo.pp"/>
<UnitName Value="typinfo"/>
<CursorPos X="15" Y="579"/>
<TopLine Value="565"/>
<UsageCount Value="4"/>
</Unit11>
<Unit12>
<Filename Value="testmetadata_unit.pas"/> <Filename Value="testmetadata_unit.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="testmetadata_unit"/> <UnitName Value="testmetadata_unit"/>
<CursorPos X="50" Y="118"/> <CursorPos X="44" Y="180"/>
<TopLine Value="106"/> <TopLine Value="153"/>
<EditorIndex Value="4"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
</Unit12> <Loaded Value="True"/>
<Unit13> </Unit11>
<Unit12>
<Filename Value="..\..\ws_helper\metadata_generator.pas"/> <Filename Value="..\..\ws_helper\metadata_generator.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="metadata_generator"/> <UnitName Value="metadata_generator"/>
<CursorPos X="1" Y="1"/> <CursorPos X="17" Y="85"/>
<TopLine Value="31"/> <TopLine Value="76"/>
<EditorIndex Value="5"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
</Unit13> <Loaded Value="True"/>
<Unit14> </Unit12>
<Unit13>
<Filename Value="..\..\ws_helper\parserdefs.pas"/> <Filename Value="..\..\ws_helper\parserdefs.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="parserdefs"/> <UnitName Value="parserdefs"/>
@ -170,200 +164,331 @@
<Item0 X="45" Y="1146" ID="0"/> <Item0 X="45" Y="1146" ID="0"/>
<Item1 X="18" Y="1133" ID="2"/> <Item1 X="18" Y="1133" ID="2"/>
</Bookmarks> </Bookmarks>
</Unit14> </Unit13>
<Unit15> <Unit14>
<Filename Value="..\..\metadata_wsdl.pas"/> <Filename Value="..\..\metadata_wsdl.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="metadata_wsdl"/> <UnitName Value="metadata_wsdl"/>
<CursorPos X="71" Y="293"/> <CursorPos X="71" Y="293"/>
<TopLine Value="280"/> <TopLine Value="280"/>
<EditorIndex Value="3"/>
<UsageCount Value="206"/> <UsageCount Value="206"/>
<Loaded Value="True"/> </Unit14>
</Unit15> <Unit15>
<Unit16>
<Filename Value="D:\Lazarus\fpcsrc\fcl\xml\dom.pp"/> <Filename Value="D:\Lazarus\fpcsrc\fcl\xml\dom.pp"/>
<UnitName Value="DOM"/> <UnitName Value="DOM"/>
<CursorPos X="15" Y="429"/> <CursorPos X="15" Y="429"/>
<TopLine Value="413"/> <TopLine Value="413"/>
<UsageCount Value="3"/> <UsageCount Value="8"/>
</Unit16> </Unit15>
<Unit17> <Unit16>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\sysutils\sysutilh.inc"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\sysutils\sysutilh.inc"/>
<CursorPos X="13" Y="235"/> <CursorPos X="13" Y="235"/>
<TopLine Value="215"/> <TopLine Value="215"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit17> </Unit16>
<Unit18> <Unit17>
<Filename Value="..\..\server_service_intf.pas"/> <Filename Value="..\..\server_service_intf.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="server_service_intf"/> <UnitName Value="server_service_intf"/>
<CursorPos X="35" Y="379"/> <CursorPos X="35" Y="379"/>
<TopLine Value="397"/> <TopLine Value="397"/>
<UsageCount Value="162"/> <UsageCount Value="203"/>
</Unit18> </Unit17>
<Unit19> <Unit18>
<Filename Value="..\..\service_intf.pas"/> <Filename Value="..\..\service_intf.pas"/>
<UnitName Value="service_intf"/> <UnitName Value="service_intf"/>
<CursorPos X="1" Y="1"/> <CursorPos X="3" Y="38"/>
<TopLine Value="23"/> <TopLine Value="27"/>
<UsageCount Value="8"/> <UsageCount Value="18"/>
</Unit19> </Unit18>
<Unit20> <Unit19>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\classesh.inc"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\classesh.inc"/>
<CursorPos X="3" Y="316"/> <CursorPos X="3" Y="316"/>
<TopLine Value="304"/> <TopLine Value="304"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit20> </Unit19>
<Unit21> <Unit20>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\lists.inc"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\lists.inc"/>
<CursorPos X="3" Y="407"/> <CursorPos X="3" Y="407"/>
<TopLine Value="404"/> <TopLine Value="404"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit21> </Unit20>
<Unit22> <Unit21>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\fcl\inc\contnrs.pp"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\fcl\inc\contnrs.pp"/>
<UnitName Value="contnrs"/> <UnitName Value="contnrs"/>
<CursorPos X="3" Y="474"/> <CursorPos X="3" Y="474"/>
<TopLine Value="471"/> <TopLine Value="471"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit22> </Unit21>
<Unit23> <Unit22>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/>
<CursorPos X="27" Y="121"/> <CursorPos X="27" Y="121"/>
<TopLine Value="104"/> <TopLine Value="104"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit23> </Unit22>
<Unit24> <Unit23>
<Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpas.inc"/> <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpas.inc"/>
<CursorPos X="9" Y="166"/> <CursorPos X="9" Y="166"/>
<TopLine Value="142"/> <TopLine Value="142"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit24> </Unit23>
<Unit25> <Unit24>
<Filename Value="D:\Lazarus\components\fpcunit\guitestrunner.pas"/> <Filename Value="D:\Lazarus\components\fpcunit\guitestrunner.pas"/>
<ComponentName Value="GUITestRunner"/> <ComponentName Value="GUITestRunner"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<UnitName Value="GuiTestRunner"/> <UnitName Value="GuiTestRunner"/>
<CursorPos X="34" Y="32"/> <CursorPos X="34" Y="32"/>
<TopLine Value="25"/> <TopLine Value="25"/>
<UsageCount Value="7"/> <UsageCount Value="2"/>
</Unit25> </Unit24>
<Unit26> <Unit25>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\fpcunit.pp"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\fpcunit.pp"/>
<UnitName Value="fpcunit"/> <UnitName Value="fpcunit"/>
<CursorPos X="21" Y="94"/> <CursorPos X="21" Y="94"/>
<TopLine Value="83"/> <TopLine Value="83"/>
<UsageCount Value="5"/> <UsageCount Value="10"/>
</Unit26> </Unit25>
<Unit27> <Unit26>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\DUnitCompatibleInterface.inc"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\DUnitCompatibleInterface.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="4"/> <TopLine Value="4"/>
<UsageCount Value="9"/> <UsageCount Value="4"/>
</Unit27> </Unit26>
<Unit28> <Unit27>
<Filename Value="..\..\imp_utils.pas"/> <Filename Value="..\..\imp_utils.pas"/>
<UnitName Value="imp_utils"/> <UnitName Value="imp_utils"/>
<CursorPos X="15" Y="36"/> <CursorPos X="15" Y="36"/>
<TopLine Value="22"/> <TopLine Value="22"/>
<UsageCount Value="9"/> <UsageCount Value="4"/>
</Unit28> </Unit27>
<Unit29> <Unit28>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\xml\dom.pp"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\xml\dom.pp"/>
<UnitName Value="DOM"/> <UnitName Value="DOM"/>
<CursorPos X="3" Y="51"/> <CursorPos X="3" Y="51"/>
<TopLine Value="41"/> <TopLine Value="41"/>
<UsageCount Value="9"/> <UsageCount Value="4"/>
</Unit29> </Unit28>
<Unit30> <Unit29>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\objpas\typinfo.pp"/>
<UnitName Value="typinfo"/>
<CursorPos X="33" Y="192"/>
<TopLine Value="186"/>
<UsageCount Value="2"/>
</Unit30>
<Unit31>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\xml\xmlread.pp"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\xml\xmlread.pp"/>
<UnitName Value="XMLRead"/> <UnitName Value="XMLRead"/>
<CursorPos X="43" Y="13"/> <CursorPos X="43" Y="13"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="3"/> <UsageCount Value="8"/>
</Unit31> </Unit29>
<Unit32> <Unit30>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\objpas\sysutils\datih.inc"/>
<CursorPos X="10" Y="109"/>
<TopLine Value="107"/>
<UsageCount Value="4"/>
</Unit32>
<Unit33>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\objpas\sysutils\dati.inc"/>
<CursorPos X="46" Y="130"/>
<TopLine Value="122"/>
<UsageCount Value="4"/>
</Unit33>
<Unit34>
<Filename Value="test_parserdef.pas"/> <Filename Value="test_parserdef.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="test_parserdef"/> <UnitName Value="test_parserdef"/>
<CursorPos X="93" Y="76"/> <CursorPos X="93" Y="76"/>
<TopLine Value="11"/> <TopLine Value="11"/>
<UsageCount Value="82"/> <UsageCount Value="130"/>
</Unit34> </Unit30>
<Unit35> <Unit31>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\testutils.pp"/>
<UnitName Value="testutils"/>
<CursorPos X="34" Y="25"/>
<TopLine Value="1"/>
<UsageCount Value="4"/>
</Unit35>
<Unit36>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\fpcunit\testregistry.pp"/>
<UnitName Value="testregistry"/>
<CursorPos X="18" Y="17"/>
<TopLine Value="16"/>
<UsageCount Value="4"/>
</Unit36>
<Unit37>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/>
<CursorPos X="8" Y="190"/> <CursorPos X="8" Y="190"/>
<TopLine Value="133"/> <TopLine Value="133"/>
<EditorIndex Value="1"/> <UsageCount Value="9"/>
<UsageCount Value="14"/> </Unit31>
<Loaded Value="True"/> <Unit32>
</Unit37>
<Unit38>
<Filename Value="..\..\wst.inc"/> <Filename Value="..\..\wst.inc"/>
<CursorPos X="21" Y="7"/> <CursorPos X="21" Y="7"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="2"/> <UsageCount Value="9"/>
<UsageCount Value="14"/> </Unit32>
<Loaded Value="True"/> <Unit33>
</Unit38>
<Unit39>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\objpas\objpas.pp"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\objpas\objpas.pp"/>
<UnitName Value="objpas"/> <UnitName Value="objpas"/>
<CursorPos X="47" Y="64"/> <CursorPos X="47" Y="64"/>
<TopLine Value="38"/> <TopLine Value="38"/>
<UsageCount Value="9"/> <UsageCount Value="4"/>
</Unit39> </Unit33>
<Unit40> <Unit34>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\heaph.inc"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\heaph.inc"/>
<CursorPos X="43" Y="100"/> <CursorPos X="43" Y="100"/>
<TopLine Value="83"/> <TopLine Value="83"/>
<EditorIndex Value="5"/> <UsageCount Value="7"/>
<UsageCount Value="12"/> </Unit34>
<Loaded Value="True"/> <Unit35>
</Unit40>
<Unit41>
<Filename Value="..\test_fpc\interface_problem\interface_problem.pas"/> <Filename Value="..\test_fpc\interface_problem\interface_problem.pas"/>
<UnitName Value="interface_problem"/> <UnitName Value="interface_problem"/>
<CursorPos X="1" Y="10"/> <CursorPos X="1" Y="10"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="20"/> <UsageCount Value="15"/>
</Unit35>
<Unit36>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="base_xmlrpc_formatter"/>
<CursorPos X="48" Y="406"/>
<TopLine Value="386"/>
<EditorIndex Value="3"/>
<UsageCount Value="68"/>
<Loaded Value="True"/>
</Unit36>
<Unit37>
<Filename Value="..\..\ws_helper\pscanner.pp"/>
<UnitName Value="PScanner"/>
<CursorPos X="19" Y="505"/>
<TopLine Value="491"/>
<UsageCount Value="22"/>
</Unit37>
<Unit38>
<Filename Value="..\..\ws_helper\pascal_parser_intf.pas"/>
<UnitName Value="pascal_parser_intf"/>
<CursorPos X="62" Y="296"/>
<TopLine Value="296"/>
<UsageCount Value="32"/>
</Unit38>
<Unit39>
<Filename Value="..\..\ws_helper\pastree.pp"/>
<UnitName Value="PasTree"/>
<CursorPos X="18" Y="254"/>
<TopLine Value="243"/>
<UsageCount Value="22"/>
</Unit39>
<Unit40>
<Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-xml\src\dom.pp"/>
<UnitName Value="DOM"/>
<CursorPos X="38" Y="225"/>
<TopLine Value="203"/>
<UsageCount Value="21"/>
</Unit40>
<Unit41>
<Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/>
<UnitName Value="cursor_intf"/>
<CursorPos X="3" Y="75"/>
<TopLine Value="70"/>
<UsageCount Value="13"/>
</Unit41> </Unit41>
<Unit42>
<Filename Value="..\..\wst_rtti_filter\dom_cursors.pas"/>
<UnitName Value="dom_cursors"/>
<CursorPos X="3" Y="182"/>
<TopLine Value="180"/>
<UsageCount Value="13"/>
</Unit42>
<Unit43>
<Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-fpcunit\src\fpcunit.pp"/>
<UnitName Value="fpcunit"/>
<CursorPos X="1" Y="446"/>
<TopLine Value="434"/>
<UsageCount Value="11"/>
</Unit43>
<Unit44>
<Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\i386\i386.inc"/>
<CursorPos X="1" Y="1284"/>
<TopLine Value="1268"/>
<UsageCount Value="10"/>
</Unit44>
<Unit45>
<Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\rtl\objpas\classes\streams.inc"/>
<CursorPos X="1" Y="107"/>
<TopLine Value="95"/>
<UsageCount Value="10"/>
</Unit45>
</Units> </Units>
<JumpHistory Count="0" HistoryIndex="-1"/> <JumpHistory Count="25" HistoryIndex="24">
<Position1>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="3097" Column="1" TopLine="3065"/>
</Position1>
<Position2>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="3133" Column="31" TopLine="3110"/>
</Position2>
<Position3>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="384" Column="38" TopLine="372"/>
</Position3>
<Position4>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="960" Column="31" TopLine="943"/>
</Position4>
<Position5>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="84" Column="28" TopLine="141"/>
</Position5>
<Position6>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="3133" Column="28" TopLine="3111"/>
</Position6>
<Position7>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="384" Column="36" TopLine="372"/>
</Position7>
<Position8>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="456" Column="16" TopLine="437"/>
</Position8>
<Position9>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="458" Column="11" TopLine="436"/>
</Position9>
<Position10>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position10>
<Position11>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="458" Column="38" TopLine="436"/>
</Position11>
<Position12>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="464" Column="38" TopLine="442"/>
</Position12>
<Position13>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="1312" Column="36" TopLine="1290"/>
</Position13>
<Position14>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="1364" Column="1" TopLine="1333"/>
</Position14>
<Position15>
<Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position15>
<Position16>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="1647" Column="21" TopLine="1622"/>
</Position16>
<Position17>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="454" Column="1" TopLine="405"/>
</Position17>
<Position18>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="3107" Column="5" TopLine="3058"/>
</Position18>
<Position19>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="385" Column="42" TopLine="366"/>
</Position19>
<Position20>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="2446" Column="30" TopLine="2434"/>
</Position20>
<Position21>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position21>
<Position22>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="459" Column="5" TopLine="430"/>
</Position22>
<Position23>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="288" Column="36" TopLine="276"/>
</Position23>
<Position24>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="3139" Column="5" TopLine="3110"/>
</Position24>
<Position25>
<Filename Value="testformatter_unit.pas"/>
<Caret Line="386" Column="42" TopLine="378"/>
</Position25>
</JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>
@ -378,6 +503,7 @@
<Parsing> <Parsing>
<SyntaxOptions> <SyntaxOptions>
<IncludeAssertionCode Value="True"/> <IncludeAssertionCode Value="True"/>
<UseAnsiStrings Value="True"/>
</SyntaxOptions> </SyntaxOptions>
</Parsing> </Parsing>
<CodeGeneration> <CodeGeneration>
@ -395,7 +521,7 @@
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>
<BreakPoints Count="14"> <BreakPoints Count="10">
<Item1> <Item1>
<Source Value="..\google_api\home\inoussa\Projets\Laz\tests\soap\test_soap.pas"/> <Source Value="..\google_api\home\inoussa\Projets\Laz\tests\soap\test_soap.pas"/>
<Line Value="15"/> <Line Value="15"/>
@ -425,33 +551,17 @@
<Line Value="83"/> <Line Value="83"/>
</Item7> </Item7>
<Item8> <Item8>
<Source Value="testformatter_unit.pas"/> <Source Value="testmetadata_unit.pas"/>
<Line Value="572"/> <Line Value="148"/>
</Item8> </Item8>
<Item9> <Item9>
<Source Value="testformatter_unit.pas"/> <Source Value="testmetadata_unit.pas"/>
<Line Value="587"/> <Line Value="161"/>
</Item9> </Item9>
<Item10> <Item10>
<Source Value="testformatter_unit.pas"/> <Source Value="..\..\metadata_repository.pas"/>
<Line Value="588"/> <Line Value="378"/>
</Item10> </Item10>
<Item11>
<Source Value="testformatter_unit.pas"/>
<Line Value="571"/>
</Item11>
<Item12>
<Source Value="testformatter_unit.pas"/>
<Line Value="570"/>
</Item12>
<Item13>
<Source Value="testformatter_unit.pas"/>
<Line Value="568"/>
</Item13>
<Item14>
<Source Value="testformatter_unit.pas"/>
<Line Value="909"/>
</Item14>
</BreakPoints> </BreakPoints>
<Watches Count="2"> <Watches Count="2">
<Item1> <Item1>

2
wst/trunk/tests/test_suite/wst_test_suite.lpr
View File

@ -9,7 +9,7 @@ uses
base_service_intf, base_soap_formatter, binary_formatter, binary_streamer, base_service_intf, base_soap_formatter, binary_formatter, binary_streamer,
server_binary_formatter, metadata_repository, server_binary_formatter, metadata_repository,
metadata_generator, parserdefs, server_service_intf, metadata_wsdl, metadata_generator, parserdefs, server_service_intf, metadata_wsdl,
test_parserdef; test_parserdef, base_xmlrpc_formatter;
Const Const
ShortOpts = 'alh'; ShortOpts = 'alh';

100
wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
View File

@ -7,7 +7,7 @@
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/> <IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="12"/> <ActiveEditorIndexAtStart Value="8"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -32,13 +32,13 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="41"> <Units Count="42">
<Unit0> <Unit0>
<Filename Value="typ_lib_edtr.lpr"/> <Filename Value="typ_lib_edtr.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<CursorPos X="39" Y="13"/> <CursorPos X="39" Y="13"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="16"/> <EditorIndex Value="17"/>
<UsageCount Value="112"/> <UsageCount Value="112"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
@ -65,12 +65,12 @@
<Unit3> <Unit3>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/> <Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<UnitName Value="wsdl2pas_imp"/> <UnitName Value="wsdl2pas_imp"/>
<CursorPos X="43" Y="1817"/> <CursorPos X="1" Y="214"/>
<TopLine Value="1748"/> <TopLine Value="205"/>
<EditorIndex Value="7"/> <EditorIndex Value="7"/>
<UsageCount Value="53"/> <UsageCount Value="53"/>
<Bookmarks Count="1"> <Bookmarks Count="1">
<Item0 X="1" Y="1287" ID="1"/> <Item0 X="1" Y="1265" ID="1"/>
</Bookmarks> </Bookmarks>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit3> </Unit3>
@ -80,7 +80,7 @@
<UnitName Value="wsdl_generator"/> <UnitName Value="wsdl_generator"/>
<CursorPos X="60" Y="32"/> <CursorPos X="60" Y="32"/>
<TopLine Value="11"/> <TopLine Value="11"/>
<EditorIndex Value="14"/> <EditorIndex Value="15"/>
<UsageCount Value="112"/> <UsageCount Value="112"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
@ -124,7 +124,7 @@
<UnitName Value="source_utils"/> <UnitName Value="source_utils"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="40"/> <TopLine Value="40"/>
<EditorIndex Value="17"/> <EditorIndex Value="18"/>
<UsageCount Value="112"/> <UsageCount Value="112"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
@ -159,7 +159,7 @@
<UnitName Value="ufpropedit"/> <UnitName Value="ufpropedit"/>
<CursorPos X="27" Y="201"/> <CursorPos X="27" Y="201"/>
<TopLine Value="178"/> <TopLine Value="178"/>
<EditorIndex Value="13"/> <EditorIndex Value="14"/>
<UsageCount Value="112"/> <UsageCount Value="112"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit11> </Unit11>
@ -308,7 +308,7 @@
<UnitName Value="pascal_parser_intf"/> <UnitName Value="pascal_parser_intf"/>
<CursorPos X="20" Y="540"/> <CursorPos X="20" Y="540"/>
<TopLine Value="528"/> <TopLine Value="528"/>
<EditorIndex Value="11"/> <EditorIndex Value="12"/>
<UsageCount Value="34"/> <UsageCount Value="34"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit32> </Unit32>
@ -318,7 +318,7 @@
<UnitName Value="PParser"/> <UnitName Value="PParser"/>
<CursorPos X="25" Y="22"/> <CursorPos X="25" Y="22"/>
<TopLine Value="7"/> <TopLine Value="7"/>
<EditorIndex Value="15"/> <EditorIndex Value="16"/>
<UsageCount Value="34"/> <UsageCount Value="34"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit33> </Unit33>
@ -327,7 +327,7 @@
<UnitName Value="logger_intf"/> <UnitName Value="logger_intf"/>
<CursorPos X="5" Y="43"/> <CursorPos X="5" Y="43"/>
<TopLine Value="29"/> <TopLine Value="29"/>
<EditorIndex Value="10"/> <EditorIndex Value="11"/>
<UsageCount Value="26"/> <UsageCount Value="26"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit34> </Unit34>
@ -337,7 +337,7 @@
<UnitName Value="PasTree"/> <UnitName Value="PasTree"/>
<CursorPos X="1" Y="533"/> <CursorPos X="1" Y="533"/>
<TopLine Value="521"/> <TopLine Value="521"/>
<EditorIndex Value="8"/> <EditorIndex Value="9"/>
<UsageCount Value="34"/> <UsageCount Value="34"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit35> </Unit35>
@ -364,78 +364,30 @@
<UnitName Value="rtti_filters"/> <UnitName Value="rtti_filters"/>
<CursorPos X="3" Y="296"/> <CursorPos X="3" Y="296"/>
<TopLine Value="305"/> <TopLine Value="305"/>
<EditorIndex Value="9"/> <EditorIndex Value="10"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit39> </Unit39>
<Unit40> <Unit40>
<Filename Value="..\ws_helper\generator.pas"/> <Filename Value="..\ws_helper\generator.pas"/>
<UnitName Value="generator"/> <UnitName Value="generator"/>
<CursorPos X="46" Y="2151"/> <CursorPos X="53" Y="2145"/>
<TopLine Value="2127"/> <TopLine Value="2127"/>
<EditorIndex Value="12"/> <EditorIndex Value="13"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit40> </Unit40>
<Unit41>
<Filename Value="..\wst_rtti_filter\dom_cursors.pas"/>
<UnitName Value="dom_cursors"/>
<CursorPos X="3" Y="17"/>
<TopLine Value="1"/>
<EditorIndex Value="8"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit41>
</Units> </Units>
<JumpHistory Count="14" HistoryIndex="13"> <JumpHistory Count="0" HistoryIndex="-1"/>
<Position1>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1166" Column="30" TopLine="1144"/>
</Position1>
<Position2>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1812" Column="38" TopLine="1805"/>
</Position2>
<Position3>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position3>
<Position4>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="205" Column="9" TopLine="183"/>
</Position4>
<Position5>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="206" Column="9" TopLine="184"/>
</Position5>
<Position6>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="430" Column="68" TopLine="408"/>
</Position6>
<Position7>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="530" Column="94" TopLine="508"/>
</Position7>
<Position8>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="919" Column="118" TopLine="872"/>
</Position8>
<Position9>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1093" Column="28" TopLine="1052"/>
</Position9>
<Position10>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1152" Column="129" TopLine="1130"/>
</Position10>
<Position11>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1802" Column="135" TopLine="1780"/>
</Position11>
<Position12>
<Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
<Caret Line="1807" Column="42" TopLine="1785"/>
</Position12>
<Position13>
<Filename Value="..\ws_helper\generator.pas"/>
<Caret Line="1647" Column="33" TopLine="1614"/>
</Position13>
<Position14>
<Filename Value="..\ws_helper\generator.pas"/>
<Caret Line="1644" Column="58" TopLine="1634"/>
</Position14>
</JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>

6
wst/trunk/ws_helper/metadata_generator.pas
View File

@ -63,7 +63,7 @@ begin
FStream.WriteStr(sWST_META); FStream.WriteStr(sWST_META);
FStream.WriteStr(FSymbolTable.CurrentModule.Name); FStream.WriteStr(FSymbolTable.CurrentModule.Name);
k := 0; k := 0;
typeList := FSymbolTable.CurrentModule.InterfaceSection.Types; typeList := FSymbolTable.CurrentModule.InterfaceSection.Declarations;
c := typeList.Count; c := typeList.Count;
for i := 0 to pred(c) do begin for i := 0 to pred(c) do begin
elt := TPasElement(typeList[i]); elt := TPasElement(typeList[i]);
@ -100,6 +100,8 @@ procedure TMetadataGenerator.GenerateIntfMetadata(AIntf: TPasClassType);
FStream.WriteStr(AMeth.Name); FStream.WriteStr(AMeth.Name);
if AMeth.InheritsFrom(TPasFunction) then begin if AMeth.InheritsFrom(TPasFunction) then begin
FStream.WriteInt8U(k + 1); FStream.WriteInt8U(k + 1);
end else begin
FStream.WriteInt8U(k);
end; end;
for j := 0 to pred(k) do begin for j := 0 to pred(k) do begin
WriteParam(TPasArgument(argLst[j])); WriteParam(TPasArgument(argLst[j]));
@ -142,7 +144,7 @@ Var
elt : TPasElement; elt : TPasElement;
begin begin
GenerateHeader(); GenerateHeader();
typeList := FSymbolTable.CurrentModule.InterfaceSection.Types; typeList := FSymbolTable.CurrentModule.InterfaceSection.Declarations;
c := Pred(typeList.Count); c := Pred(typeList.Count);
for i := 0 to c do begin for i := 0 to c do begin
elt := TPasElement(typeList[i]); elt := TPasElement(typeList[i]);

22
wst/trunk/ws_helper/wsdl2pas_imp.pas
View File

@ -211,31 +211,9 @@ const
s_xmlns : WideString = 'xmlns'; s_xmlns : WideString = 'xmlns';
//---------------------------------------------------------- //----------------------------------------------------------
s_NODE_NAME = 'NodeName';
s_NODE_VALUE = 'NodeValue';
s_TRANSPORT = 'TRANSPORT'; s_TRANSPORT = 'TRANSPORT';
s_FORMAT = 'FORMAT'; s_FORMAT = 'FORMAT';
type TCursorExposedType = ( cetRttiNode, cetDomNode );
function CreateAttributesCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
begin
Result := nil;
if ( ANode <> nil ) and ( ANode.Attributes <> nil ) and ( ANode.Attributes.Length > 0 ) then begin
Result := TDOMNamedNodeMapCursor.Create(ANode.Attributes,faNone) ;
if ( AExposedType = cetRttiNode ) then
Result := TDOMNodeRttiExposerCursor.Create(Result);
end;
end;
function CreateChildrenCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
begin
Result := nil;
if ( ANode <> nil ) and ANode.HasChildNodes() then begin
Result := TDOMNodeListCursor.Create(ANode.GetChildNodes(),faFreeOnDestroy) ;
if ( AExposedType = cetRttiNode ) then
Result := TDOMNodeRttiExposerCursor.Create(Result);
end;
end;
function ExtractNameFromQName(const AQName : string):string ; function ExtractNameFromQName(const AQName : string):string ;
var var

31
wst/trunk/wst_rtti_filter/dom_cursors.pas
View File

@ -10,6 +10,11 @@ uses
Classes, SysUtils, Classes, SysUtils,
cursor_intf, DOM; cursor_intf, DOM;
const
s_NODE_NAME = 'NodeName';
s_NODE_VALUE = 'NodeValue';
type type
TFreeAction = ( faNone, faFreeOnDestroy ); TFreeAction = ( faNone, faFreeOnDestroy );
@ -87,8 +92,34 @@ type
destructor Destroy();override; destructor Destroy();override;
end; end;
TCursorExposedType = ( cetRttiNode, cetDomNode );
function CreateChildrenCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
function CreateAttributesCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
implementation implementation
function CreateChildrenCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
begin
Result := nil;
if ( ANode <> nil ) and ANode.HasChildNodes() then begin
Result := TDOMNodeListCursor.Create(ANode.GetChildNodes(),faFreeOnDestroy) ;
if ( AExposedType = cetRttiNode ) then
Result := TDOMNodeRttiExposerCursor.Create(Result);
end;
end;
function CreateAttributesCursor(ANode : TDOMNode; const AExposedType : TCursorExposedType):IObjectCursor;
begin
Result := nil;
if ( ANode <> nil ) and ( ANode.Attributes <> nil ) and ( ANode.Attributes.Length > 0 ) then begin
Result := TDOMNamedNodeMapCursor.Create(ANode.Attributes,faNone) ;
if ( AExposedType = cetRttiNode ) then
Result := TDOMNodeRttiExposerCursor.Create(Result);
end;
end;
{ TDOMNodeListCursor } { TDOMNodeListCursor }
procedure TDOMNodeListCursor.Reset(); procedure TDOMNodeListCursor.Reset();