Skip to content

Fix improve property names #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pustekuchen91 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix improve property names #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9109dd
set first char of property to uppercase
Nov 14, 2022
2f1dc4f
improved code readability
Nov 14, 2022
674b01c
adjust generated comment for long names
Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Generator/uProtoBufGenerator.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,21 +182,24 @@ TDelphiProperty = record
end;

procedure ParsePropType(Prop: TProtoBufProperty; Proto: TProtoFile; out DelphiProp: TDelphiProperty);
var
LPropertyNameFirstCharUpperCase: string;
begin
DelphiProp.IsList := Prop.PropKind = ptRepeated;
DelphiProp.isComplex := StrToPropertyType(Prop.PropType) = sptComplex;
if DelphiProp.isComplex then
DelphiProp.isObject := Assigned(Proto.ProtoBufMessages.FindByName(Prop.PropType))
else
DelphiProp.isObject := False;
LPropertyNameFirstCharUpperCase := AnsiUpperCase(Prop.Name[1]) + AnsiRightStr(Prop.Name, Length(Prop.Name) -1);
if not DelphiProp.IsList then
begin
DelphiProp.PropertyName := Prop.Name;
DelphiProp.PropertyName := LPropertyNameFirstCharUpperCase;
DelphiProp.PropertyType := ProtoPropTypeToDelphiType(Prop.PropType);
end
else
begin
DelphiProp.PropertyName := Format('%sList', [Prop.Name]);
DelphiProp.PropertyName := Format('%sList', [LPropertyNameFirstCharUpperCase]);
if DelphiProp.isObject then
DelphiProp.PropertyType := Format('TProtoBufClassList<%s>', [ProtoPropTypeToDelphiType(Prop.PropType)])
else
Expand Down Expand Up @@ -277,8 +280,10 @@ procedure TProtoBufGenerator.Generate(Proto: TProtoFile; OutputStream: TStream;
procedure TProtoBufGenerator.Generate(Proto: TProtoFile; const OutputDir: string; Encoding: TEncoding);
var
FS: TFileStream;
LOutputFileName: string;
begin
FS := TFileStream.Create(IncludeTrailingPathDelimiter(OutputDir) + Proto.Name + '.pas', fmCreate);
LOutputFileName := Format('%s%s.pas', [IncludeTrailingPathDelimiter(OutputDir), Proto.Name]);
FS := TFileStream.Create(LOutputFileName, fmCreate);
try
Generate(Proto, FS, Encoding);
finally
Expand Down Expand Up @@ -805,7 +810,8 @@ SL.Add(Format(' T%s = class(T%s)', [ProtoMsg.Name, s]));
SL.Add('interface');
SL.Add('');
SL.Add('// *********************************** ');
SL.Add(Format('// classes for %s.proto', [Proto.Name]));
SL.Add('// classes for:');
SL.Add(Format('// %s.proto', [Proto.Name]));
SL.Add('// generated by ProtoBufGenerator ');
SL.Add('// kami-soft 2016-2017');
SL.Add('// ***********************************');
Expand Down