More parentheses

1 files changed, 11 insertions, 21 deletions

diff --git a/daily/302hard/bargroup.pas b/daily/302hard/bargroup.pas
index 295c458..de3c46a 100644
--- a/daily/302hard/bargroup.pas
+++ b/daily/302hard/bargroup.pas
@@ -1,4 +1,4 @@
-uses math, sysutils;
+uses math, strutils, sysutils;
 
 var
   minx, maxx, miny, maxy, stepx, stepy, i, x0, f: integer;
@@ -22,18 +22,6 @@ function gcd(a, b: integer): integer;
   end;
 
 
-function rjust(
-  s: string;
-  width: byte;
-  fill: char
-): string;
-  begin
-    while length(s) < width do
-      s := fill + s;
-    rjust := s
-  end;
-
-
 begin
   read(minx, maxx, miny, maxy, stepx, n);
   setlength(raw_freq, maxx - minx + 1);
@@ -69,19 +57,21 @@ begin
   setlength(xtrue, length(freq));
   for i := 0 to length(freq) - 1 do
     begin
-      xtrue[i] := rjust('', length(inttostr(minx + stepx * i)), '*');
-      xfalse[i] := rjust('', length(inttostr(minx + stepx * i)), ' ');
+      xtrue[i] := addchar('*', '', length(inttostr(minx + stepx * i)));
+      xfalse[i] := addchar(' ', '', length(inttostr(minx + stepx * i)));
       for j := 1 to stepx - 1 do
         begin
-          xtrue[i] := xtrue[i] +
-                      rjust('', length(inttostr(minx + stepx*i + j)) + 1, '*');
-          xfalse[i] := xfalse[i] +
-                       rjust('', length(inttostr(minx + stepx*i + j)) + 1, ' ')
+          xtrue[i] :=
+            xtrue[i] +
+            addchar('*', '', length(inttostr(minx + stepx*i + j)) + 1);
+          xfalse[i] :=
+            xfalse[i] +
+            addchar(' ', '', length(inttostr(minx + stepx*i + j)) + 1)
         end
     end;
 
   repeat
-    write(rjust(inttostr(maxy), lenf, ' '));
+    write(addchar(' ', inttostr(maxy), lenf), ' ');
     for i := 0 to length(freq) - 2 do
       begin
         if freq[i] >= maxy then
@@ -97,7 +87,7 @@ begin
     dec(maxy, stepy)
   until maxy < miny;
 
-  write(rjust('', lenf, ' '));
+  write(addchar(' ', '', lenf + 1));
   for i := minx to maxx - 1 do
     write(i, ' ');
   writeln(maxx)