Skip to content

Commit

Permalink
remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
@WouterVanNifterick
WouterVanNifterick committed Dec 13, 2016
1 parent 967cf55 commit 6ab415c
Showing 1 changed file with 6 additions and 118 deletions.
124 changes: 6 additions & 118 deletions WvN.Pascal.Model.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,104 +238,11 @@ function MakePascalCase(const aString:String):String;
Result := Result + aString[I];

for I := Length(Result) downto 1 do
// if Result[I]=' ' then
if CharInSet(Result[I],Chars) then
Delete(Result,I,1);
end;





procedure FixMultilineStatements(var sl: TStringList);
var
i,j,c: Integer;
ch:char;s:String;
cPos: Integer;
const
DUMMY='nnnnn';
begin
// get rid of multi-line statements
{
for i := 0 to sl.Count - 1 do
begin
if sl[i].EndsWith(',') then sl[i] := sl[i] + DUMMY;
if sl[i].EndsWith('+') then sl[i] := sl[i] + DUMMY;
if sl[i].EndsWith('-') then sl[i] := sl[i] + DUMMY;
if sl[i].EndsWith('*') then sl[i] := sl[i] + DUMMY;
if sl[i].EndsWith('/') then sl[i] := sl[i] + DUMMY;
if sl[i].EndsWith('(') then sl[i] := sl[i] + DUMMY;
end;
sl.Text := sl.Text.Replace(DUMMY + sLineBreak, DUMMY, [rfReplaceAll]);
sl.Text := sl.Text.Replace(DUMMY, sLineBreak, [rfReplaceAll]);
}

sl.Text := Sl.Text.Replace(#10,'');
sl.Text := Sl.Text.Replace(#13,sLineBreak);


for ch in [',','+','-','*','/'] do
sl.Text := sl.Text.Replace(ch+sLineBreak,ch+' ',[rfReplaceAll]);

// sl.Text := sl.Text.Replace('){' + sLineBreak, ')' + sLineBreak + '{', [rfReplaceAll]);
sl.Text := sl.Text.Replace('{', sLineBreak + '{' +sLineBreak, [rfReplaceAll]);
sl.Text := sl.Text.Replace('}', sLineBreak + '}' +sLineBreak, [rfReplaceAll]);
sl.Text := sl.Text.Replace(';', ';' +'<LINEBREAK> ', [rfReplaceAll]);

for i := 0 to sl.Count-1 do
if sl[I].Trim.StartsWith('for') then
sl[I] := sl[I].Replace('<LINEBREAK> ','');

sl.Text := sl.Text.Replace('<LINEBREAK>', sLineBreak, [rfReplaceAll]);

sl.Text := sl.Text.Replace( sLineBreak + sLineBreak + sLineBreak, sLineBreak + sLineBreak, [rfReplaceAll]);

c := 0;
for i := 0 to sl.Count-1 do
begin
s := sl[i];
if s.Trim.ToLower.StartsWith('if') then
for j := 1 to length(s) do
begin
if s[j]='(' then
inc(c);
if s[j]=')' then
begin
dec(c);
if c=0 then
insert('@@LINEBREAK@@ ',s,j+1);
sl[i] := s;
end;
end;
end;

for i := 0 to sl.Count-1 do
begin
s := sl[i].Trim;
cPos := s.IndexOf('{');
if (cPos>0) and (cPos<s.Length) then
begin
insert('@@LINEBREAK@@',s,cPos+1);
sl[i] := s;
end;
end;


for i := 0 to sl.Count-1 do
begin
s := sl[i].Trim;
cPos := s.IndexOf('}');
if cPos>0 then
begin
insert('@@LINEBREAK@@',s,cPos+2);
sl[i] := s;
end;
end;

sl.Text := sl.Text.Replace('@@LINEBREAK@@',sLineBreak, [rfReplaceAll]);
end;


constructor TVariable.Create;
begin

Expand Down Expand Up @@ -420,7 +327,7 @@ function TVariableList.getLongestName: integer;
end;

function TVariableList.ToPascal(indent:Boolean): String;
var longest,i:integer;// v:TVariable;
var longest,i:integer;
align:boolean;
begin
Result := '';
Expand Down Expand Up @@ -456,11 +363,6 @@ function TVariableList.ToPascal(indent:Boolean): String;
or (Items[I - 1].Dir <> Items[I].Dir)
or (Items[I - 1].&Type <> Items[I].&Type) then
begin
// if Items[I].Dir <> TDir.none then
// if Indent then
// if Result.Trim <> '' then
// Result := Result + sLineBreak;

if Indent then
if I = 0 then
if Items[I].Dir = TDir.none then
Expand Down Expand Up @@ -539,8 +441,6 @@ function TVariableList.ToPascal(indent:Boolean): String;

if Indent then
begin
// if not (Result.StartsWith('var') or Result.StartsWith('const')) then
// Result := 'var'+sLineBreak+' '+Result;
if not Result.Trim.EndsWith(';') then
Result := Result.Trim + ';';

Expand Down Expand Up @@ -614,14 +514,10 @@ function TRoutine.ToDeclarationPascal: String;
if sl.ToString.Trim<>';' then
sl.Append(';');

if &Override then
sl.Append('override;');
if &Overload then
sl.Append('overload;');
if &Inline then
sl.Append('inline;');
if &Static then
sl.Append('static;');
if &Override then sl.Append('override;');
if &Overload then sl.Append('overload;');
if &Inline then sl.Append('inline;');
if &Static then sl.Append('static;');

Result := sl.ToString;
sl.Free;
Expand All @@ -647,16 +543,12 @@ function TRoutine.ToImplementationPascal(aClassName: string): String;
sl.Append(':'+Self.ReturnType);

sl.AppendLine(';');
// sl.Remove(sl.Length-1,1);
if self.LocalVars.Count>0 then
sl.Append( LocalVars.ToPascal(true) );

sl.AppendLine( 'begin');
Code.Cleanup;

// for c in Code.Lines do
// sl.AppendLine( c );

sl.AppendLine(code.ToPascal);

sl.AppendLine( 'end;');
Expand Down Expand Up @@ -747,11 +639,9 @@ sl.Add(Esc(Name) + ' = record');
end;
sl.Add( vars.ToPascal(true).TrimRight );
end;

for m in Methods do
begin
sl.Add(m.ToDeclarationPascal);
// sl.Add('');
end;


if self.Kind <> &unit then
Expand Down Expand Up @@ -865,7 +755,6 @@ procedure TCode.Cleanup;
end;
end;
Setlength(lines,J);
// Align;
end;

constructor TCode.Create(c: TArray<string>);
Expand Down Expand Up @@ -975,7 +864,6 @@ function TPascalUnit.toPascal: string;

sl.Add(usesListIntf.ToPascal);

// sl.Add('type');
for e in enums do
sl.Add( e.ToPascal );

Expand Down

0 comments on commit 6ab415c

Please sign in to comment.