GitHub-Mirror/x2xmldatabinding
1
0
Fork 0
mirror of synced 2024-11-14 19:13:50 +00:00
Code Issues Projects Releases Wiki Activity

Added: initial (untested) implementation for simple type collections

Browse Source 
Changed: conforming to new NamedFormat specifications
This commit is contained in:
Mark van Renswoude 2008-03-17 16:02:57 +00:00
parent 4f8751632a
commit 372812b547
2 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
Units/DelphiXMLDataBindingGenerator.pas
View File

@ -66,10 +66,10 @@ uses
const const
SectionComments: array[TDelphiXMLSection] of String = SectionComments: array[TDelphiXMLSection] of String =
( (
' { Forward declarations for %SchemaName:s }', ' { Forward declarations for %<SchemaName>:s }',
' { Interfaces for %SchemaName:s }', ' { Interfaces for %<SchemaName>:s }',
' { Classes for %SchemaName:s }', ' { Classes for %<SchemaName>:s }',
'{ Implementation for %SchemaName:s }' '{ Implementation for %<SchemaName>:s }'
); );
@ -77,9 +77,9 @@ const
PrefixClass = 'TXML'; PrefixClass = 'TXML';
InterfaceItemForward = ' IXML%Name:s = interface;'; InterfaceItemForward = ' IXML%<Name>:s = interface;';
InterfaceItemInterface = ' IXML%Name:s = interface(%ParentName:s)'; InterfaceItemInterface = ' IXML%<Name>:s = interface(%<ParentName>:s)';
InterfaceItemClass = ' TXML%Name:s = class(%ParentName:s, IXML%Name:s)'; InterfaceItemClass = ' TXML%<Name>:s = class(%<ParentName>:s, IXML%<Name>:s)';
CollectionInterface = 'IXMLNodeCollection'; CollectionInterface = 'IXMLNodeCollection';
@ -352,7 +352,7 @@ begin
hasItem := True; hasItem := True;
end; end;
docBinding := NamedFormat('GetDocBinding(''%SourceName:s'', TXML%Name:s, TargetNamespace) as IXML%Name:s', docBinding := NamedFormat('GetDocBinding(''%<SourceName>:s'', TXML%<Name>:s, TargetNamespace) as IXML%<Name>:s',
['SourceName', interfaceItem.Name, ['SourceName', interfaceItem.Name,
'Name', interfaceItem.TranslatedName]); 'Name', interfaceItem.TranslatedName]);
@ -362,37 +362,37 @@ begin
case ASection of case ASection of
dxsInterface: dxsInterface:
begin begin
Add(' function Get%Name:s(ADocument: IXMLDocument): IXML%Name:s;'); Add(' function Get%<Name>:s(ADocument: IXMLDocument): IXML%<Name>:s;');
Add(' function Load%Name:s(const AFileName: String): IXML%Name:s;'); Add(' function Load%<Name>:s(const AFileName: String): IXML%<Name>:s;');
Add(' function Load%Name:sFromStream(AStream: TStream): IXML%Name:s;'); Add(' function Load%<Name>:sFromStream(AStream: TStream): IXML%<Name>:s;');
Add(' function New%Name:s: IXML%Name:s;'); Add(' function New%<Name>:s: IXML%<Name>:s;');
end; end;
dxsImplementation: dxsImplementation:
begin begin
Add('function Get%Name:s(ADocument: IXMLDocument): IXML%Name:s;'); Add('function Get%<Name>:s(ADocument: IXMLDocument): IXML%<Name>:s;');
Add('begin'); Add('begin');
Add(' Result := ADocument.' + docBinding); Add(' Result := ADocument.' + docBinding);
Add('end;'); Add('end;');
AddLn; AddLn;
Add('function Load%Name:s(const AFileName: String): IXML%Name:s;'); Add('function Load%<Name>:s(const AFileName: String): IXML%<Name>:s;');
Add('begin'); Add('begin');
Add(' Result := LoadXMLDocument(AFileName).' + docBinding); Add(' Result := LoadXMLDocument(AFileName).' + docBinding);
Add('end;'); Add('end;');
AddLn; AddLn;
Add('function Load%Name:sFromStream(AStream: TStream): IXML%Name:s;'); Add('function Load%<Name>:sFromStream(AStream: TStream): IXML%<Name>:s;');
Add('var'); Add('var');
Add(' doc: IXMLDocument;'); Add(' doc: IXMLDocument;');
AddLn; AddLn;
Add('begin'); Add('begin');
Add(' doc := NewXMLDocument;'); Add(' doc := NewXMLDocument;');
Add(' doc.LoadFromStream(AStream);'); Add(' doc.LoadFromStream(AStream);');
Add(' Result := Get%Name:s(doc);'); Add(' Result := Get%<Name>:s(doc);');
Add('end;'); Add('end;');
AddLn; AddLn;
Add('function New%Name:s: IXML%Name:s;'); Add('function New%<Name>:s: IXML%<Name>:s;');
Add('begin'); Add('begin');
Add(' Result := NewXMLDocument.' + docBinding); Add(' Result := NewXMLDocument.' + docBinding);
Add('end;'); Add('end;');
@ -593,7 +593,7 @@ procedure TDelphiXMLDataBindingGenerator.WriteSchemaInterfaceProperties(AStream:
hasInterface := True; hasInterface := True;
end; end;
AStream.WriteLnNamedFmt(' RegisterChildNode(''%SourceName:s'', TXML%Name:s);', AStream.WriteLnNamedFmt(' RegisterChildNode(''%<SourceName>:s'', TXML%<Name>:s);',
['SourceName', itemProperty.Item.Name, ['SourceName', itemProperty.Item.Name,
'Name', itemProperty.Item.TranslatedName]); 'Name', itemProperty.Item.TranslatedName]);
end; end;
@ -699,35 +699,35 @@ begin
dxmPropertyGet: dxmPropertyGet:
begin begin
if writeOptional then if writeOptional then
sourceCode.Add(' function GetHas%Name:s: Boolean;'); sourceCode.Add(' function GetHas%<PropertyName>:s: Boolean;');
if writeTextProp then if writeTextProp then
sourceCode.Add(' function Get%Name:sText: WideString;'); sourceCode.Add(' function Get%<PropertyName>:sText: WideString;');
sourceCode.Add(' function Get%Name:s: %DataType:s;'); sourceCode.Add(' function Get%<PropertyName>:s: %<DataType>:s;');
end; end;
dxmPropertySet: dxmPropertySet:
if not itemProperty.IsReadOnly then if not itemProperty.IsReadOnly then
begin begin
if writeTextProp then if writeTextProp then
sourceCode.Add(' procedure Set%Name:sText(const Value: WideString);'); sourceCode.Add(' procedure Set%<PropertyName>:sText(const Value: WideString);');
sourceCode.Add(' procedure Set%Name:s(const Value: %DataType:s);'); sourceCode.Add(' procedure Set%<PropertyName>:s(const Value: %<DataType>:s);');
end; end;
dxmPropertyDeclaration: dxmPropertyDeclaration:
begin begin
if writeOptional then if writeOptional then
sourceCode.Add(' property Has%Name:s: Boolean read GetHas%Name:s;'); sourceCode.Add(' property Has%<PropertyName>:s: Boolean read GetHas%<PropertyName>:s;');
if writeTextProp then if writeTextProp then
sourceCode.Add(' property %Name:sText: WideString read Get%Name:sText;'); sourceCode.Add(' property %<PropertyName>:sText: WideString read Get%<PropertyName>:sText;');
if itemProperty.IsReadOnly then if itemProperty.IsReadOnly then
sourceCode.Add(' property %Name:s: %DataType:s read Get%Name:s;') sourceCode.Add(' property %<PropertyName>:s: %<DataType>:s read Get%<PropertyName>:s;')
else else
sourceCode.Add(' property %Name:s: %DataType:s read Get%Name:s write Set%Name:s;'); sourceCode.Add(' property %<PropertyName>:s: %<DataType>:s read Get%<PropertyName>:s write Set%<PropertyName>:s;');
end; end;
end; end;
@ -743,9 +743,9 @@ begin
begin begin
if writeOptional then if writeOptional then
begin begin
sourceCode.Add('function TXML%Name:s.GetHas%PropertyName:s: Boolean;'); sourceCode.Add('function TXML%<Name>:s.GetHas%<PropertyName>:s: Boolean;');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := Assigned(ChildNodes.FindNode(''%PropertySourceName:s''));'); sourceCode.Add(' Result := Assigned(ChildNodes.FindNode(''%<PropertySourceName>:s''));');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
end; end;
@ -753,21 +753,21 @@ begin
if writeTextProp then if writeTextProp then
begin begin
sourceCode.Add('function TXML%Name:s.Get%PropertyName:sText: WideString;'); sourceCode.Add('function TXML%<Name>:s.Get%<PropertyName>:sText: WideString;');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := ChildNodes[''%PropertySourceName:s''].NodeValue;'); sourceCode.Add(' Result := ChildNodes[''%<PropertySourceName>:s''].NodeValue;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
end; end;
sourceCode.Add('function TXML%Name:s.Get%PropertyName:s: %DataType:s;'); sourceCode.Add('function TXML%<Name>:s.Get%<PropertyName>:s: %<DataType>:s;');
case itemProperty.PropertyType of case itemProperty.PropertyType of
ptSimple: ptSimple:
begin begin
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := ChildNodes[''%PropertySourceName:s''].NodeValue;'); sourceCode.Add(' Result := ChildNodes[''%<PropertySourceName>:s''].NodeValue;');
sourceCode.Add('end;'); sourceCode.Add('end;');
end; end;
@ -780,7 +780,7 @@ begin
itCollection: itCollection:
begin begin
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := (ChildNodes[''%Name:s''] as IXML%PropertyItemName:s);'); sourceCode.Add(' Result := (ChildNodes[''%<Name>:s''] as IXML%<PropertyItemName>:s);');
sourceCode.Add('end;'); sourceCode.Add('end;');
end; end;
@ -788,13 +788,13 @@ begin
begin begin
sourceCode.Add('var'); sourceCode.Add('var');
sourceCode.Add(' nodeValue: WideString;'); sourceCode.Add(' nodeValue: WideString;');
sourceCode.Add(' enumValue: %DataType:s;'); sourceCode.Add(' enumValue: %<DataType>:s;');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := %DataType:s(-1);'); sourceCode.Add(' Result := %<DataType>:s(-1);');
sourceCode.Add(' nodeValue := Get%PropertyName:sText;'); sourceCode.Add(' nodeValue := Get%<PropertyName>:sText;');
sourceCode.Add(' for enumValue := Low(%DataType:s) to High(%DataType:s) do'); sourceCode.Add(' for enumValue := Low(%<DataType>:s) to High(%<DataType>:s) do');
sourceCode.Add(' if %PropertyName:sValues[enumValue] = nodeValue then'); sourceCode.Add(' if %<PropertyName>:sValues[enumValue] = nodeValue then');
sourceCode.Add(' begin'); sourceCode.Add(' begin');
sourceCode.Add(' Result := enumValue;'); sourceCode.Add(' Result := enumValue;');
sourceCode.Add(' break;'); sourceCode.Add(' break;');
@ -812,21 +812,21 @@ begin
begin begin
if writeTextProp then if writeTextProp then
begin begin
sourceCode.Add('procedure TXML%Name:s.Set%PropertyName:sText(const Value: WideString);'); sourceCode.Add('procedure TXML%<Name>:s.Set%<PropertyName>:sText(const Value: WideString);');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' ChildNodes[''%PropertySourceName:s''].NodeValue := Value;'); sourceCode.Add(' ChildNodes[''%<PropertySourceName>:s''].NodeValue := Value;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
end; end;
if Assigned(propertyItem) and (propertyItem.ItemType = itEnumeration) then if Assigned(propertyItem) and (propertyItem.ItemType = itEnumeration) then
value := '%PropertyItemName:sValues[Value]' value := '%<PropertyItemName>:sValues[Value]'
else else
value := 'Value'; value := 'Value';
sourceCode.Add('procedure TXML%Name:s.Set%PropertyName:s(const Value: %DataType:s);'); sourceCode.Add('procedure TXML%<Name>:s.Set%<PropertyName>:s(const Value: %<DataType>:s);');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' ChildNodes[''%PropertySourceName:s''].NodeValue := ' + value + ';'); sourceCode.Add(' ChildNodes[''%<PropertySourceName>:s''].NodeValue := ' + value + ';');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
end; end;
@ -898,8 +898,8 @@ end;
procedure TDelphiXMLDataBindingGenerator.WriteSchemaCollectionProperties(AStream: TStreamHelper; AItem: TXMLDataBindingCollection; ASection: TDelphiXMLSection); procedure TDelphiXMLDataBindingGenerator.WriteSchemaCollectionProperties(AStream: TStreamHelper; AItem: TXMLDataBindingCollection; ASection: TDelphiXMLSection);
var var
dataTypeName: string;
dataIntfName: string; dataIntfName: string;
dataTypeName: string;
sourceCode: TNamedFormatStringList; sourceCode: TNamedFormatStringList;
begin begin
@ -907,8 +907,18 @@ begin
AStream.WriteLn(' protected'); AStream.WriteLn(' protected');
// #ToDo1 (MvR) 17-3-2008: DataType for enumerations etc. // #ToDo1 (MvR) 17-3-2008: DataType for enumerations etc.
dataTypeName := PrefixInterface + AItem.CollectionItem.TranslatedName; case AItem.CollectionItem.PropertyType of
dataIntfName := dataTypeName; ptSimple:
begin
dataTypeName := AItem.CollectionItem.TranslatedName;
dataIntfName := 'IXMLNode';
end;
ptItem:
begin
dataTypeName := PrefixInterface + AItem.CollectionItem.TranslatedName;
dataIntfName := dataTypeName;
end;
end;
sourceCode := TNamedFormatStringList.Create(); sourceCode := TNamedFormatStringList.Create();
try try
@ -916,41 +926,41 @@ begin
dxsInterface, dxsInterface,
dxsClass: dxsClass:
begin begin
sourceCode.Add(' function Get_%ItemName:s(Index: Integer): %DataType:s;'); sourceCode.Add(' function Get_%<ItemName>:s(Index: Integer): %<DataType>:s;');
sourceCode.Add(' function Add: %DataType:s;'); sourceCode.Add(' function Add: %<DataType>:s;');
sourceCode.Add(' function Insert(Index: Integer): %DataType:s;'); sourceCode.Add(' function Insert(Index: Integer): %<DataType>:s;');
end; end;
dxsImplementation: dxsImplementation:
begin begin
sourceCode.Add('procedure TXML%Name:s.AfterConstruction;'); sourceCode.Add('procedure TXML%<Name>:s.AfterConstruction;');
sourceCode.Add('begin'); sourceCode.Add('begin');
// #ToDo1 (MvR) 17-3-2008: DataType class / interface!! // #ToDo1 (MvR) 17-3-2008: DataType class / interface!!
sourceCode.Add(' RegisterChildNode(''%ItemSourceName:s'', %DataType:s);'); sourceCode.Add(' RegisterChildNode(''%<ItemSourceName>:s'', %<DataType>:s);');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add(' ItemTag := ''%ItemSourceName:s'';'); sourceCode.Add(' ItemTag := ''%<ItemSourceName>:s'';');
sourceCode.Add(' ItemInterface := %DataInterface:s;'); sourceCode.Add(' ItemInterface := %<DataInterface>:s;');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add(' inherited;'); sourceCode.Add(' inherited;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add('function TXML%Name:s.Get_%ItemName:s(Index: Integer): %DataType:s;'); sourceCode.Add('function TXML%<Name>:s.Get_%<ItemName>:s(Index: Integer): %<DataType>:s;');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := (List[Index] as %DataType:s;'); sourceCode.Add(' Result := (List[Index] as %<DataType>:s;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add('function TXML%Name:s.Add(Index: Integer): %DataType:s;'); sourceCode.Add('function TXML%<Name>:s.Add(Index: Integer): %<DataType>:s;');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := (AddItem(-1) as %DataType:s;'); sourceCode.Add(' Result := (AddItem(-1) as %<DataType>:s;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add('function TXML%Name:s.Insert(Index: Integer): %DataType:s;'); sourceCode.Add('function TXML%<Name>:s.Insert(Index: Integer): %<DataType>:s;');
sourceCode.Add('begin'); sourceCode.Add('begin');
sourceCode.Add(' Result := (AddItem(Index) as %DataType:s;'); sourceCode.Add(' Result := (AddItem(Index) as %<DataType>:s;');
sourceCode.Add('end;'); sourceCode.Add('end;');
sourceCode.AddLn; sourceCode.AddLn;
end; end;
@ -960,7 +970,7 @@ begin
dxsInterface: dxsInterface:
begin begin
sourceCode.AddLn; sourceCode.AddLn;
sourceCode.Add(' property %ItemName:s[Index: Integer]: %DataType:s read Get_%ItemName:s; default;'); sourceCode.Add(' property %<ItemName>:s[Index: Integer]: %<DataType>:s read Get_%<ItemName>:s; default;');
end; end;
dxsClass: dxsClass:
@ -991,7 +1001,7 @@ begin
if (ASection <> dxsForward) or (AItem.MemberCount = 0) then if (ASection <> dxsForward) or (AItem.MemberCount = 0) then
exit; exit;
enumStart := NamedFormat(' TXML%Name:s = (', enumStart := NamedFormat(' TXML%<Name>:s = (',
['Name', AItem.TranslatedName]); ['Name', AItem.TranslatedName]);
AStream.Write(enumStart); AStream.Write(enumStart);
lineIndent := StringOfChar(' ', Length(enumStart)); lineIndent := StringOfChar(' ', Length(enumStart));
@ -1021,8 +1031,8 @@ begin
if (AItem.MemberCount = 0) then if (AItem.MemberCount = 0) then
exit; exit;
enumStart := NamedFormat(' %Name:sValues: ', ['Name', AItem.TranslatedName]); enumStart := NamedFormat(' %<Name>:sValues: ', ['Name', AItem.TranslatedName]);
AStream.WriteLn(enumStart + NamedFormat('array[TXML%Name:s] of WideString =', AStream.WriteLn(enumStart + NamedFormat('array[TXML%<Name>:s] of WideString =',
['Name', AItem.TranslatedName])); ['Name', AItem.TranslatedName]));
lineIndent := StringOfChar(' ', Length(enumStart)); lineIndent := StringOfChar(' ', Length(enumStart));
@ -1031,7 +1041,7 @@ begin
for memberIndex := 0 to Pred(AItem.MemberCount) do for memberIndex := 0 to Pred(AItem.MemberCount) do
begin begin
AStream.Write(NamedFormat('%Indent:s ''%Name:s''', AStream.Write(NamedFormat('%<Indent>:s ''%<Name>:s''',
['Indent', lineIndent, ['Indent', lineIndent,
'Name', AItem.Members[memberIndex].Name])); 'Name', AItem.Members[memberIndex].Name]));
@ -1071,3 +1081,4 @@ end;
end. end.

17
X2XMLDataBindingCmdLine.dof
View File

@ -140,6 +140,19 @@ C:\Program Files\Borland\Indy\D7\dclIndy70.bpl=Internet Direct (Indy) for D7 Pro
[HistoryLists\hlUnitAliases] [HistoryLists\hlUnitAliases]
Count=1 Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=2
Item0=..\..
Item1=F:\Development\VDarts\Packages
[HistoryLists\hlUnitOutputDirectory] [HistoryLists\hlUnitOutputDirectory]
Count=1 Count=5
Item0=Lib Item0=P:\Algemeen\lib
Item1=..\..\Lib\D7
Item2=..\..\Dcu
Item3=..\..\..\Dcu
Item4=Dcu
[HistoryLists\hlBPLOutput]
Count=3
Item0=..\..\Lib\D7
Item1=Lib\D7
Item2=..\Lib\D7