Changeset 3 for trunk

Timestamp:

Nov 27, 2021, 11:14:09 AM (3 years ago)

Author:

chronos

Message:

• Modified: More conversions.

Location:

trunk

Files:

• . (modified) (1 prop)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (7 diffs)

trunk/UFormMain.lfm

@@ -16 +16 @@
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
-    Text = '/home/chronos/Projekty/DirtyCppToPascal/CapitalAI'
+    Text = '/home/chronos/Projekty/DirtyCppToPascal/trunk/CapitalAI'
   end
   object ButtonBrowse: TButton

trunk/UFormMain.pas

@@ -36 +36 @@
     function SpaceAround(Text, What: string; Left: Boolean = True; Right: Boolean = True): string;
     function Replace(Text: string; OldPattern, NewPattern: string): string;
+    function ReplaceIdent(Text: string; OldPattern, NewPattern: string): string;
     function ReplaceFunction(Text: string; ReturnType: string): string;
     function ReplaceVariable(Text: string; VarType: string): string;
@@ -182 +183 @@
     Files := TStringList.Create;
     SearchFiles(Files, DirSrc, nil, nil);
+
+    for I := 0 to Files.Count - 1 do begin
+      MemoLog.Lines.Add(Files[I]);
+      FileNameSrc := Files[I];
+      if DirectoryExists(FileNameSrc) then continue;
+      if FileExists(FileNameSrc) then begin
+        FileNameDst := DirDst + Copy(FileNameSrc, Length(DirSrc) + 1, MaxInt);
+        ForceDirectories(ExtractFileDir(FileNameDst));
+        FileExt := ExtractFileExt(FileNameSrc);
+        if FileExt = '.cpp' then begin
+          FileNameDst := ExtractFileNameWithoutExt(FileNameDst) + '.pas';
+          DeleteFile(FileNameDst);
+        end;
+      end;
+    end;
+
     for I := 0 to Files.Count - 1 do begin
       MemoLog.Lines.Add(Files[I]);
@@ -269 +286 @@
 end;
 
+function TFormMain.ReplaceIdent(Text: string; OldPattern, NewPattern: string
+  ): string;
+var
+  I: Integer;
+  TextBefore: string;
+  TextAfter: string;
+begin
+  Result := '';
+  while True do begin
+    I := Pos(OldPattern, Text);
+    if I > 0 then begin
+      TextBefore := Copy(Text, 1, I - 1);
+      TextAfter := Copy(Text, I + Length(OldPattern), Length(Text));
+      if ((Length(TextBefore) >= 1) and IsAlphaNumeric(TextBefore[Length(TextBefore)]) or
+       ((Length(Result) >= 1) and IsAlphaNumeric(Result[Length(Result)]) and
+         (Copy(Result, Length(Result) - Length(NewPattern) + 1, Length(NewPattern)) <> NewPattern)) or
+       ((Length(TextAfter) >= 1) and IsAlphaNumeric(TextAfter[1])))
+        then begin
+          Result := Result + TextBefore + OldPattern;
+          Delete(Text, 1, Length(TextBefore) + Length(OldPattern));
+          Continue;
+        end;
+      Result := Result + TextBefore + NewPattern;
+      Delete(Text, 1, Length(TextBefore) + Length(OldPattern));
+    end else Break;
+  end;
+  Result := Result + Text;
+end;
+
 function TFormMain.ReplaceFunction(Text: string; ReturnType: string): string;
 var
@@ -421 +467 @@
   Line: string;
 const
-  Types: array[0..8] of string = ('Integer', 'Boolean', 'Cardinal', 'Byte',
-    'ShortInt',
-    'Advances', 'TNewGameData', 'TServerCall', 'TClientCall');
+  Types: array[0..11] of string = ('Integer', 'Boolean', 'Cardinal', 'Byte',
+    'ShortInt', 'Pointer',
+    'Advances', 'TNewGameData', 'TServerCall', 'TClientCall', 'MyEVOArea',
+    'TileFunction');
   PascalKeywords: array[0..1] of string = ('object', 'type');
 begin
@@ -443 +490 @@
       Line := ReplaceSpecialSymbol(Line, '::', '.');
       Line := Replace(Line, 'switch', 'case');
-      Line := Replace(Line, 'int', 'Integer');
-      Line := Replace(Line, 'bool', 'Boolean');
-      Line := Replace(Line, 'unsigned long', 'Cardinal');
-      Line := Replace(Line, 'unsigned short', 'ShortInt');
-      Line := Replace(Line, 'unsigned char', 'Byte');
-      Line := Replace(Line, 'unsigned Integer', 'Cardinal');
+      Line := Replace(Line, 'unsigned long ', 'Cardinal ');
+      Line := Replace(Line, 'unsigned short ', 'Byte ');
+      Line := Replace(Line, 'unsigned char ', 'Byte ');
+      Line := Replace(Line, 'unsigned int ', 'Cardinal ');
+      Line := Replace(Line, 'int ', 'Integer ');
+      Line := Replace(Line, 'short ', 'ShortInt ');
+      Line := Replace(Line, 'long ', 'Integer ');
+      Line := Replace(Line, 'bool ', 'Boolean ');
       Line := Replace(Line, 'void *', 'Pointer ');
-      Line := Replace(Line, 'std.ofstream', 'TStream');
+      Line := Replace(Line, 'std.ofstream ', 'TStream ');
+      Line := Replace(Line, 'std.ostream ', 'TStream ');
       Line := ReplaceOperator(Line, '+=', ':=', '+');
       Line := ReplaceOperator(Line, '-=', ':=', '-');
@@ -473 +523 @@
       Line := Replace(Line, 'const ', '');
       Line := Replace(Line, ' const', '');
+      Line := Replace(Line, 'mutable ', '');
       for J := 0 to Length(Types) - 1 do
         Line := ReplaceFunction(Line, Types[J]);
@@ -482 +533 @@
       Line := Replace(Line, '()', '');
       for J := 0 to Length(PascalKeywords) - 1 do
-        Line := Replace(Line, PascalKeywords[J], 'K' + PascalKeywords[J]);
+        Line := ReplaceIdent(Line, PascalKeywords[J], 'K' + PascalKeywords[J]);
       //Line := SpaceAround(Line, ':=');
       //Line := SpaceAround(Line, '+');