Changeset 448

Timestamp:

May 19, 2022, 10:48:39 PM (3 years ago)

Author:

chronos

Message:

• Modified: Extended source processing to replace identifiers with first capital letter.

Location:

tools/Prepare DPI

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (12 diffs)
• project1.lpi (modified) (2 diffs)

tools/Prepare DPI/UFormMain.lfm

@@ -9 +9 @@
   DesignTimePPI = 144
   OnActivate = FormActivate
-  LCLVersion = '2.0.12.0'
+  OnCreate = FormCreate
+  LCLVersion = '2.2.0.4'
   object EditSrcDir: TEdit
     Left = 159
-    Height = 42
+    Height = 43
     Top = 17
     Width = 497
     TabOrder = 0
-    Text = '/home/chronos/Projekty/C-evo/trunk'
+    Text = '../../trunk'
   end
   object Label1: TLabel
     Left = 17
-    Height = 24
+    Height = 26
     Top = 25
     Width = 91
     Caption = 'Source dir:'
-    ParentColor = False
   end
   object Label2: TLabel
     Left = 16
-    Height = 24
+    Height = 26
     Top = 72
     Width = 130
     Caption = 'Destination dir:'
-    ParentColor = False
   end
   object EditDstDir: TEdit
     Left = 159
-    Height = 42
+    Height = 43
     Top = 64
     Width = 496
     TabOrder = 1
-    Text = '/home/chronos/Projekty/C-evo/branches/highdpi_new'
+    Text = '../../branches/highdpi_new'
   end
   object ButtonProcess: TButton

tools/Prepare DPI/UFormMain.pas

@@ -21 +21 @@
     procedure ButtonProcessClick(Sender: TObject);
     procedure FormActivate(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
   private
     Initialized: Boolean;
+    FirstCapitalLetter: Boolean;
+    UseDpi: Boolean;
     procedure FormatCodePas(FileName: string);
     procedure FormatCodeLfm(FileName: string);
     function IsAlpha(C: Char): Boolean;
+    function IsNumeric(C: Char): Boolean;
+    function IsAlphaNumeric(C: Char): Boolean;
     function ReplaceText(Text: string; FromText, ToText: string): string;
     function ReplaceIdent(Text: string; FromText, ToText: string): string;
@@ -40 +45 @@
     'ImageList', 'SpinEdit', 'PageControl', 'CheckBox', 'RadioButton',
     'Memo', 'ComboBox', 'CustomDrawGrid');
+  Idents: array[0..44] of string = ('True', 'False', 'Boolean', 'Integer', 'Inc',
+    'Dec', 'Exit', 'Break', 'Result', 'Single', 'Assert', 'Move', 'Byte', 'Word',
+    'Extended', 'PChar', 'SizeOf', 'Last', 'Pointer', 'Code', 'Test', 'Line',
+    'Pos', 'Copy', 'Offscreen', 'Brush', 'FillChar', 'ShortInt', 'Cardinal',
+    'Green', 'Red', 'Blue', 'Include', 'Canvas', 'Double', 'FillRect',
+    'Length', 'Delete', 'IntToStr', 'Min', 'Max', 'Color', 'Me', 'Supervising',
+    'Idle');
+
 
 implementation
@@ -87 +100 @@
 end;
 
+function TFormMain.IsNumeric(C: Char): Boolean;
+begin
+  Result := C in ['0'..'9'];
+end;
+
+function TFormMain.IsAlphaNumeric(C: Char): Boolean;
+begin
+  Result := IsAlpha(C) or IsNumeric(C);
+end;
+
 procedure TFormMain.FormActivate(Sender: TObject);
 begin
@@ -92 +115 @@
     Initialized := True;
   end;
+end;
+
+procedure TFormMain.FormCreate(Sender: TObject);
+begin
+  UseDpi := True;
+  FirstCapitalLetter := False;
 end;
 
@@ -133 +162 @@
   Lines: TStringList;
   I, J: Integer;
+  C: Char;
   Line: string;
   Differences: Integer;
@@ -138 +168 @@
 begin
   Lines := TStringList.Create;
+  Lines.LineBreak := #13#10;
   try
     Lines.LoadFromFile(FileName);
@@ -143 +174 @@
     for I := 0 to Lines.Count - 1 do begin
       Line := Lines[I];
-      for J := 0 to Length(TypeNames) - 1 do
-        Line := ReplaceIdent(Line, 'T' + TypeNames[J], 'TDpi' + TypeNames[J]);
-      Line := ReplaceIdent(Line, 'Screen', 'DpiScreen');
-      Line := ReplaceIdent(Line, 'Mouse', 'DpiMouse');
-      Line := ReplaceIdent(Line, 'Application', 'DpiApplication');
-      Line := StringReplace(Line, 'BitBlt(', 'DpiBitBlt(', [rfReplaceAll]);
-      Line := StringReplace(Line, 'BitBltCanvas(', 'DpiBitCanvas(', [rfReplaceAll]);
-      Line := StringReplace(Line, 'GetSystemMetrics(', 'DpiGetSystemMetrics(', [rfReplaceAll]);
-      Line := StringReplace(Line, 'CreateRectRgn(', 'DpiCreateRectRgn(', [rfReplaceAll]);
-      Line := StringReplace(Line, 'ScrollDC(', 'DpiScrollDC(', [rfReplaceAll]);
-      if Lines[I] <> Line then Inc(Differences);
+
+      if FirstCapitalLetter then begin
+        for J := 0 to Length(Idents) - 1 do
+          Line := ReplaceIdent(Line, LowerCase(Idents[J]), Idents[J]);
+        for C := 'A' to 'Z' do
+          Line := ReplaceIdent(Line, LowerCase(C), C);
+      end;
+
+      if UseDpi then begin
+        for J := 0 to Length(TypeNames) - 1 do
+          Line := ReplaceIdent(Line, 'T' + TypeNames[J], 'TDpi' + TypeNames[J]);
+        Line := ReplaceIdent(Line, 'Screen', 'DpiScreen');
+        Line := ReplaceIdent(Line, 'Mouse', 'DpiMouse');
+        Line := ReplaceIdent(Line, 'Application', 'DpiApplication');
+        Line := StringReplace(Line, 'BitBlt(', 'DpiBitBlt(', [rfReplaceAll]);
+        Line := StringReplace(Line, 'BitBltCanvas(', 'DpiBitCanvas(', [rfReplaceAll]);
+        Line := StringReplace(Line, 'GetSystemMetrics(', 'DpiGetSystemMetrics(', [rfReplaceAll]);
+        Line := StringReplace(Line, 'CreateRectRgn(', 'DpiCreateRectRgn(', [rfReplaceAll]);
+        Line := StringReplace(Line, 'ScrollDC(', 'DpiScrollDC(', [rfReplaceAll]);
+        if Lines[I] <> Line then Inc(Differences);
+      end;
       Lines[I] := Line;
     end;
@@ -159 +200 @@
     // Add UDpiControls to uses clause
     if Differences > 0 then begin
-      UsesSection := False;
-      for I := 0 to Lines.Count - 1 do begin
-        if UsesSection then begin
-          Lines[I] := '  UDpiControls, ' + TrimLeft(Lines[I]);
-          Break;
+      if UseDpi then begin
+        UsesSection := False;
+        for I := 0 to Lines.Count - 1 do begin
+          if UsesSection then begin
+            Lines[I] := '  UDpiControls, ' + TrimLeft(Lines[I]);
+            Break;
+          end;
+          if Lines[I] = 'uses' then UsesSection := True;
         end;
-        if Lines[I] = 'uses' then UsesSection := True;
       end;
     end;
@@ -207 +250 @@
 function TFormMain.ReplaceIdent(Text: string; FromText, ToText: string): string;
 type
-  TState = (stNone, stIdent);
+  TState = (stNone, stIdent, stCommentBlock, stLineComment, stString);
 var
   I: Integer;
@@ -218 +261 @@
   IdentStart := 0;
   while I <= Length(Text) do begin
+    // Do not update line comment area
+    if (I < Length(Text)) and (Copy(Text, I, 2) = '//') then begin
+      State := stLineComment;
+      Break;
+    end;
+
     if State = stNone then begin
+      if Text[I] = '{' then begin
+        State := stCommentBlock;
+      end else
+      if Text[I] = '''' then begin
+        State := stString;
+      end else
       if IsAlpha(Text[I]) then begin
         State := stIdent;
@@ -226 +281 @@
     end else
     if State = stIdent then begin
-      if IsAlpha(Text[I]) then begin
+      if IsAlphaNumeric(Text[I]) then begin
         Ident := Ident + Text[I];
       end else begin
@@ -233 +288 @@
         end;
         State := stNone;
-      end;
+        Continue;
+      end;
+    end else
+    if State = stString then begin
+      if Text[I] = '''' then begin
+        State := stNone;
+      end;
+    end else
+    if State = stCommentBlock then begin
+      if Text[I] = '}' then State := stNone;
     end;
     Inc(I);
   end;
+
+  // Replace last ident terminated by line ending
+  if (State = stIdent) and (Ident = FromText) then begin
+    Text := Copy(Text, 1, IdentStart - 1) + ToText + Copy(Text, I, MaxInt);
+  end;
   Result := Text;
 end;
 
-
 end.
 

tools/Prepare DPI/project1.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="project1"/>
       <Scaled Value="True"/>
@@ -24 +26 @@
     <RunParams>
       <FormatVersion Value="2"/>
-      <Modes Count="0"/>
     </RunParams>
     <RequiredPackages Count="1">