Merge pull request #23 from corneliusdavid/main

polished up Delphi generator; hash verified

Author: gcarreno

generator/Common/generate.common.pas

@@ -26,13 +26,11 @@   TGenerator = class(TObject)
     function GenerateProgressBar(APBPosition, APBMax, APBWIdth: Integer;
       AFileSize: Int64; ATimeElapsed: TDateTime): String;
     function Rng1brc(Range: Integer): Integer;
-  protected
   public
     constructor Create(AInputFile, AOutputFile: String; ALineCount: Int64);
     destructor Destroy; override;
 
     procedure Generate;
-  published
   end;
 
   {$IFNDEF FPC}

generator/Common/version.inc

@@ -1,2 +1,2 @@
 const
-  cVersion = '1.0';
+  cVersion = '1.1';

generator/Delphi/src/generator.dpr

@@ -31,8 +31,6 @@ type
   { TOneBRCGenerator }
 
 procedure TOneBRCGenerator.Run;
-var
-  ErrorMsg: String;
 begin
   if ParseConsoleParams then
   begin
@@ -64,6 +62,8 @@ function TOneBRCGenerator.CheckLongParams(const AParam: string): Boolean;
 var
   J: Integer;
 begin
+  Result := False;
+
   for J := 0 to Pred(Length(cLongOptions)) do
   begin
     if (AParam = cLongOptions[J]) then
@@ -78,6 +78,8 @@ function TOneBRCGenerator.CheckShortParams(const AParam: char): Boolean;
 var
   J: Integer;
 begin
+  Result := False;
+
   for J := 0 to Pred(Length(cShortOptions)) do
   begin
     if (AParam = cShortOptions[J]) then
@@ -102,11 +104,9 @@ var
   ParamOK: Boolean;
   SkipNext: Boolean;
 begin
-  // initialize values
-  Result := false;
-  invalid := 0;
   valid := 0;
-  ParamOK := false;
+  invalid := 0;
+
   // initialize the params list
   if not Assigned(FParams) then
     FParams := TStringList.Create(dupIgnore, false, false);
@@ -134,6 +134,7 @@ begin
   // check for invalid input
   if FParams.Count > 0 then
   begin
+    ParamOK := True;
     SkipNext := False;
     for I := 0 to FParams.Count - 1 do
     begin
@@ -172,18 +173,15 @@ begin
   if (FParams.Find(cShortOptHelp, J) or FParams.Find(cLongOptHelp, J)) then
   begin
     WriteHelp;
-    inc(invalid);
   end;
 
   // check version
   if (FParams.Find(cShortOptVersion, J) or FParams.Find(cLongOptVersion, J)) then
   begin
     WriteLn(Format(rsGeneratorVersion, [cVersion]));
-    inc(invalid);
   end;
 
   // check inputfilename
-  J := -1;
   J := FParams.IndexOfName(cShortOptInput);
   if J = -1 then
     J := FParams.IndexOfName(cLongOptInput);
@@ -199,7 +197,6 @@ begin
   end;
 
   // check outputfilename
-  J := -1;
   J := FParams.IndexOfName(cShortOptOutput);
   if J = -1 then
     J := FParams.IndexOfName(cLongOptOutput);
@@ -215,7 +212,6 @@ begin
   end;
 
   // check linecount
-  J := -1;
   J := FParams.IndexOfName(cShortOptNumber);
   if J = -1 then
     J := FParams.IndexOfName(cLongOptNumber);
@@ -243,7 +239,7 @@ begin
   end;
 
   // check if everything was provided
-  Result := valid = 3;
+  Result := (valid = 3) and (invalid = 0);
 end;
 
 var
@@ -254,4 +250,8 @@ begin
   Application.Run;
   Application.Free;
 
+  {$IFDEF DEBUG}
+  Writeln('Press ENTER...');
+  Readln;
+  {$ENDIF}
 end.