Adjust some examples to Delphi, add Makefile commands to test using Delphi

Author: michaliskambi

.gitignore

@@ -16,6 +16,7 @@ modern_pascal_introduction_ukrainian.pdf
 modern_pascal_introduction_ukrainian.xml
 
 /code-samples*/*.ppu
+/code-samples*/*.dcu
 /code-samples*/*.o
 /code-samples*/*.exe
 /code-samples*/anonymous_functions

code-samples/Makefile

@@ -1,17 +1,35 @@
-UNIT_SOURCES:=$(wildcard *.pas)
-PROGRAM_SOURCES:=$(wildcard *.lpr) $(wildcard *.dpr)
-
-PROGRAM_UNIX_BINARIES:=$(PROGRAM_SOURCES:.lpr=)
-PROGRAM_UNIX_BINARIES:=$(PROGRAM_UNIX_BINARIES:.dpr=)
-
-PROGRAM_WINDOWS_BINARIES:=$(PROGRAM_SOURCES:.lpr=.exe)
-PROGRAM_WINDOWS_BINARIES:=$(PROGRAM_WINDOWS_BINARIES:.dpr=.exe)
-
-.PHONY: all
-all:
-	$(foreach UNIT_NAME,$(UNIT_SOURCES),fpc $(UNIT_NAME) && ) true
-	$(foreach PROGRAM_NAME,$(PROGRAM_SOURCES),fpc $(PROGRAM_NAME) && ) true
-
-.PHONY: clean
-clean:
-	rm -Rf *.o *.ppu $(PROGRAM_UNIX_BINARIES) $(PROGRAM_WINDOWS_BINARIES)
+UNIT_SOURCES:=$(wildcard *.pas)
+PROGRAM_SOURCES:=$(wildcard *.lpr) $(wildcard *.dpr)
+
+PROGRAM_UNIX_BINARIES:=$(PROGRAM_SOURCES:.lpr=)
+PROGRAM_UNIX_BINARIES:=$(PROGRAM_UNIX_BINARIES:.dpr=)
+
+PROGRAM_WINDOWS_BINARIES:=$(PROGRAM_SOURCES:.lpr=.exe)
+PROGRAM_WINDOWS_BINARIES:=$(PROGRAM_WINDOWS_BINARIES:.dpr=.exe)
+
+.PHONY: all
+all:
+	$(foreach UNIT_NAME,$(UNIT_SOURCES),fpc $(UNIT_NAME) && ) true
+	$(foreach PROGRAM_NAME,$(PROGRAM_SOURCES),fpc $(PROGRAM_NAME) && ) true
+
+# Delphi (dcc) command line options.
+# See https://github.com/castle-engine/castle-engine/blob/master/tools/build-tool/code/toolcompile.pas#L858
+# for how Castle Game Engine build tool invokes dcc for some hints.
+# -NS below follows the DPROJ settings generated by Delphi for new projects.
+DELPHI_OPTIONS_COMMON:='-NSSystem;Xml;Data;Datasnap;Web;Soap'
+DELPHI_WIN32_COMMAND:=dcc32 $(DELPHI_OPTIONS_COMMON)
+DELPHI_WIN64_COMMAND:=dcc64 $(DELPHI_OPTIONS_COMMON)
+
+.PHONY: all-delphi-win32
+all-delphi-win32:
+	$(foreach UNIT_NAME,$(UNIT_SOURCES),$(DELPHI_WIN32_COMMAND) $(UNIT_NAME) && ) true
+	$(foreach PROGRAM_NAME,$(PROGRAM_SOURCES),$(DELPHI_WIN32_COMMAND) $(PROGRAM_NAME) && ) true
+
+.PHONY: all-delphi-win64
+all-delphi-win64:
+	$(foreach UNIT_NAME,$(UNIT_SOURCES),$(DELPHI_WIN64_COMMAND) $(UNIT_NAME) && ) true
+	$(foreach PROGRAM_NAME,$(PROGRAM_SOURCES),$(DELPHI_WIN64_COMMAND) $(PROGRAM_NAME) && ) true
+
+.PHONY: clean
+clean:
+	rm -Rf *.o *.ppu $(PROGRAM_UNIX_BINARIES) $(PROGRAM_WINDOWS_BINARIES)

code-samples/anon_functions_assignment_test.dpr

@@ -11,33 +11,41 @@
 uses Classes;
 
 type
+  {$ifdef FPC}
   TFunc = function: LongInt;
+  {$else}
+  TFunc = reference to function: LongInt;
+  TProcedure = reference to procedure;
+  TNotifyEvent = reference to procedure(aSender: TObject);
+  {$endif}
 
 var
   p: TProcedure;
   f: TFunc;
   n: TNotifyEvent;
 begin
+  {$ifdef FPC} // Delphi doesn't allow to invoke like this
   procedure(const aArg: String)
   begin
     Writeln(aArg);
   end('Hello World');
+  {$endif}
 
   p := procedure
        begin
          Writeln('Foobar');
        end;
   p();
 
-  n := procedure(aSender: TObject)
+  n := procedure(Sender: TObject)
        begin
-         Writeln(HexStr(Pointer(aSender)));
+         Writeln(Sender.ClassName);
        end;
   n(Nil);
 
-  f := function MyRes : LongInt
+  f := function: LongInt
        begin
-         MyRes := 42;
+         Result := 42;
        end;
   Writeln(f());
 end.

code-samples/callbacks_of_object.dpr

@@ -38,10 +38,10 @@ var
 begin
   C := TMyClass.Create;
   try
-    C.ProcessTheList(@C.Add);
+    C.ProcessTheList({$ifdef FPC}@{$endif} C.Add);
     WriteLn('1 + 2 + 3 ... + 10 = ', C.CurrentValue);
 
-    C.ProcessTheList(@C.Multiply);
+    C.ProcessTheList({$ifdef FPC}@{$endif} C.Multiply);
     WriteLn('1 * 2 * 3 ... * 10 = ', C.CurrentValue);
   finally
     FreeAndNil(C);

code-samples/for_in_list.dpr

@@ -1,14 +1,19 @@
 {$ifdef FPC} {$mode objfpc}{$H+}{$J-} {$endif}
 {$ifdef MSWINDOWS} {$apptype CONSOLE} {$endif}
 
+{$ifndef FPC}
+  {$message warn 'Delphi does not have FGL unit'}
+  begin end.
+{$endif}
+
 uses
   SysUtils, FGL;
 
 type
   TMyClass = class
     I, Square: Integer;
   end;
-  TMyClassList = specialize TFPGObjectList<TMyClass>;
+  TMyClassList = {$ifdef FPC}specialize{$endif} TFPGObjectList<TMyClass>;
 
 var
   List: TMyClassList;

code-samples/generic_functions.dpr

@@ -1,8 +1,12 @@
 {$ifdef FPC} {$mode objfpc}{$H+}{$J-} {$endif}
 {$ifdef MSWINDOWS} {$apptype CONSOLE} {$endif}
 
-uses
-  SysUtils;
+{$ifndef FPC}
+  {$message warn 'Delphi does not support global generic functions'}
+  begin end.
+{$endif}
+
+uses SysUtils;
 
 { Note: this example requires FPC 3.1.1 (will not compile with FPC 3.0.0 or older). }
 

code-samples/generics.dpr

@@ -1,8 +1,12 @@
 {$ifdef FPC} {$mode objfpc}{$H+}{$J-} {$endif}
 {$ifdef MSWINDOWS} {$apptype CONSOLE} {$endif}
 
-uses
-  SysUtils;
+{$ifndef FPC}
+  {$message warn 'Delphi does not allow addition on types that are generic parameters'}
+  begin end.
+{$endif}
+
+uses SysUtils;
 
 type
   generic TMyCalculator<T> = class
@@ -16,8 +20,8 @@ begin
 end;
 
 type
-  TMyFloatCalculator = specialize TMyCalculator<Single>;
-  TMyStringCalculator = specialize TMyCalculator<string>;
+  TMyFloatCalculator = {$ifdef FPC}specialize{$endif} TMyCalculator<Single>;
+  TMyStringCalculator = {$ifdef FPC}specialize{$endif} TMyCalculator<string>;
 
 var
   FloatCalc: TMyFloatCalculator;

code-samples/generics_dictionary.dpr

@@ -8,7 +8,7 @@ type
     Name: string;
   end;
 
-  TAppleDictionary = specialize TDictionary<string, TApple>;
+  TAppleDictionary = {$ifdef FPC}specialize{$endif} TDictionary<string, TApple>;
 
 var
   Apples: TAppleDictionary;

code-samples/generics_lists.dpr

@@ -8,7 +8,7 @@ type
     Name: string;
   end;
 
-  TAppleList = {$ifdef FPC_OBJFPC}specialize{$endif} TObjectList<TApple>;
+  TAppleList = {$ifdef FPC}specialize{$endif} TObjectList<TApple>;
 
 var
   A: TApple;

code-samples/generics_object_dictionary.dpr

@@ -8,7 +8,7 @@ type
     Name: string;
   end;
 
-  TAppleDictionary = specialize TObjectDictionary<string, TApple>;
+  TAppleDictionary = {$ifdef FPC}specialize{$endif} TObjectDictionary<string, TApple>;
 
 var
   Apples: TAppleDictionary;