fixing Calculator, UnitTest, Prime examples

Author: gangatp

Build/Dockerfile

@@ -42,8 +42,27 @@ RUN rpm --import https://download.mono-project.com/repo/xamarin.gpg \
     && dnf config-manager --add-repo https://download.mono-project.com/repo/centos8-stable.repo \
     && dnf -y install mono-complete
 
-# General tools
-RUN dnf -y install glibc-common glibc-utils less passwd tar vim-minimal vim-enhanced which sudo bash-completion mc yum-utils && yum clean all
+# .NET
+RUN dnf -y install wget \
+    && wget https://packages.microsoft.com/config/centos/8/packages-microsoft-prod.rpm \
+    && rpm -Uvh packages-microsoft-prod.rpm \
+    && dnf -y install dotnet-sdk-6.0
+
+# General purpose tools
+RUN dnf -y install \
+           glibc-common \
+           glibc-utils \
+           less \
+           passwd \
+           tar \
+           vim-minimal \
+           vim-enhanced \
+           which \
+           sudo \
+           bash-completion \
+           mc \
+           yum-utils \
+           && yum clean all
 
 # Enable GCC toolset in shells
 RUN echo "source /opt/rh/gcc-toolset-9/enable" >> /etc/bashrc

Examples/Calculator/Calculator_component/Bindings/CppDynamic/calculator_abi.hpp

@@ -4,7 +4,7 @@ Copyright (C) 2019 Calculator developers
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.6.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.8.1-develop.
 
 Abstract: This is an autogenerated C++-Header file in order to allow an easy
  use of Calculator library
@@ -29,12 +29,23 @@ Interface version: 1.0.0
 #include "calculator_types.hpp"
 
 
+#ifdef __cplusplus
 extern "C" {
+#endif
 
 /*************************************************************************************************************************
  Class definition for Base
 **************************************************************************************************************************/
 
+/**
+* Get Class Type Id
+*
+* @param[in] pBase - Base instance.
+* @param[out] pClassTypeId - Class type as a 64 bits integer
+* @return error code or 0 (success)
+*/
+CALCULATOR_DECLSPEC CalculatorResult calculator_base_classtypeid(Calculator_Base pBase, Calculator_uint64 * pClassTypeId);
+
 /*************************************************************************************************************************
  Class definition for Variable
 **************************************************************************************************************************/
@@ -165,7 +176,9 @@ CALCULATOR_DECLSPEC CalculatorResult calculator_createvariable(Calculator_double
 */
 CALCULATOR_DECLSPEC CalculatorResult calculator_createcalculator(Calculator_Calculator * pInstance);
 
+#ifdef __cplusplus
 }
+#endif
 
 #endif // __CALCULATOR_HEADER_CPP
 

Examples/Calculator/Calculator_component/Examples/CppDynamic/build.sh

@@ -13,10 +13,20 @@ pushd build
 cmake -H.. -B. -DCMAKE_BUILD_TYPE=Debug
 cmake --build .
 
+echo "List C++ library"
+ls ../../../Implementations/Cpp/build
+
 echo "Test C++ library"
 RUN ./CalculatorExample_CPPDynamic ../../../Implementations/Cpp/build
 
+echo "List Pascal library"
+ls ../../../Implementations/Pascal/build
+
 echo "Test Pascal library"
-RUN ./CalculatorExample_CPPDynamic ../../../Implementations/Pascal/build
+if [ -f "../../../Implementations/Pascal/build/calculator$OSLIBEXT" ]; then
+    RUN ./CalculatorExample_CPPDynamic ../../../Implementations/Pascal/build
+else
+    echo "Pascal library not found - skipping Pascal test (normal if fpc not available)"
+fi
 
 popd

Examples/Calculator/Calculator_component/Examples/Pascal/Calculator_Example.lpr

@@ -14,6 +14,7 @@
 *)
 
 program CalculatorPascalTest;
+{$mode objfpc}{$H+}
 
 uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}

Examples/Calculator/Calculator_component/Examples/Pascal/build.sh

@@ -13,13 +13,21 @@ fpc -Fu../../Bindings/Pascal -FU./build -o./build/Calculator_Example$OSEXEEXT Ca
 pushd build
 
 echo "Test C++ library"
-rm -f calculator.dll
-ln -s ../../../Implementations/Cpp/build/calculator$OSLIBEXT calculator.dll
-RUN ./Calculator_Example .
+if [ -f "../../../Implementations/Cpp/build/calculator$OSLIBEXT" ]; then
+    rm -f calculator.dll
+    ln -s ../../../Implementations/Cpp/build/calculator$OSLIBEXT calculator.dll
+    RUN ./Calculator_Example .
+else
+    echo "C++ library not found - skipping C++ test"
+fi
 
 echo "Test Pascal library"
-rm -f calculator.dll
-ln -s ../../../Implementations/Pascal/build/calculator$OSLIBEXT calculator.dll
-RUN ./Calculator_Example .
+if [ -f "../../../Implementations/Pascal/build/calculator$OSLIBEXT" ]; then
+    rm -f calculator.dll
+    ln -s ../../../Implementations/Pascal/build/calculator$OSLIBEXT calculator.dll
+    RUN ./Calculator_Example .
+else
+    echo "Pascal library not found - skipping Pascal test (normal if fpc not available)"
+fi
 
 popd

Examples/Calculator/Calculator_component/Examples/Python/build.sh

@@ -5,13 +5,18 @@ set -euxo pipefail
 cd "$(dirname "$0")"
 source ../../../../../Build/build.inc
 
-echo "Test with available libraries"
-if [ -d "$PWD/../../Implementations/Cpp/build" ] && [ -f "$PWD/../../Implementations/Cpp/build/calculator$OSLIBEXT" ]; then
+echo "Test with C++ library"
+if [ -f "$PWD/../../Implementations/Cpp/build/calculator$OSLIBEXT" ]; then
     echo "Testing with C++ library"
     RUN "python3 Calculator_Example.py" $PWD/../../Implementations/Cpp/build
-elif [ -d "$PWD/../../Implementations/Pascal/build" ] && [ -f "$PWD/../../Implementations/Pascal/build/calculator$OSLIBEXT" ]; then
+else
+    echo "C++ library not found - skipping C++ test"
+fi
+
+echo "Test with Pascal library"
+if [ -f "$PWD/../../Implementations/Pascal/build/calculator$OSLIBEXT" ]; then
     echo "Testing with Pascal library"
     RUN "python3 Calculator_Example.py" $PWD/../../Implementations/Pascal/build
 else
-    echo "No library found - skipping Python test (this is normal if no implementations were built)"
+    echo "Pascal library not found - skipping Pascal test (normal if fpc not available)"
 fi

Examples/Calculator/Calculator_component/Implementations/Pascal/Interfaces/calculator.lpr

@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.6.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.8.1-develop.
 
 Abstract: This is an autogenerated Pascal project file in order to allow easy
 development of Calculator library.
@@ -27,6 +27,7 @@
   sysutils;
 
 exports
+  calculator_base_classtypeid,
   calculator_variable_getvalue,
   calculator_variable_setvalue,
   calculator_calculator_enlistvariable,
@@ -41,6 +42,10 @@
   calculator_createvariable,
   calculator_createcalculator;
 
+{$IFDEF CALCULATOR_INCLUDE_RES_FILE}
+{$R *.res}
+{$ENDIF CALCULATOR_INCLUDE_RES_FILE}
+
 begin
 
 end.

Examples/Calculator/Calculator_component/Implementations/Pascal/Interfaces/calculator_interfaces.pas

@@ -32,7 +32,7 @@ interface
 **************************************************************************************************************************)
 
 ICalculatorBase = interface
-  ['{606128A4-C847-4057-A841-4B8871165F63}']
+  ['{C214B605-F0FB-481A-BD3E-3CFF478EF3C5}']
 
   function GetLastErrorMessage(out AErrorMessage: String): Boolean;
   procedure ClearErrorMessages();
@@ -48,7 +48,7 @@ interface
 **************************************************************************************************************************)
 
 ICalculatorVariable = interface(ICalculatorBase)
-  ['{1E683C18-EFC4-4772-AB4B-6A055D74C97F}']
+  ['{5C7138D7-DD48-4F7A-9888-FBF2998C807F}']
 
   function GetValue(): Double;
   procedure SetValue(const AValue: Double);
@@ -60,7 +60,7 @@ interface
 **************************************************************************************************************************)
 
 ICalculatorCalculator = interface(ICalculatorBase)
-  ['{65CB20D4-1384-4F17-BB4D-0F556E2EA955}']
+  ['{665BE1D3-F168-4479-AB9D-173D25300D09}']
 
   procedure EnlistVariable(AVariable: TObject);
   function GetEnlistedVariable(const AIndex: Cardinal): TObject;

Examples/Calculator/Calculator_component/Implementations/Pascal/Stub/calculator_impl.pas

@@ -4,7 +4,7 @@
 
 All rights reserved.
 
-This file has been generated by the Automatic Component Toolkit (ACT) version 1.6.0.
+This file has been generated by the Automatic Component Toolkit (ACT) version 1.8.1-develop.
 
 Abstract: This is an autogenerated Pascal implementation file in order to allow easy
 development of Calculator library. It needs to be generated only once.
@@ -22,13 +22,14 @@ interface
   calculator_types,
   calculator_exception,
   calculator_interfaces,
+  calculator_impl_base,
   calculator_impl_variable,
   calculator_impl_calculator,
   Classes,
   sysutils;
 
 type
-  TCalculatorWrapper = class (TObject)
+  TCalculatorWrapper = class(TObject)
     public
       class procedure GetVersion(out AMajor: Cardinal; out AMinor: Cardinal; out AMicro: Cardinal);
       class function GetLastError(AInstance: TObject; out AErrorMessage: String): Boolean;
@@ -50,28 +51,35 @@ class procedure TCalculatorWrapper.GetVersion(out AMajor: Cardinal; out AMinor:
 
 class function TCalculatorWrapper.GetLastError(AInstance: TObject; out AErrorMessage: String): Boolean;
 begin
-  result := (AInstance as ICalculatorBase).GetLastErrorMessage(AErrorMessage);
+  if Assigned(AInstance) and (AInstance is TCalculatorBase) then
+  begin
+    Result := (AInstance as TCalculatorBase).GetLastErrorMessage(AErrorMessage);
+  end
+  else
+  begin
+    AErrorMessage := '';
+    Result := False;
+  end;
 end;
 
 class procedure TCalculatorWrapper.ReleaseInstance(AInstance: TObject);
 begin
-  (AInstance as ICalculatorBase).DecRefCount();
+  (AInstance as ICalculatorBase).DecRefCount(); 
 end;
 
 class procedure TCalculatorWrapper.AcquireInstance(AInstance: TObject);
 begin
-  (AInstance as ICalculatorBase).IncRefCount();
+  (AInstance as ICalculatorBase).IncRefCount(); 
 end;
 
 class function TCalculatorWrapper.CreateVariable(const AInitialValue: Double): TObject;
 begin
-  result := TCalculatorVariable.Create();
-  (result as TCalculatorVariable).SetValue(AInitialValue);
+  Result := TCalculatorVariable.Create(AInitialValue);
 end;
 
 class function TCalculatorWrapper.CreateCalculator(): TObject;
 begin
-  result := TCalculatorCalculator.Create();
+  Result := TCalculatorCalculator.Create();
 end;
 
 

Examples/Calculator/Calculator_component/Implementations/Pascal/Stub/calculator_impl_base.pas

@@ -36,7 +36,7 @@   TCalculatorBase = class(TObject, ICalculatorBase)
       procedure RegisterErrorMessage(const AErrorMessage: String);
       procedure IncRefCount();
       function DecRefCount(): Boolean;
-      function ClassTypeId(): QWord; virtual;
+      function ClassTypeId(): QWord; Virtual; Abstract;
   end;
 
 implementation
@@ -68,7 +68,6 @@ procedure TCalculatorBase.ClearErrorMessages();
 
 procedure TCalculatorBase.RegisterErrorMessage(const AErrorMessage: String);
 begin
-  FMessages.Clear();
   FMessages.Add(AErrorMessage);
 end;
 
@@ -79,17 +78,18 @@ procedure TCalculatorBase.IncRefCount();
 
 function TCalculatorBase.DecRefCount(): Boolean;
 begin
-  dec(FReferenceCount);
-  if (FReferenceCount = 0) then begin
-    result := true;
-    self.Destroy();
-  end;
-   result := false;
-end;
-
-function TCalculatorBase.ClassTypeId(): QWord;
-begin
-  result := 0; // Base class type ID
+  if (FReferenceCount > 0) then
+  begin
+    dec(FReferenceCount);
+    if (FReferenceCount = 0) then begin
+      self.Destroy();
+      result := true;
+    end
+    else
+      result := false;
+  end
+  else
+    result := false; // Already at 0, don't double-destroy
 end;
 
 end.